diff options
142 files changed, 9697 insertions, 4503 deletions
diff --git a/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/icons/full/ctool16/CreateEllipticalCurveTo_point_Point.gif b/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/icons/full/ctool16/CreateEllipticalArcTo_point_Point.gif Binary files differindex ed16f99f0c2..52cb13537c9 100644 --- a/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/icons/full/ctool16/CreateEllipticalCurveTo_point_Point.gif +++ b/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/icons/full/ctool16/CreateEllipticalArcTo_point_Point.gif diff --git a/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/icons/full/ctool16/CreateEllipticalCurveTo_radii_Dimension.gif b/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/icons/full/ctool16/CreateEllipticalArcTo_radii_Dimension.gif Binary files differindex a1607f91008..01f8ed65675 100644 --- a/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/icons/full/ctool16/CreateEllipticalCurveTo_radii_Dimension.gif +++ b/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/icons/full/ctool16/CreateEllipticalArcTo_radii_Dimension.gif diff --git a/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/icons/full/ctool16/CreatePath_command_EllipticalCurveTo.gif b/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/icons/full/ctool16/CreatePath_command_EllipticalArcTo.gif Binary files differindex babb084892c..ce3b99fab23 100644 --- a/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/icons/full/ctool16/CreatePath_command_EllipticalCurveTo.gif +++ b/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/icons/full/ctool16/CreatePath_command_EllipticalArcTo.gif diff --git a/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/icons/full/obj16/EllipticalArcTo.gif b/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/icons/full/obj16/EllipticalArcTo.gif Binary files differnew file mode 100644 index 00000000000..45731fe28e7 --- /dev/null +++ b/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/icons/full/obj16/EllipticalArcTo.gif diff --git a/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/icons/full/obj16/EllipticalCurveTo.gif b/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/icons/full/obj16/EllipticalCurveTo.gif Binary files differdeleted file mode 100644 index cdd3b76e3c0..00000000000 --- a/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/icons/full/obj16/EllipticalCurveTo.gif +++ /dev/null diff --git a/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/plugin.properties b/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/plugin.properties index 5e269cca321..386355b1980 100644 --- a/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/plugin.properties +++ b/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/plugin.properties @@ -11,7 +11,7 @@ pluginName = DD Edit Support providerName = CEA LIST -_UI_CreateChild_text = {0} +_UI_CreateChild_text = {1} | {0} _UI_CreateChild_text2 = {1} {0} _UI_CreateChild_text3 = {1} _UI_CreateChild_tooltip = Create New {0} Under {1} Feature @@ -239,3 +239,23 @@ _UI_LinearGradient_start_feature = Start _UI_LinearGradient_end_feature = End _UI_RadialGradient_center_feature = Center _UI_RadialGradient_focus_feature = Focus +_UI_Use_reference_feature = Reference +_UI_GraphicalElement_class_feature = Class +_UI_StyleSelector_class_feature = Class +_UI_Use_referencedElement_feature = Referenced Element +_UI_StyleSelector_kind_feature = Kind +_UI_ElementKind_canvas_literal = canvas +_UI_ElementKind_circle_literal = circle +_UI_ElementKind_clipPath_literal = clipPath +_UI_ElementKind_ellipse_literal = ellipse +_UI_ElementKind_group_literal = group +_UI_ElementKind_image_literal = image +_UI_ElementKind_line_literal = line +_UI_ElementKind_marker_literal = marker +_UI_ElementKind_path_literal = path +_UI_ElementKind_polygon_literal = polygon +_UI_ElementKind_polyline_literal = polyline +_UI_ElementKind_rectangle_literal = rectangle +_UI_ElementKind_text_literal = text +_UI_ElementKind_use_literal = use +_UI_RootCanvas_externalStyleSheet_feature = External Style Sheet diff --git a/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/src/org/eclipse/papyrus/dd/dc/provider/BoundsItemProvider.java b/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/src/org/eclipse/papyrus/dd/dc/provider/BoundsItemProvider.java index b57f150ffb8..c318b54768b 100644 --- a/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/src/org/eclipse/papyrus/dd/dc/provider/BoundsItemProvider.java +++ b/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/src/org/eclipse/papyrus/dd/dc/provider/BoundsItemProvider.java @@ -36,10 +36,9 @@ import org.eclipse.papyrus.dd.dc.DCPackage; import org.eclipse.papyrus.dd.edit.DDEditPlugin; /** - * This is the item provider adapter for a - * {@link org.eclipse.papyrus.dd.dc.Bounds} object. <!-- begin-user-doc --> <!-- + * This is the item provider adapter for a {@link org.eclipse.papyrus.dd.dc.Bounds} object. + * <!-- begin-user-doc --> <!-- * end-user-doc --> - * * @generated */ public class BoundsItemProvider extends ItemProviderAdapter implements @@ -76,39 +75,47 @@ public class BoundsItemProvider extends ItemProviderAdapter implements } /** - * This adds a property descriptor for the X feature. <!-- begin-user-doc + * This adds a property descriptor for the X feature. + * <!-- begin-user-doc * --> <!-- end-user-doc --> - * * @generated */ protected void addXPropertyDescriptor(Object object) { - itemPropertyDescriptors.add(createItemPropertyDescriptor( - ((ComposeableAdapterFactory) adapterFactory) - .getRootAdapterFactory(), - getResourceLocator(), - getString("_UI_Bounds_x_feature"), - getString("_UI_PropertyDescriptor_description", - "_UI_Bounds_x_feature", "_UI_Bounds_type"), - DCPackage.Literals.BOUNDS__X, true, false, false, - ItemPropertyDescriptor.REAL_VALUE_IMAGE, null, null)); + itemPropertyDescriptors.add + (createItemPropertyDescriptor + (((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(), + getResourceLocator(), + getString("_UI_Bounds_x_feature"), + getString("_UI_PropertyDescriptor_description", "_UI_Bounds_x_feature", "_UI_Bounds_type"), + DCPackage.Literals.BOUNDS__X, + true, + false, + false, + ItemPropertyDescriptor.REAL_VALUE_IMAGE, + null, + null)); } /** - * This adds a property descriptor for the Y feature. <!-- begin-user-doc + * This adds a property descriptor for the Y feature. + * <!-- begin-user-doc * --> <!-- end-user-doc --> - * * @generated */ protected void addYPropertyDescriptor(Object object) { - itemPropertyDescriptors.add(createItemPropertyDescriptor( - ((ComposeableAdapterFactory) adapterFactory) - .getRootAdapterFactory(), - getResourceLocator(), - getString("_UI_Bounds_y_feature"), - getString("_UI_PropertyDescriptor_description", - "_UI_Bounds_y_feature", "_UI_Bounds_type"), - DCPackage.Literals.BOUNDS__Y, true, false, false, - ItemPropertyDescriptor.REAL_VALUE_IMAGE, null, null)); + itemPropertyDescriptors.add + (createItemPropertyDescriptor + (((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(), + getResourceLocator(), + getString("_UI_Bounds_y_feature"), + getString("_UI_PropertyDescriptor_description", "_UI_Bounds_y_feature", "_UI_Bounds_type"), + DCPackage.Literals.BOUNDS__Y, + true, + false, + false, + ItemPropertyDescriptor.REAL_VALUE_IMAGE, + null, + null)); } /** @@ -118,15 +125,19 @@ public class BoundsItemProvider extends ItemProviderAdapter implements * @generated */ protected void addWidthPropertyDescriptor(Object object) { - itemPropertyDescriptors.add(createItemPropertyDescriptor( - ((ComposeableAdapterFactory) adapterFactory) - .getRootAdapterFactory(), - getResourceLocator(), - getString("_UI_Bounds_width_feature"), - getString("_UI_PropertyDescriptor_description", - "_UI_Bounds_width_feature", "_UI_Bounds_type"), - DCPackage.Literals.BOUNDS__WIDTH, true, false, false, - ItemPropertyDescriptor.REAL_VALUE_IMAGE, null, null)); + itemPropertyDescriptors.add + (createItemPropertyDescriptor + (((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(), + getResourceLocator(), + getString("_UI_Bounds_width_feature"), + getString("_UI_PropertyDescriptor_description", "_UI_Bounds_width_feature", "_UI_Bounds_type"), + DCPackage.Literals.BOUNDS__WIDTH, + true, + false, + false, + ItemPropertyDescriptor.REAL_VALUE_IMAGE, + null, + null)); } /** @@ -136,46 +147,50 @@ public class BoundsItemProvider extends ItemProviderAdapter implements * @generated */ protected void addHeightPropertyDescriptor(Object object) { - itemPropertyDescriptors.add(createItemPropertyDescriptor( - ((ComposeableAdapterFactory) adapterFactory) - .getRootAdapterFactory(), - getResourceLocator(), - getString("_UI_Bounds_height_feature"), - getString("_UI_PropertyDescriptor_description", - "_UI_Bounds_height_feature", "_UI_Bounds_type"), - DCPackage.Literals.BOUNDS__HEIGHT, true, false, false, - ItemPropertyDescriptor.REAL_VALUE_IMAGE, null, null)); + itemPropertyDescriptors.add + (createItemPropertyDescriptor + (((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(), + getResourceLocator(), + getString("_UI_Bounds_height_feature"), + getString("_UI_PropertyDescriptor_description", "_UI_Bounds_height_feature", "_UI_Bounds_type"), + DCPackage.Literals.BOUNDS__HEIGHT, + true, + false, + false, + ItemPropertyDescriptor.REAL_VALUE_IMAGE, + null, + null)); } /** - * This returns Bounds.gif. <!-- begin-user-doc --> <!-- end-user-doc --> - * + * This returns Bounds.gif. + * <!-- begin-user-doc --> <!-- end-user-doc --> * @generated */ @Override public Object getImage(Object object) { - return overlayImage(object, - getResourceLocator().getImage("full/obj16/Bounds")); + return overlayImage(object, getResourceLocator().getImage("full/obj16/Bounds")); } /** * This returns the label text for the adapted class. <!-- begin-user-doc * --> <!-- end-user-doc --> * - * @generated + * @generated NOT */ @Override public String getText(Object object) { Bounds bounds = (Bounds) object; - return getString("_UI_Bounds_type") + " " + bounds.getX(); + return getString("_UI_Bounds_type") + " " + bounds.getX() + ", " + + bounds.getY() + ", " + bounds.getWidth() + ", " + + bounds.getHeight(); } /** - * 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 --> <!-- + * 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 @@ -183,13 +198,12 @@ public class BoundsItemProvider extends ItemProviderAdapter implements updateChildren(notification); switch (notification.getFeatureID(Bounds.class)) { - case DCPackage.BOUNDS__X: - case DCPackage.BOUNDS__Y: - case DCPackage.BOUNDS__WIDTH: - case DCPackage.BOUNDS__HEIGHT: - fireNotifyChanged(new ViewerNotification(notification, - notification.getNotifier(), false, true)); - return; + case DCPackage.BOUNDS__X: + case DCPackage.BOUNDS__Y: + case DCPackage.BOUNDS__WIDTH: + case DCPackage.BOUNDS__HEIGHT: + fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), false, true)); + return; } super.notifyChanged(notification); } diff --git a/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/src/org/eclipse/papyrus/dd/dc/provider/DCItemProviderAdapterFactory.java b/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/src/org/eclipse/papyrus/dd/dc/provider/DCItemProviderAdapterFactory.java index 50af3deb05c..8de50b30abc 100644 --- a/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/src/org/eclipse/papyrus/dd/dc/provider/DCItemProviderAdapterFactory.java +++ b/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/src/org/eclipse/papyrus/dd/dc/provider/DCItemProviderAdapterFactory.java @@ -33,22 +33,20 @@ import org.eclipse.emf.edit.provider.ITreeItemContentProvider; import org.eclipse.papyrus.dd.dc.util.DCAdapterFactory; /** - * This is the factory that is used to provide the interfaces needed to support - * Viewers. The adapters generated by this factory convert EMF adapter - * notifications into calls to {@link #fireNotifyChanged fireNotifyChanged}. The - * adapters also support Eclipse property sheets. Note that most of the adapters - * are shared among multiple instances. <!-- begin-user-doc --> <!-- + * This is the factory that is used to provide the interfaces needed to support Viewers. + * The adapters generated by this factory convert EMF adapter notifications into calls to {@link #fireNotifyChanged fireNotifyChanged}. + * The adapters also support Eclipse property sheets. + * Note that most of the adapters are shared among multiple instances. + * <!-- begin-user-doc --> <!-- * end-user-doc --> - * * @generated */ public class DCItemProviderAdapterFactory extends DCAdapterFactory implements ComposeableAdapterFactory, IChangeNotifier, IDisposable { /** - * This keeps track of the root adapter factory that delegates to this - * adapter factory. <!-- begin-user-doc --> <!-- end-user-doc --> - * + * This keeps track of the root adapter factory that delegates to this adapter factory. + * <!-- begin-user-doc --> <!-- end-user-doc --> * @generated */ protected ComposedAdapterFactory parentAdapterFactory; @@ -63,10 +61,9 @@ public class DCItemProviderAdapterFactory extends DCAdapterFactory implements protected IChangeNotifier changeNotifier = new ChangeNotifier(); /** - * This keeps track of all the supported types checked by - * {@link #isFactoryForType isFactoryForType}. <!-- begin-user-doc --> <!-- + * This keeps track of all the supported types checked by {@link #isFactoryForType isFactoryForType}. + * <!-- begin-user-doc --> <!-- * end-user-doc --> - * * @generated */ protected Collection<Object> supportedTypes = new ArrayList<Object>(); @@ -86,10 +83,9 @@ public class DCItemProviderAdapterFactory extends DCAdapterFactory implements } /** - * This keeps track of the one adapter used for all - * {@link org.eclipse.papyrus.dd.dc.Point} instances. <!-- begin-user-doc + * This keeps track of the one adapter used for all {@link org.eclipse.papyrus.dd.dc.Point} instances. + * <!-- begin-user-doc * --> <!-- end-user-doc --> - * * @generated */ protected PointItemProvider pointItemProvider; @@ -97,7 +93,6 @@ public class DCItemProviderAdapterFactory extends DCAdapterFactory implements /** * This creates an adapter for a {@link org.eclipse.papyrus.dd.dc.Point}. * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ @Override @@ -119,9 +114,8 @@ public class DCItemProviderAdapterFactory extends DCAdapterFactory implements protected DimensionItemProvider dimensionItemProvider; /** - * This creates an adapter for a {@link org.eclipse.papyrus.dd.dc.Dimension} - * . <!-- begin-user-doc --> <!-- end-user-doc --> - * + * This creates an adapter for a {@link org.eclipse.papyrus.dd.dc.Dimension}. + * <!-- begin-user-doc --> <!-- end-user-doc --> * @generated */ @Override @@ -134,10 +128,9 @@ public class DCItemProviderAdapterFactory extends DCAdapterFactory implements } /** - * This keeps track of the one adapter used for all - * {@link org.eclipse.papyrus.dd.dc.Bounds} instances. <!-- begin-user-doc + * This keeps track of the one adapter used for all {@link org.eclipse.papyrus.dd.dc.Bounds} instances. + * <!-- begin-user-doc * --> <!-- end-user-doc --> - * * @generated */ protected BoundsItemProvider boundsItemProvider; @@ -145,7 +138,6 @@ public class DCItemProviderAdapterFactory extends DCAdapterFactory implements /** * This creates an adapter for a {@link org.eclipse.papyrus.dd.dc.Bounds}. * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ @Override @@ -164,8 +156,7 @@ public class DCItemProviderAdapterFactory extends DCAdapterFactory implements * @generated */ public ComposeableAdapterFactory getRootAdapterFactory() { - return parentAdapterFactory == null ? this : parentAdapterFactory - .getRootAdapterFactory(); + return parentAdapterFactory == null ? this : parentAdapterFactory.getRootAdapterFactory(); } /** @@ -181,7 +172,6 @@ public class DCItemProviderAdapterFactory extends DCAdapterFactory implements /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ @Override @@ -190,9 +180,8 @@ public class DCItemProviderAdapterFactory extends DCAdapterFactory implements } /** - * This implementation substitutes the factory itself as the key for the - * adapter. <!-- begin-user-doc --> <!-- end-user-doc --> - * + * This implementation substitutes the factory itself as the key for the adapter. + * <!-- begin-user-doc --> <!-- end-user-doc --> * @generated */ @Override @@ -202,15 +191,13 @@ public class DCItemProviderAdapterFactory extends DCAdapterFactory implements /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ @Override public Object adapt(Object object, Object type) { if (isFactoryForType(type)) { Object adapter = super.adapt(object, type); - if (!(type instanceof Class<?>) - || (((Class<?>) type).isInstance(adapter))) { + if (!(type instanceof Class<?>) || (((Class<?>)type).isInstance(adapter))) { return adapter; } } @@ -219,8 +206,8 @@ public class DCItemProviderAdapterFactory extends DCAdapterFactory implements } /** - * This adds a listener. <!-- begin-user-doc --> <!-- end-user-doc --> - * + * This adds a listener. + * <!-- begin-user-doc --> <!-- end-user-doc --> * @generated */ public void addListener(INotifyChangedListener notifyChangedListener) { @@ -228,8 +215,8 @@ public class DCItemProviderAdapterFactory extends DCAdapterFactory implements } /** - * This removes a listener. <!-- begin-user-doc --> <!-- end-user-doc --> - * + * This removes a listener. + * <!-- begin-user-doc --> <!-- end-user-doc --> * @generated */ public void removeListener(INotifyChangedListener notifyChangedListener) { @@ -258,12 +245,9 @@ public class DCItemProviderAdapterFactory extends DCAdapterFactory implements * @generated */ public void dispose() { - if (pointItemProvider != null) - pointItemProvider.dispose(); - if (dimensionItemProvider != null) - dimensionItemProvider.dispose(); - if (boundsItemProvider != null) - boundsItemProvider.dispose(); + if (pointItemProvider != null) pointItemProvider.dispose(); + if (dimensionItemProvider != null) dimensionItemProvider.dispose(); + if (boundsItemProvider != null) boundsItemProvider.dispose(); } } diff --git a/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/src/org/eclipse/papyrus/dd/dc/provider/DimensionItemProvider.java b/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/src/org/eclipse/papyrus/dd/dc/provider/DimensionItemProvider.java index 6e873969bb0..cee9cbc0731 100644 --- a/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/src/org/eclipse/papyrus/dd/dc/provider/DimensionItemProvider.java +++ b/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/src/org/eclipse/papyrus/dd/dc/provider/DimensionItemProvider.java @@ -36,10 +36,9 @@ import org.eclipse.papyrus.dd.dc.Dimension; import org.eclipse.papyrus.dd.edit.DDEditPlugin; /** - * This is the item provider adapter for a - * {@link org.eclipse.papyrus.dd.dc.Dimension} object. <!-- begin-user-doc --> + * This is the item provider adapter for a {@link org.eclipse.papyrus.dd.dc.Dimension} object. + * <!-- begin-user-doc --> * <!-- end-user-doc --> - * * @generated */ public class DimensionItemProvider extends ItemProviderAdapter implements @@ -80,15 +79,19 @@ public class DimensionItemProvider extends ItemProviderAdapter implements * @generated */ protected void addWidthPropertyDescriptor(Object object) { - itemPropertyDescriptors.add(createItemPropertyDescriptor( - ((ComposeableAdapterFactory) adapterFactory) - .getRootAdapterFactory(), - getResourceLocator(), - getString("_UI_Dimension_width_feature"), - getString("_UI_PropertyDescriptor_description", - "_UI_Dimension_width_feature", "_UI_Dimension_type"), - DCPackage.Literals.DIMENSION__WIDTH, true, false, false, - ItemPropertyDescriptor.REAL_VALUE_IMAGE, null, null)); + itemPropertyDescriptors.add + (createItemPropertyDescriptor + (((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(), + getResourceLocator(), + getString("_UI_Dimension_width_feature"), + getString("_UI_PropertyDescriptor_description", "_UI_Dimension_width_feature", "_UI_Dimension_type"), + DCPackage.Literals.DIMENSION__WIDTH, + true, + false, + false, + ItemPropertyDescriptor.REAL_VALUE_IMAGE, + null, + null)); } /** @@ -98,46 +101,49 @@ public class DimensionItemProvider extends ItemProviderAdapter implements * @generated */ protected void addHeightPropertyDescriptor(Object object) { - itemPropertyDescriptors.add(createItemPropertyDescriptor( - ((ComposeableAdapterFactory) adapterFactory) - .getRootAdapterFactory(), - getResourceLocator(), - getString("_UI_Dimension_height_feature"), - getString("_UI_PropertyDescriptor_description", - "_UI_Dimension_height_feature", "_UI_Dimension_type"), - DCPackage.Literals.DIMENSION__HEIGHT, true, false, false, - ItemPropertyDescriptor.REAL_VALUE_IMAGE, null, null)); + itemPropertyDescriptors.add + (createItemPropertyDescriptor + (((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(), + getResourceLocator(), + getString("_UI_Dimension_height_feature"), + getString("_UI_PropertyDescriptor_description", "_UI_Dimension_height_feature", "_UI_Dimension_type"), + DCPackage.Literals.DIMENSION__HEIGHT, + true, + false, + false, + ItemPropertyDescriptor.REAL_VALUE_IMAGE, + null, + null)); } /** - * This returns Dimension.gif. <!-- begin-user-doc --> <!-- end-user-doc --> - * + * This returns Dimension.gif. + * <!-- begin-user-doc --> <!-- end-user-doc --> * @generated */ @Override public Object getImage(Object object) { - return overlayImage(object, - getResourceLocator().getImage("full/obj16/Dimension")); + return overlayImage(object, getResourceLocator().getImage("full/obj16/Dimension")); } /** * This returns the label text for the adapted class. <!-- begin-user-doc * --> <!-- end-user-doc --> * - * @generated + * @generated NOT */ @Override public String getText(Object object) { Dimension dimension = (Dimension) object; - return getString("_UI_Dimension_type") + " " + dimension.getWidth(); + return getString("_UI_Dimension_type") + " " + dimension.getWidth() + + ", " + dimension.getHeight(); } /** - * 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 --> <!-- + * 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 @@ -145,11 +151,10 @@ public class DimensionItemProvider extends ItemProviderAdapter implements updateChildren(notification); switch (notification.getFeatureID(Dimension.class)) { - case DCPackage.DIMENSION__WIDTH: - case DCPackage.DIMENSION__HEIGHT: - fireNotifyChanged(new ViewerNotification(notification, - notification.getNotifier(), false, true)); - return; + case DCPackage.DIMENSION__WIDTH: + case DCPackage.DIMENSION__HEIGHT: + fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), false, true)); + return; } super.notifyChanged(notification); } diff --git a/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/src/org/eclipse/papyrus/dd/dc/provider/PointItemProvider.java b/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/src/org/eclipse/papyrus/dd/dc/provider/PointItemProvider.java index 30abcaf0168..dd0da3705d9 100644 --- a/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/src/org/eclipse/papyrus/dd/dc/provider/PointItemProvider.java +++ b/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/src/org/eclipse/papyrus/dd/dc/provider/PointItemProvider.java @@ -36,10 +36,9 @@ import org.eclipse.papyrus.dd.dc.Point; import org.eclipse.papyrus.dd.edit.DDEditPlugin; /** - * This is the item provider adapter for a - * {@link org.eclipse.papyrus.dd.dc.Point} object. <!-- begin-user-doc --> <!-- + * This is the item provider adapter for a {@link org.eclipse.papyrus.dd.dc.Point} object. + * <!-- begin-user-doc --> <!-- * end-user-doc --> - * * @generated */ public class PointItemProvider extends ItemProviderAdapter implements @@ -74,70 +73,77 @@ public class PointItemProvider extends ItemProviderAdapter implements } /** - * This adds a property descriptor for the X feature. <!-- begin-user-doc + * This adds a property descriptor for the X feature. + * <!-- begin-user-doc * --> <!-- end-user-doc --> - * * @generated */ protected void addXPropertyDescriptor(Object object) { - itemPropertyDescriptors.add(createItemPropertyDescriptor( - ((ComposeableAdapterFactory) adapterFactory) - .getRootAdapterFactory(), - getResourceLocator(), - getString("_UI_Point_x_feature"), - getString("_UI_PropertyDescriptor_description", - "_UI_Point_x_feature", "_UI_Point_type"), - DCPackage.Literals.POINT__X, true, false, false, - ItemPropertyDescriptor.REAL_VALUE_IMAGE, null, null)); + itemPropertyDescriptors.add + (createItemPropertyDescriptor + (((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(), + getResourceLocator(), + getString("_UI_Point_x_feature"), + getString("_UI_PropertyDescriptor_description", "_UI_Point_x_feature", "_UI_Point_type"), + DCPackage.Literals.POINT__X, + true, + false, + false, + ItemPropertyDescriptor.REAL_VALUE_IMAGE, + null, + null)); } /** - * This adds a property descriptor for the Y feature. <!-- begin-user-doc + * This adds a property descriptor for the Y feature. + * <!-- begin-user-doc * --> <!-- end-user-doc --> - * * @generated */ protected void addYPropertyDescriptor(Object object) { - itemPropertyDescriptors.add(createItemPropertyDescriptor( - ((ComposeableAdapterFactory) adapterFactory) - .getRootAdapterFactory(), - getResourceLocator(), - getString("_UI_Point_y_feature"), - getString("_UI_PropertyDescriptor_description", - "_UI_Point_y_feature", "_UI_Point_type"), - DCPackage.Literals.POINT__Y, true, false, false, - ItemPropertyDescriptor.REAL_VALUE_IMAGE, null, null)); + itemPropertyDescriptors.add + (createItemPropertyDescriptor + (((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(), + getResourceLocator(), + getString("_UI_Point_y_feature"), + getString("_UI_PropertyDescriptor_description", "_UI_Point_y_feature", "_UI_Point_type"), + DCPackage.Literals.POINT__Y, + true, + false, + false, + ItemPropertyDescriptor.REAL_VALUE_IMAGE, + null, + null)); } /** - * This returns Point.gif. <!-- begin-user-doc --> <!-- end-user-doc --> - * + * This returns Point.gif. + * <!-- begin-user-doc --> <!-- end-user-doc --> * @generated */ @Override public Object getImage(Object object) { - return overlayImage(object, - getResourceLocator().getImage("full/obj16/Point")); + return overlayImage(object, getResourceLocator().getImage("full/obj16/Point")); } /** * This returns the label text for the adapted class. <!-- begin-user-doc * --> <!-- end-user-doc --> * - * @generated + * @generated NOT */ @Override public String getText(Object object) { Point point = (Point) object; - return getString("_UI_Point_type") + " " + point.getX(); + return getString("_UI_Point_type") + " " + point.getX() + ", " + + point.getY(); } /** - * 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 --> <!-- + * 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 @@ -145,11 +151,10 @@ public class PointItemProvider extends ItemProviderAdapter implements updateChildren(notification); switch (notification.getFeatureID(Point.class)) { - case DCPackage.POINT__X: - case DCPackage.POINT__Y: - fireNotifyChanged(new ViewerNotification(notification, - notification.getNotifier(), false, true)); - return; + case DCPackage.POINT__X: + case DCPackage.POINT__Y: + fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), false, true)); + return; } super.notifyChanged(notification); } diff --git a/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/src/org/eclipse/papyrus/dd/dg/provider/CanvasItemProvider.java b/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/src/org/eclipse/papyrus/dd/dg/provider/CanvasItemProvider.java index 1d72e798102..3d5b31485f9 100644 --- a/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/src/org/eclipse/papyrus/dd/dg/provider/CanvasItemProvider.java +++ b/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/src/org/eclipse/papyrus/dd/dg/provider/CanvasItemProvider.java @@ -13,12 +13,9 @@ package org.eclipse.papyrus.dd.dg.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.ecore.EStructuralFeature; - import org.eclipse.emf.edit.provider.IEditingDomainItemProvider; import org.eclipse.emf.edit.provider.IItemColorProvider; import org.eclipse.emf.edit.provider.IItemFontProvider; @@ -28,17 +25,14 @@ 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.ViewerNotification; - import org.eclipse.papyrus.dd.dc.DCFactory; - import org.eclipse.papyrus.dd.dg.Canvas; import org.eclipse.papyrus.dd.dg.DGPackage; /** - * This is the item provider adapter for a - * {@link org.eclipse.papyrus.dd.dg.Canvas} object. <!-- begin-user-doc --> <!-- + * This is the item provider adapter for a {@link org.eclipse.papyrus.dd.dg.Canvas} object. + * <!-- begin-user-doc --> <!-- * end-user-doc --> - * * @generated */ public class CanvasItemProvider extends GroupItemProvider implements @@ -71,13 +65,10 @@ public class CanvasItemProvider extends GroupItemProvider implements } /** - * This specifies how to implement {@link #getChildren} and is used to - * deduce an appropriate feature for an - * {@link org.eclipse.emf.edit.command.AddCommand}, - * {@link org.eclipse.emf.edit.command.RemoveCommand} or - * {@link org.eclipse.emf.edit.command.MoveCommand} in - * {@link #createCommand}. <!-- begin-user-doc --> <!-- end-user-doc --> - * + * This specifies how to implement {@link #getChildren} and is used to deduce an appropriate feature for an + * {@link org.eclipse.emf.edit.command.AddCommand}, {@link org.eclipse.emf.edit.command.RemoveCommand} or + * {@link org.eclipse.emf.edit.command.MoveCommand} in {@link #createCommand}. + * <!-- begin-user-doc --> <!-- end-user-doc --> * @generated */ @Override @@ -92,48 +83,45 @@ public class CanvasItemProvider extends GroupItemProvider implements /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ @Override protected EStructuralFeature getChildFeature(Object object, Object child) { - // Check the type of the specified child object and return the proper - // feature to use for + // Check the type of the specified child object and return the proper feature to use for // adding (see {@link AddCommand}) it as a child. return super.getChildFeature(object, child); } /** - * This returns Canvas.gif. <!-- begin-user-doc --> <!-- end-user-doc --> - * + * This returns Canvas.gif. + * <!-- begin-user-doc --> <!-- end-user-doc --> * @generated */ @Override public Object getImage(Object object) { - return overlayImage(object, - getResourceLocator().getImage("full/obj16/Canvas")); + return overlayImage(object, getResourceLocator().getImage("full/obj16/Canvas")); } /** - * This returns the label text for the adapted class. <!-- begin-user-doc + * This returns the label text for the adapted class. + * <!-- begin-user-doc * --> <!-- end-user-doc --> - * * @generated */ @Override public String getText(Object object) { - String label = ((Canvas) object).getId(); - return label == null || label.length() == 0 ? getString("_UI_Canvas_type") - : getString("_UI_Canvas_type") + " " + label; + String label = ((Canvas)object).getId(); + return label == null || label.length() == 0 ? + getString("_UI_Canvas_type") : + getString("_UI_Canvas_type") + " " + label; } /** - * 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 --> <!-- + * 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 @@ -141,10 +129,9 @@ public class CanvasItemProvider extends GroupItemProvider implements updateChildren(notification); switch (notification.getFeatureID(Canvas.class)) { - case DGPackage.CANVAS__BOUNDS: - fireNotifyChanged(new ViewerNotification(notification, - notification.getNotifier(), true, false)); - return; + case DGPackage.CANVAS__BOUNDS: + fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), true, false)); + return; } super.notifyChanged(notification); } @@ -161,9 +148,10 @@ public class CanvasItemProvider extends GroupItemProvider implements Collection<Object> newChildDescriptors, Object object) { super.collectNewChildDescriptors(newChildDescriptors, object); - newChildDescriptors.add(createChildParameter( - DGPackage.Literals.CANVAS__BOUNDS, - DCFactory.eINSTANCE.createBounds())); + newChildDescriptors.add + (createChildParameter + (DGPackage.Literals.CANVAS__BOUNDS, + DCFactory.eINSTANCE.createBounds())); } } diff --git a/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/src/org/eclipse/papyrus/dd/dg/provider/CircleItemProvider.java b/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/src/org/eclipse/papyrus/dd/dg/provider/CircleItemProvider.java index f32a3af6ab7..6299674439b 100644 --- a/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/src/org/eclipse/papyrus/dd/dg/provider/CircleItemProvider.java +++ b/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/src/org/eclipse/papyrus/dd/dg/provider/CircleItemProvider.java @@ -37,10 +37,9 @@ import org.eclipse.papyrus.dd.dg.Circle; import org.eclipse.papyrus.dd.dg.DGPackage; /** - * This is the item provider adapter for a - * {@link org.eclipse.papyrus.dd.dg.Circle} object. <!-- begin-user-doc --> <!-- + * This is the item provider adapter for a {@link org.eclipse.papyrus.dd.dg.Circle} object. + * <!-- begin-user-doc --> <!-- * end-user-doc --> - * * @generated */ public class CircleItemProvider extends GraphicalElementItemProvider implements @@ -80,25 +79,26 @@ public class CircleItemProvider extends GraphicalElementItemProvider implements * @generated */ protected void addRadiusPropertyDescriptor(Object object) { - itemPropertyDescriptors.add(createItemPropertyDescriptor( - ((ComposeableAdapterFactory) adapterFactory) - .getRootAdapterFactory(), - getResourceLocator(), - getString("_UI_Circle_radius_feature"), - getString("_UI_PropertyDescriptor_description", - "_UI_Circle_radius_feature", "_UI_Circle_type"), - DGPackage.Literals.CIRCLE__RADIUS, true, false, false, - ItemPropertyDescriptor.REAL_VALUE_IMAGE, null, null)); + itemPropertyDescriptors.add + (createItemPropertyDescriptor + (((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(), + getResourceLocator(), + getString("_UI_Circle_radius_feature"), + getString("_UI_PropertyDescriptor_description", "_UI_Circle_radius_feature", "_UI_Circle_type"), + DGPackage.Literals.CIRCLE__RADIUS, + true, + false, + false, + ItemPropertyDescriptor.REAL_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}, - * {@link org.eclipse.emf.edit.command.RemoveCommand} or - * {@link org.eclipse.emf.edit.command.MoveCommand} in - * {@link #createCommand}. <!-- begin-user-doc --> <!-- end-user-doc --> - * + * This specifies how to implement {@link #getChildren} and is used to deduce an appropriate feature for an + * {@link org.eclipse.emf.edit.command.AddCommand}, {@link org.eclipse.emf.edit.command.RemoveCommand} or + * {@link org.eclipse.emf.edit.command.MoveCommand} in {@link #createCommand}. + * <!-- begin-user-doc --> <!-- end-user-doc --> * @generated */ @Override @@ -113,48 +113,45 @@ public class CircleItemProvider extends GraphicalElementItemProvider implements /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ @Override protected EStructuralFeature getChildFeature(Object object, Object child) { - // Check the type of the specified child object and return the proper - // feature to use for + // Check the type of the specified child object and return the proper feature to use for // adding (see {@link AddCommand}) it as a child. return super.getChildFeature(object, child); } /** - * This returns Circle.gif. <!-- begin-user-doc --> <!-- end-user-doc --> - * + * This returns Circle.gif. + * <!-- begin-user-doc --> <!-- end-user-doc --> * @generated */ @Override public Object getImage(Object object) { - return overlayImage(object, - getResourceLocator().getImage("full/obj16/Circle")); + return overlayImage(object, getResourceLocator().getImage("full/obj16/Circle")); } /** - * This returns the label text for the adapted class. <!-- begin-user-doc + * This returns the label text for the adapted class. + * <!-- begin-user-doc * --> <!-- end-user-doc --> - * * @generated */ @Override public String getText(Object object) { - String label = ((Circle) object).getId(); - return label == null || label.length() == 0 ? getString("_UI_Circle_type") - : getString("_UI_Circle_type") + " " + label; + String label = ((Circle)object).getId(); + return label == null || label.length() == 0 ? + getString("_UI_Circle_type") : + getString("_UI_Circle_type") + " " + label; } /** - * 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 --> <!-- + * 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 @@ -162,14 +159,12 @@ public class CircleItemProvider extends GraphicalElementItemProvider implements updateChildren(notification); switch (notification.getFeatureID(Circle.class)) { - case DGPackage.CIRCLE__RADIUS: - fireNotifyChanged(new ViewerNotification(notification, - notification.getNotifier(), false, true)); - return; - case DGPackage.CIRCLE__CENTER: - fireNotifyChanged(new ViewerNotification(notification, - notification.getNotifier(), true, false)); - return; + case DGPackage.CIRCLE__RADIUS: + fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), false, true)); + return; + case DGPackage.CIRCLE__CENTER: + fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), true, false)); + return; } super.notifyChanged(notification); } @@ -186,9 +181,10 @@ public class CircleItemProvider extends GraphicalElementItemProvider implements Collection<Object> newChildDescriptors, Object object) { super.collectNewChildDescriptors(newChildDescriptors, object); - newChildDescriptors.add(createChildParameter( - DGPackage.Literals.CIRCLE__CENTER, - DCFactory.eINSTANCE.createPoint())); + newChildDescriptors.add + (createChildParameter + (DGPackage.Literals.CIRCLE__CENTER, + DCFactory.eINSTANCE.createPoint())); } } diff --git a/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/src/org/eclipse/papyrus/dd/dg/provider/ClipPathItemProvider.java b/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/src/org/eclipse/papyrus/dd/dg/provider/ClipPathItemProvider.java index 308996c1e3d..f8f0e6f160b 100644 --- a/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/src/org/eclipse/papyrus/dd/dg/provider/ClipPathItemProvider.java +++ b/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/src/org/eclipse/papyrus/dd/dg/provider/ClipPathItemProvider.java @@ -29,10 +29,9 @@ import org.eclipse.emf.edit.provider.ITreeItemContentProvider; import org.eclipse.papyrus.dd.dg.ClipPath; /** - * This is the item provider adapter for a - * {@link org.eclipse.papyrus.dd.dg.ClipPath} object. <!-- begin-user-doc --> + * This is the item provider adapter for a {@link org.eclipse.papyrus.dd.dg.ClipPath} object. + * <!-- begin-user-doc --> * <!-- end-user-doc --> - * * @generated */ public class ClipPathItemProvider extends GroupItemProvider implements @@ -65,35 +64,34 @@ public class ClipPathItemProvider extends GroupItemProvider implements } /** - * This returns ClipPath.gif. <!-- begin-user-doc --> <!-- end-user-doc --> - * + * This returns ClipPath.gif. + * <!-- begin-user-doc --> <!-- end-user-doc --> * @generated */ @Override public Object getImage(Object object) { - return overlayImage(object, - getResourceLocator().getImage("full/obj16/ClipPath")); + return overlayImage(object, getResourceLocator().getImage("full/obj16/ClipPath")); } /** - * This returns the label text for the adapted class. <!-- begin-user-doc + * This returns the label text for the adapted class. + * <!-- begin-user-doc * --> <!-- end-user-doc --> - * * @generated */ @Override public String getText(Object object) { - String label = ((ClipPath) object).getId(); - return label == null || label.length() == 0 ? getString("_UI_ClipPath_type") - : getString("_UI_ClipPath_type") + " " + label; + String label = ((ClipPath)object).getId(); + return label == null || label.length() == 0 ? + getString("_UI_ClipPath_type") : + getString("_UI_ClipPath_type") + " " + label; } /** - * 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 --> <!-- + * 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 diff --git a/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/src/org/eclipse/papyrus/dd/dg/provider/ClosePathItemProvider.java b/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/src/org/eclipse/papyrus/dd/dg/provider/ClosePathItemProvider.java index a4b2a75314b..9dff16f4eee 100644 --- a/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/src/org/eclipse/papyrus/dd/dg/provider/ClosePathItemProvider.java +++ b/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/src/org/eclipse/papyrus/dd/dg/provider/ClosePathItemProvider.java @@ -29,10 +29,9 @@ import org.eclipse.emf.edit.provider.ITreeItemContentProvider; import org.eclipse.papyrus.dd.dg.ClosePath; /** - * This is the item provider adapter for a - * {@link org.eclipse.papyrus.dd.dg.ClosePath} object. <!-- begin-user-doc --> + * This is the item provider adapter for a {@link org.eclipse.papyrus.dd.dg.ClosePath} object. + * <!-- begin-user-doc --> * <!-- end-user-doc --> - * * @generated */ public class ClosePathItemProvider extends PathCommandItemProvider implements @@ -65,34 +64,32 @@ public class ClosePathItemProvider extends PathCommandItemProvider implements } /** - * This returns ClosePath.gif. <!-- begin-user-doc --> <!-- end-user-doc --> - * + * This returns ClosePath.gif. + * <!-- begin-user-doc --> <!-- end-user-doc --> * @generated */ @Override public Object getImage(Object object) { - return overlayImage(object, - getResourceLocator().getImage("full/obj16/ClosePath")); + return overlayImage(object, getResourceLocator().getImage("full/obj16/ClosePath")); } /** - * This returns the label text for the adapted class. <!-- begin-user-doc + * This returns the label text for the adapted class. + * <!-- begin-user-doc * --> <!-- end-user-doc --> - * * @generated */ @Override public String getText(Object object) { - ClosePath closePath = (ClosePath) object; + ClosePath closePath = (ClosePath)object; return getString("_UI_ClosePath_type") + " " + closePath.isRelative(); } /** - * 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 --> <!-- + * 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 diff --git a/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/src/org/eclipse/papyrus/dd/dg/provider/CubicCurveToItemProvider.java b/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/src/org/eclipse/papyrus/dd/dg/provider/CubicCurveToItemProvider.java index 2ccd5004691..aeb1f0c7032 100644 --- a/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/src/org/eclipse/papyrus/dd/dg/provider/CubicCurveToItemProvider.java +++ b/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/src/org/eclipse/papyrus/dd/dg/provider/CubicCurveToItemProvider.java @@ -35,10 +35,9 @@ import org.eclipse.papyrus.dd.dg.CubicCurveTo; import org.eclipse.papyrus.dd.dg.DGPackage; /** - * This is the item provider adapter for a - * {@link org.eclipse.papyrus.dd.dg.CubicCurveTo} object. <!-- begin-user-doc + * This is the item provider adapter for a {@link org.eclipse.papyrus.dd.dg.CubicCurveTo} object. + * <!-- begin-user-doc * --> <!-- end-user-doc --> - * * @generated */ public class CubicCurveToItemProvider extends PathCommandItemProvider implements @@ -71,13 +70,10 @@ public class CubicCurveToItemProvider extends PathCommandItemProvider implements } /** - * This specifies how to implement {@link #getChildren} and is used to - * deduce an appropriate feature for an - * {@link org.eclipse.emf.edit.command.AddCommand}, - * {@link org.eclipse.emf.edit.command.RemoveCommand} or - * {@link org.eclipse.emf.edit.command.MoveCommand} in - * {@link #createCommand}. <!-- begin-user-doc --> <!-- end-user-doc --> - * + * This specifies how to implement {@link #getChildren} and is used to deduce an appropriate feature for an + * {@link org.eclipse.emf.edit.command.AddCommand}, {@link org.eclipse.emf.edit.command.RemoveCommand} or + * {@link org.eclipse.emf.edit.command.MoveCommand} in {@link #createCommand}. + * <!-- begin-user-doc --> <!-- end-user-doc --> * @generated */ @Override @@ -85,24 +81,20 @@ public class CubicCurveToItemProvider extends PathCommandItemProvider implements Object object) { if (childrenFeatures == null) { super.getChildrenFeatures(object); + childrenFeatures.add(DGPackage.Literals.CUBIC_CURVE_TO__START_CONTROL); + childrenFeatures.add(DGPackage.Literals.CUBIC_CURVE_TO__END_CONTROL); childrenFeatures.add(DGPackage.Literals.CUBIC_CURVE_TO__POINT); - childrenFeatures - .add(DGPackage.Literals.CUBIC_CURVE_TO__START_CONTROL); - childrenFeatures - .add(DGPackage.Literals.CUBIC_CURVE_TO__END_CONTROL); } return childrenFeatures; } /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ @Override protected EStructuralFeature getChildFeature(Object object, Object child) { - // Check the type of the specified child object and return the proper - // feature to use for + // Check the type of the specified child object and return the proper feature to use for // adding (see {@link AddCommand}) it as a child. return super.getChildFeature(object, child); @@ -116,29 +108,26 @@ public class CubicCurveToItemProvider extends PathCommandItemProvider implements */ @Override public Object getImage(Object object) { - return overlayImage(object, - getResourceLocator().getImage("full/obj16/CubicCurveTo")); + return overlayImage(object, getResourceLocator().getImage("full/obj16/CubicCurveTo")); } /** - * This returns the label text for the adapted class. <!-- begin-user-doc + * This returns the label text for the adapted class. + * <!-- begin-user-doc * --> <!-- end-user-doc --> - * * @generated */ @Override public String getText(Object object) { - CubicCurveTo cubicCurveTo = (CubicCurveTo) object; - return getString("_UI_CubicCurveTo_type") + " " - + cubicCurveTo.isRelative(); + CubicCurveTo cubicCurveTo = (CubicCurveTo)object; + return getString("_UI_CubicCurveTo_type") + " " + cubicCurveTo.isRelative(); } /** - * 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 --> <!-- + * 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 @@ -146,12 +135,11 @@ public class CubicCurveToItemProvider extends PathCommandItemProvider implements updateChildren(notification); switch (notification.getFeatureID(CubicCurveTo.class)) { - case DGPackage.CUBIC_CURVE_TO__POINT: - case DGPackage.CUBIC_CURVE_TO__START_CONTROL: - case DGPackage.CUBIC_CURVE_TO__END_CONTROL: - fireNotifyChanged(new ViewerNotification(notification, - notification.getNotifier(), true, false)); - return; + case DGPackage.CUBIC_CURVE_TO__START_CONTROL: + case DGPackage.CUBIC_CURVE_TO__END_CONTROL: + case DGPackage.CUBIC_CURVE_TO__POINT: + fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), true, false)); + return; } super.notifyChanged(notification); } @@ -168,17 +156,20 @@ public class CubicCurveToItemProvider extends PathCommandItemProvider implements Collection<Object> newChildDescriptors, Object object) { super.collectNewChildDescriptors(newChildDescriptors, object); - newChildDescriptors.add(createChildParameter( - DGPackage.Literals.CUBIC_CURVE_TO__POINT, - DCFactory.eINSTANCE.createPoint())); + newChildDescriptors.add + (createChildParameter + (DGPackage.Literals.CUBIC_CURVE_TO__START_CONTROL, + DCFactory.eINSTANCE.createPoint())); - newChildDescriptors.add(createChildParameter( - DGPackage.Literals.CUBIC_CURVE_TO__START_CONTROL, - DCFactory.eINSTANCE.createPoint())); + newChildDescriptors.add + (createChildParameter + (DGPackage.Literals.CUBIC_CURVE_TO__END_CONTROL, + DCFactory.eINSTANCE.createPoint())); - newChildDescriptors.add(createChildParameter( - DGPackage.Literals.CUBIC_CURVE_TO__END_CONTROL, - DCFactory.eINSTANCE.createPoint())); + newChildDescriptors.add + (createChildParameter + (DGPackage.Literals.CUBIC_CURVE_TO__POINT, + DCFactory.eINSTANCE.createPoint())); } /** @@ -194,14 +185,15 @@ public class CubicCurveToItemProvider extends PathCommandItemProvider implements Object childFeature = feature; Object childObject = child; - boolean qualify = childFeature == DGPackage.Literals.CUBIC_CURVE_TO__POINT - || childFeature == DGPackage.Literals.CUBIC_CURVE_TO__START_CONTROL - || childFeature == DGPackage.Literals.CUBIC_CURVE_TO__END_CONTROL; + boolean qualify = + childFeature == DGPackage.Literals.CUBIC_CURVE_TO__START_CONTROL || + childFeature == DGPackage.Literals.CUBIC_CURVE_TO__END_CONTROL || + childFeature == DGPackage.Literals.CUBIC_CURVE_TO__POINT; if (qualify) { - return getString("_UI_CreateChild_text2", new Object[] { - getTypeText(childObject), getFeatureText(childFeature), - getTypeText(owner) }); + return getString + ("_UI_CreateChild_text2", + new Object[] { getTypeText(childObject), getFeatureText(childFeature), getTypeText(owner) }); } return super.getCreateChildText(owner, feature, child, selection); } diff --git a/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/src/org/eclipse/papyrus/dd/dg/provider/DGItemProviderAdapterFactory.java b/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/src/org/eclipse/papyrus/dd/dg/provider/DGItemProviderAdapterFactory.java index b0f6ee0a7ca..e09cde68bab 100644 --- a/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/src/org/eclipse/papyrus/dd/dg/provider/DGItemProviderAdapterFactory.java +++ b/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/src/org/eclipse/papyrus/dd/dg/provider/DGItemProviderAdapterFactory.java @@ -35,21 +35,19 @@ import org.eclipse.emf.edit.provider.ITreeItemContentProvider; import org.eclipse.papyrus.dd.dg.util.DGAdapterFactory; /** - * This is the factory that is used to provide the interfaces needed to support - * Viewers. The adapters generated by this factory convert EMF adapter - * notifications into calls to {@link #fireNotifyChanged fireNotifyChanged}. The - * adapters also support Eclipse property sheets. Note that most of the adapters - * are shared among multiple instances. <!-- begin-user-doc --> <!-- + * This is the factory that is used to provide the interfaces needed to support Viewers. + * The adapters generated by this factory convert EMF adapter notifications into calls to {@link #fireNotifyChanged fireNotifyChanged}. + * The adapters also support Eclipse property sheets. + * Note that most of the adapters are shared among multiple instances. + * <!-- begin-user-doc --> <!-- * end-user-doc --> - * * @generated */ public class DGItemProviderAdapterFactory extends DGAdapterFactory implements ComposeableAdapterFactory, IChangeNotifier, IDisposable { /** - * This keeps track of the root adapter factory that delegates to this - * adapter factory. <!-- begin-user-doc --> <!-- end-user-doc --> - * + * This keeps track of the root adapter factory that delegates to this adapter factory. + * <!-- begin-user-doc --> <!-- end-user-doc --> * @generated */ protected ComposedAdapterFactory parentAdapterFactory; @@ -64,10 +62,9 @@ public class DGItemProviderAdapterFactory extends DGAdapterFactory implements protected IChangeNotifier changeNotifier = new ChangeNotifier(); /** - * This keeps track of all the supported types checked by - * {@link #isFactoryForType isFactoryForType}. <!-- begin-user-doc --> <!-- + * This keeps track of all the supported types checked by {@link #isFactoryForType isFactoryForType}. + * <!-- begin-user-doc --> <!-- * end-user-doc --> - * * @generated */ protected Collection<Object> supportedTypes = new ArrayList<Object>(); @@ -89,10 +86,9 @@ public class DGItemProviderAdapterFactory extends DGAdapterFactory implements } /** - * This keeps track of the one adapter used for all - * {@link org.eclipse.papyrus.dd.dg.Canvas} instances. <!-- begin-user-doc + * This keeps track of the one adapter used for all {@link org.eclipse.papyrus.dd.dg.Canvas} instances. + * <!-- begin-user-doc * --> <!-- end-user-doc --> - * * @generated */ protected CanvasItemProvider canvasItemProvider; @@ -100,7 +96,6 @@ public class DGItemProviderAdapterFactory extends DGAdapterFactory implements /** * This creates an adapter for a {@link org.eclipse.papyrus.dd.dg.Canvas}. * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ @Override @@ -113,10 +108,9 @@ public class DGItemProviderAdapterFactory extends DGAdapterFactory implements } /** - * This keeps track of the one adapter used for all - * {@link org.eclipse.papyrus.dd.dg.Group} instances. <!-- begin-user-doc + * This keeps track of the one adapter used for all {@link org.eclipse.papyrus.dd.dg.Group} instances. + * <!-- begin-user-doc * --> <!-- end-user-doc --> - * * @generated */ protected GroupItemProvider groupItemProvider; @@ -124,7 +118,6 @@ public class DGItemProviderAdapterFactory extends DGAdapterFactory implements /** * This creates an adapter for a {@link org.eclipse.papyrus.dd.dg.Group}. * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ @Override @@ -137,10 +130,9 @@ public class DGItemProviderAdapterFactory extends DGAdapterFactory implements } /** - * This keeps track of the one adapter used for all - * {@link org.eclipse.papyrus.dd.dg.MoveTo} instances. <!-- begin-user-doc + * This keeps track of the one adapter used for all {@link org.eclipse.papyrus.dd.dg.MoveTo} instances. + * <!-- begin-user-doc * --> <!-- end-user-doc --> - * * @generated */ protected MoveToItemProvider moveToItemProvider; @@ -148,7 +140,6 @@ public class DGItemProviderAdapterFactory extends DGAdapterFactory implements /** * This creates an adapter for a {@link org.eclipse.papyrus.dd.dg.MoveTo}. * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ @Override @@ -161,10 +152,9 @@ public class DGItemProviderAdapterFactory extends DGAdapterFactory implements } /** - * This keeps track of the one adapter used for all - * {@link org.eclipse.papyrus.dd.dg.ClipPath} instances. <!-- begin-user-doc + * This keeps track of the one adapter used for all {@link org.eclipse.papyrus.dd.dg.ClipPath} instances. + * <!-- begin-user-doc * --> <!-- end-user-doc --> - * * @generated */ protected ClipPathItemProvider clipPathItemProvider; @@ -172,7 +162,6 @@ public class DGItemProviderAdapterFactory extends DGAdapterFactory implements /** * This creates an adapter for a {@link org.eclipse.papyrus.dd.dg.ClipPath}. * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ @Override @@ -185,10 +174,9 @@ public class DGItemProviderAdapterFactory extends DGAdapterFactory implements } /** - * This keeps track of the one adapter used for all - * {@link org.eclipse.papyrus.dd.dg.Style} instances. <!-- begin-user-doc + * This keeps track of the one adapter used for all {@link org.eclipse.papyrus.dd.dg.Style} instances. + * <!-- begin-user-doc * --> <!-- end-user-doc --> - * * @generated */ protected StyleItemProvider styleItemProvider; @@ -196,7 +184,6 @@ public class DGItemProviderAdapterFactory extends DGAdapterFactory implements /** * This creates an adapter for a {@link org.eclipse.papyrus.dd.dg.Style}. * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ @Override @@ -209,10 +196,9 @@ public class DGItemProviderAdapterFactory extends DGAdapterFactory implements } /** - * This keeps track of the one adapter used for all - * {@link org.eclipse.papyrus.dd.dg.Paint} instances. <!-- begin-user-doc + * This keeps track of the one adapter used for all {@link org.eclipse.papyrus.dd.dg.Paint} instances. + * <!-- begin-user-doc * --> <!-- end-user-doc --> - * * @generated */ protected PaintItemProvider paintItemProvider; @@ -220,7 +206,6 @@ public class DGItemProviderAdapterFactory extends DGAdapterFactory implements /** * This creates an adapter for a {@link org.eclipse.papyrus.dd.dg.Paint}. * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ @Override @@ -233,10 +218,9 @@ public class DGItemProviderAdapterFactory extends DGAdapterFactory implements } /** - * This keeps track of the one adapter used for all - * {@link org.eclipse.papyrus.dd.dg.Circle} instances. <!-- begin-user-doc + * This keeps track of the one adapter used for all {@link org.eclipse.papyrus.dd.dg.Circle} instances. + * <!-- begin-user-doc * --> <!-- end-user-doc --> - * * @generated */ protected CircleItemProvider circleItemProvider; @@ -244,7 +228,6 @@ public class DGItemProviderAdapterFactory extends DGAdapterFactory implements /** * This creates an adapter for a {@link org.eclipse.papyrus.dd.dg.Circle}. * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ @Override @@ -266,9 +249,8 @@ public class DGItemProviderAdapterFactory extends DGAdapterFactory implements protected ClosePathItemProvider closePathItemProvider; /** - * This creates an adapter for a {@link org.eclipse.papyrus.dd.dg.ClosePath} - * . <!-- begin-user-doc --> <!-- end-user-doc --> - * + * This creates an adapter for a {@link org.eclipse.papyrus.dd.dg.ClosePath}. + * <!-- begin-user-doc --> <!-- end-user-doc --> * @generated */ @Override @@ -290,10 +272,9 @@ public class DGItemProviderAdapterFactory extends DGAdapterFactory implements protected CubicCurveToItemProvider cubicCurveToItemProvider; /** - * This creates an adapter for a - * {@link org.eclipse.papyrus.dd.dg.CubicCurveTo}. <!-- begin-user-doc --> + * This creates an adapter for a {@link org.eclipse.papyrus.dd.dg.CubicCurveTo}. + * <!-- begin-user-doc --> * <!-- end-user-doc --> - * * @generated */ @Override @@ -315,10 +296,9 @@ public class DGItemProviderAdapterFactory extends DGAdapterFactory implements protected DefinitionsItemProvider definitionsItemProvider; /** - * This creates an adapter for a - * {@link org.eclipse.papyrus.dd.dg.Definitions}. <!-- begin-user-doc --> + * This creates an adapter for a {@link org.eclipse.papyrus.dd.dg.Definitions}. + * <!-- begin-user-doc --> * <!-- end-user-doc --> - * * @generated */ @Override @@ -340,10 +320,9 @@ public class DGItemProviderAdapterFactory extends DGAdapterFactory implements protected StyleSheetItemProvider styleSheetItemProvider; /** - * This creates an adapter for a - * {@link org.eclipse.papyrus.dd.dg.StyleSheet}. <!-- begin-user-doc --> + * This creates an adapter for a {@link org.eclipse.papyrus.dd.dg.StyleSheet}. + * <!-- begin-user-doc --> * <!-- end-user-doc --> - * * @generated */ @Override @@ -365,9 +344,8 @@ public class DGItemProviderAdapterFactory extends DGAdapterFactory implements protected StyleRuleItemProvider styleRuleItemProvider; /** - * This creates an adapter for a {@link org.eclipse.papyrus.dd.dg.StyleRule} - * . <!-- begin-user-doc --> <!-- end-user-doc --> - * + * This creates an adapter for a {@link org.eclipse.papyrus.dd.dg.StyleRule}. + * <!-- begin-user-doc --> <!-- end-user-doc --> * @generated */ @Override @@ -389,10 +367,9 @@ public class DGItemProviderAdapterFactory extends DGAdapterFactory implements protected StyleSelectorItemProvider styleSelectorItemProvider; /** - * This creates an adapter for a - * {@link org.eclipse.papyrus.dd.dg.StyleSelector}. <!-- begin-user-doc --> + * This creates an adapter for a {@link org.eclipse.papyrus.dd.dg.StyleSelector}. + * <!-- begin-user-doc --> * <!-- end-user-doc --> - * * @generated */ @Override @@ -405,10 +382,9 @@ public class DGItemProviderAdapterFactory extends DGAdapterFactory implements } /** - * This keeps track of the one adapter used for all - * {@link org.eclipse.papyrus.dd.dg.Ellipse} instances. <!-- begin-user-doc + * This keeps track of the one adapter used for all {@link org.eclipse.papyrus.dd.dg.Ellipse} instances. + * <!-- begin-user-doc * --> <!-- end-user-doc --> - * * @generated */ protected EllipseItemProvider ellipseItemProvider; @@ -416,7 +392,6 @@ public class DGItemProviderAdapterFactory extends DGAdapterFactory implements /** * This creates an adapter for a {@link org.eclipse.papyrus.dd.dg.Ellipse}. * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ @Override @@ -430,28 +405,26 @@ public class DGItemProviderAdapterFactory extends DGAdapterFactory implements /** * This keeps track of the one adapter used for all - * {@link org.eclipse.papyrus.dd.dg.EllipticalCurveTo} instances. <!-- + * {@link org.eclipse.papyrus.dd.dg.EllipticalArcTo} instances. <!-- * begin-user-doc --> <!-- end-user-doc --> * * @generated */ - protected EllipticalCurveToItemProvider ellipticalCurveToItemProvider; + protected EllipticalArcToItemProvider ellipticalArcToItemProvider; /** - * This creates an adapter for a - * {@link org.eclipse.papyrus.dd.dg.EllipticalCurveTo}. <!-- begin-user-doc + * This creates an adapter for a {@link org.eclipse.papyrus.dd.dg.EllipticalArcTo}. + * <!-- begin-user-doc * --> <!-- end-user-doc --> - * * @generated */ @Override - public Adapter createEllipticalCurveToAdapter() { - if (ellipticalCurveToItemProvider == null) { - ellipticalCurveToItemProvider = new EllipticalCurveToItemProvider( - this); + public Adapter createEllipticalArcToAdapter() { + if (ellipticalArcToItemProvider == null) { + ellipticalArcToItemProvider = new EllipticalArcToItemProvider(this); } - return ellipticalCurveToItemProvider; + return ellipticalArcToItemProvider; } /** @@ -464,17 +437,15 @@ public class DGItemProviderAdapterFactory extends DGAdapterFactory implements protected QuadraticCurveToItemProvider quadraticCurveToItemProvider; /** - * This creates an adapter for a - * {@link org.eclipse.papyrus.dd.dg.QuadraticCurveTo}. <!-- begin-user-doc + * This creates an adapter for a {@link org.eclipse.papyrus.dd.dg.QuadraticCurveTo}. + * <!-- begin-user-doc * --> <!-- end-user-doc --> - * * @generated */ @Override public Adapter createQuadraticCurveToAdapter() { if (quadraticCurveToItemProvider == null) { - quadraticCurveToItemProvider = new QuadraticCurveToItemProvider( - this); + quadraticCurveToItemProvider = new QuadraticCurveToItemProvider(this); } return quadraticCurveToItemProvider; @@ -490,10 +461,9 @@ public class DGItemProviderAdapterFactory extends DGAdapterFactory implements protected GradientStopItemProvider gradientStopItemProvider; /** - * This creates an adapter for a - * {@link org.eclipse.papyrus.dd.dg.GradientStop}. <!-- begin-user-doc --> + * This creates an adapter for a {@link org.eclipse.papyrus.dd.dg.GradientStop}. + * <!-- begin-user-doc --> * <!-- end-user-doc --> - * * @generated */ @Override @@ -506,10 +476,9 @@ public class DGItemProviderAdapterFactory extends DGAdapterFactory implements } /** - * This keeps track of the one adapter used for all - * {@link org.eclipse.papyrus.dd.dg.Image} instances. <!-- begin-user-doc + * This keeps track of the one adapter used for all {@link org.eclipse.papyrus.dd.dg.Image} instances. + * <!-- begin-user-doc * --> <!-- end-user-doc --> - * * @generated */ protected ImageItemProvider imageItemProvider; @@ -517,7 +486,6 @@ public class DGItemProviderAdapterFactory extends DGAdapterFactory implements /** * This creates an adapter for a {@link org.eclipse.papyrus.dd.dg.Image}. * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ @Override @@ -530,10 +498,9 @@ public class DGItemProviderAdapterFactory extends DGAdapterFactory implements } /** - * This keeps track of the one adapter used for all - * {@link org.eclipse.papyrus.dd.dg.Line} instances. <!-- begin-user-doc --> + * This keeps track of the one adapter used for all {@link org.eclipse.papyrus.dd.dg.Line} instances. + * <!-- begin-user-doc --> * <!-- end-user-doc --> - * * @generated */ protected LineItemProvider lineItemProvider; @@ -541,7 +508,6 @@ public class DGItemProviderAdapterFactory extends DGAdapterFactory implements /** * This creates an adapter for a {@link org.eclipse.papyrus.dd.dg.Line}. * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ @Override @@ -554,10 +520,9 @@ public class DGItemProviderAdapterFactory extends DGAdapterFactory implements } /** - * This keeps track of the one adapter used for all - * {@link org.eclipse.papyrus.dd.dg.Marker} instances. <!-- begin-user-doc + * This keeps track of the one adapter used for all {@link org.eclipse.papyrus.dd.dg.Marker} instances. + * <!-- begin-user-doc * --> <!-- end-user-doc --> - * * @generated */ protected MarkerItemProvider markerItemProvider; @@ -565,7 +530,6 @@ public class DGItemProviderAdapterFactory extends DGAdapterFactory implements /** * This creates an adapter for a {@link org.eclipse.papyrus.dd.dg.Marker}. * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ @Override @@ -587,10 +551,9 @@ public class DGItemProviderAdapterFactory extends DGAdapterFactory implements protected LinearGradientItemProvider linearGradientItemProvider; /** - * This creates an adapter for a - * {@link org.eclipse.papyrus.dd.dg.LinearGradient}. <!-- begin-user-doc --> + * This creates an adapter for a {@link org.eclipse.papyrus.dd.dg.LinearGradient}. + * <!-- begin-user-doc --> * <!-- end-user-doc --> - * * @generated */ @Override @@ -603,10 +566,9 @@ public class DGItemProviderAdapterFactory extends DGAdapterFactory implements } /** - * This keeps track of the one adapter used for all - * {@link org.eclipse.papyrus.dd.dg.LineTo} instances. <!-- begin-user-doc + * This keeps track of the one adapter used for all {@link org.eclipse.papyrus.dd.dg.LineTo} instances. + * <!-- begin-user-doc * --> <!-- end-user-doc --> - * * @generated */ protected LineToItemProvider lineToItemProvider; @@ -614,7 +576,6 @@ public class DGItemProviderAdapterFactory extends DGAdapterFactory implements /** * This creates an adapter for a {@link org.eclipse.papyrus.dd.dg.LineTo}. * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ @Override @@ -627,10 +588,9 @@ public class DGItemProviderAdapterFactory extends DGAdapterFactory implements } /** - * This keeps track of the one adapter used for all - * {@link org.eclipse.papyrus.dd.dg.Matrix} instances. <!-- begin-user-doc + * This keeps track of the one adapter used for all {@link org.eclipse.papyrus.dd.dg.Matrix} instances. + * <!-- begin-user-doc * --> <!-- end-user-doc --> - * * @generated */ protected MatrixItemProvider matrixItemProvider; @@ -638,7 +598,6 @@ public class DGItemProviderAdapterFactory extends DGAdapterFactory implements /** * This creates an adapter for a {@link org.eclipse.papyrus.dd.dg.Matrix}. * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ @Override @@ -651,10 +610,9 @@ public class DGItemProviderAdapterFactory extends DGAdapterFactory implements } /** - * This keeps track of the one adapter used for all - * {@link org.eclipse.papyrus.dd.dg.Path} instances. <!-- begin-user-doc --> + * This keeps track of the one adapter used for all {@link org.eclipse.papyrus.dd.dg.Path} instances. + * <!-- begin-user-doc --> * <!-- end-user-doc --> - * * @generated */ protected PathItemProvider pathItemProvider; @@ -662,7 +620,6 @@ public class DGItemProviderAdapterFactory extends DGAdapterFactory implements /** * This creates an adapter for a {@link org.eclipse.papyrus.dd.dg.Path}. * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ @Override @@ -675,10 +632,9 @@ public class DGItemProviderAdapterFactory extends DGAdapterFactory implements } /** - * This keeps track of the one adapter used for all - * {@link org.eclipse.papyrus.dd.dg.Pattern} instances. <!-- begin-user-doc + * This keeps track of the one adapter used for all {@link org.eclipse.papyrus.dd.dg.Pattern} instances. + * <!-- begin-user-doc * --> <!-- end-user-doc --> - * * @generated */ protected PatternItemProvider patternItemProvider; @@ -686,7 +642,6 @@ public class DGItemProviderAdapterFactory extends DGAdapterFactory implements /** * This creates an adapter for a {@link org.eclipse.papyrus.dd.dg.Pattern}. * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ @Override @@ -699,10 +654,9 @@ public class DGItemProviderAdapterFactory extends DGAdapterFactory implements } /** - * This keeps track of the one adapter used for all - * {@link org.eclipse.papyrus.dd.dg.Polygon} instances. <!-- begin-user-doc + * This keeps track of the one adapter used for all {@link org.eclipse.papyrus.dd.dg.Polygon} instances. + * <!-- begin-user-doc * --> <!-- end-user-doc --> - * * @generated */ protected PolygonItemProvider polygonItemProvider; @@ -710,7 +664,6 @@ public class DGItemProviderAdapterFactory extends DGAdapterFactory implements /** * This creates an adapter for a {@link org.eclipse.papyrus.dd.dg.Polygon}. * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ @Override @@ -723,10 +676,9 @@ public class DGItemProviderAdapterFactory extends DGAdapterFactory implements } /** - * This keeps track of the one adapter used for all - * {@link org.eclipse.papyrus.dd.dg.Polyline} instances. <!-- begin-user-doc + * This keeps track of the one adapter used for all {@link org.eclipse.papyrus.dd.dg.Polyline} instances. + * <!-- begin-user-doc * --> <!-- end-user-doc --> - * * @generated */ protected PolylineItemProvider polylineItemProvider; @@ -734,7 +686,6 @@ public class DGItemProviderAdapterFactory extends DGAdapterFactory implements /** * This creates an adapter for a {@link org.eclipse.papyrus.dd.dg.Polyline}. * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ @Override @@ -756,10 +707,9 @@ public class DGItemProviderAdapterFactory extends DGAdapterFactory implements protected RadialGradientItemProvider radialGradientItemProvider; /** - * This creates an adapter for a - * {@link org.eclipse.papyrus.dd.dg.RadialGradient}. <!-- begin-user-doc --> + * This creates an adapter for a {@link org.eclipse.papyrus.dd.dg.RadialGradient}. + * <!-- begin-user-doc --> * <!-- end-user-doc --> - * * @generated */ @Override @@ -781,9 +731,8 @@ public class DGItemProviderAdapterFactory extends DGAdapterFactory implements protected RectangleItemProvider rectangleItemProvider; /** - * This creates an adapter for a {@link org.eclipse.papyrus.dd.dg.Rectangle} - * . <!-- begin-user-doc --> <!-- end-user-doc --> - * + * This creates an adapter for a {@link org.eclipse.papyrus.dd.dg.Rectangle}. + * <!-- begin-user-doc --> <!-- end-user-doc --> * @generated */ @Override @@ -805,10 +754,9 @@ public class DGItemProviderAdapterFactory extends DGAdapterFactory implements protected RootCanvasItemProvider rootCanvasItemProvider; /** - * This creates an adapter for a - * {@link org.eclipse.papyrus.dd.dg.RootCanvas}. <!-- begin-user-doc --> + * This creates an adapter for a {@link org.eclipse.papyrus.dd.dg.RootCanvas}. + * <!-- begin-user-doc --> * <!-- end-user-doc --> - * * @generated */ @Override @@ -821,10 +769,9 @@ public class DGItemProviderAdapterFactory extends DGAdapterFactory implements } /** - * This keeps track of the one adapter used for all - * {@link org.eclipse.papyrus.dd.dg.Rotate} instances. <!-- begin-user-doc + * This keeps track of the one adapter used for all {@link org.eclipse.papyrus.dd.dg.Rotate} instances. + * <!-- begin-user-doc * --> <!-- end-user-doc --> - * * @generated */ protected RotateItemProvider rotateItemProvider; @@ -832,7 +779,6 @@ public class DGItemProviderAdapterFactory extends DGAdapterFactory implements /** * This creates an adapter for a {@link org.eclipse.papyrus.dd.dg.Rotate}. * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ @Override @@ -845,10 +791,9 @@ public class DGItemProviderAdapterFactory extends DGAdapterFactory implements } /** - * This keeps track of the one adapter used for all - * {@link org.eclipse.papyrus.dd.dg.Scale} instances. <!-- begin-user-doc + * This keeps track of the one adapter used for all {@link org.eclipse.papyrus.dd.dg.Scale} instances. + * <!-- begin-user-doc * --> <!-- end-user-doc --> - * * @generated */ protected ScaleItemProvider scaleItemProvider; @@ -856,7 +801,6 @@ public class DGItemProviderAdapterFactory extends DGAdapterFactory implements /** * This creates an adapter for a {@link org.eclipse.papyrus.dd.dg.Scale}. * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ @Override @@ -869,10 +813,9 @@ public class DGItemProviderAdapterFactory extends DGAdapterFactory implements } /** - * This keeps track of the one adapter used for all - * {@link org.eclipse.papyrus.dd.dg.Skew} instances. <!-- begin-user-doc --> + * This keeps track of the one adapter used for all {@link org.eclipse.papyrus.dd.dg.Skew} instances. + * <!-- begin-user-doc --> * <!-- end-user-doc --> - * * @generated */ protected SkewItemProvider skewItemProvider; @@ -880,7 +823,6 @@ public class DGItemProviderAdapterFactory extends DGAdapterFactory implements /** * This creates an adapter for a {@link org.eclipse.papyrus.dd.dg.Skew}. * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ @Override @@ -893,10 +835,9 @@ public class DGItemProviderAdapterFactory extends DGAdapterFactory implements } /** - * This keeps track of the one adapter used for all - * {@link org.eclipse.papyrus.dd.dg.Text} instances. <!-- begin-user-doc --> + * This keeps track of the one adapter used for all {@link org.eclipse.papyrus.dd.dg.Text} instances. + * <!-- begin-user-doc --> * <!-- end-user-doc --> - * * @generated */ protected TextItemProvider textItemProvider; @@ -904,7 +845,6 @@ public class DGItemProviderAdapterFactory extends DGAdapterFactory implements /** * This creates an adapter for a {@link org.eclipse.papyrus.dd.dg.Text}. * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ @Override @@ -926,9 +866,8 @@ public class DGItemProviderAdapterFactory extends DGAdapterFactory implements protected TranslateItemProvider translateItemProvider; /** - * This creates an adapter for a {@link org.eclipse.papyrus.dd.dg.Translate} - * . <!-- begin-user-doc --> <!-- end-user-doc --> - * + * This creates an adapter for a {@link org.eclipse.papyrus.dd.dg.Translate}. + * <!-- begin-user-doc --> <!-- end-user-doc --> * @generated */ @Override @@ -941,10 +880,9 @@ public class DGItemProviderAdapterFactory extends DGAdapterFactory implements } /** - * This keeps track of the one adapter used for all - * {@link org.eclipse.papyrus.dd.dg.Use} instances. <!-- begin-user-doc --> + * This keeps track of the one adapter used for all {@link org.eclipse.papyrus.dd.dg.Use} instances. + * <!-- begin-user-doc --> * <!-- end-user-doc --> - * * @generated */ protected UseItemProvider useItemProvider; @@ -971,8 +909,7 @@ public class DGItemProviderAdapterFactory extends DGAdapterFactory implements * @generated */ public ComposeableAdapterFactory getRootAdapterFactory() { - return parentAdapterFactory == null ? this : parentAdapterFactory - .getRootAdapterFactory(); + return parentAdapterFactory == null ? this : parentAdapterFactory.getRootAdapterFactory(); } /** @@ -988,7 +925,6 @@ public class DGItemProviderAdapterFactory extends DGAdapterFactory implements /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ @Override @@ -997,9 +933,8 @@ public class DGItemProviderAdapterFactory extends DGAdapterFactory implements } /** - * This implementation substitutes the factory itself as the key for the - * adapter. <!-- begin-user-doc --> <!-- end-user-doc --> - * + * This implementation substitutes the factory itself as the key for the adapter. + * <!-- begin-user-doc --> <!-- end-user-doc --> * @generated */ @Override @@ -1009,15 +944,13 @@ public class DGItemProviderAdapterFactory extends DGAdapterFactory implements /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ @Override public Object adapt(Object object, Object type) { if (isFactoryForType(type)) { Object adapter = super.adapt(object, type); - if (!(type instanceof Class<?>) - || (((Class<?>) type).isInstance(adapter))) { + if (!(type instanceof Class<?>) || (((Class<?>)type).isInstance(adapter))) { return adapter; } } @@ -1026,8 +959,8 @@ public class DGItemProviderAdapterFactory extends DGAdapterFactory implements } /** - * This adds a listener. <!-- begin-user-doc --> <!-- end-user-doc --> - * + * This adds a listener. + * <!-- begin-user-doc --> <!-- end-user-doc --> * @generated */ public void addListener(INotifyChangedListener notifyChangedListener) { @@ -1035,8 +968,8 @@ public class DGItemProviderAdapterFactory extends DGAdapterFactory implements } /** - * This removes a listener. <!-- begin-user-doc --> <!-- end-user-doc --> - * + * This removes a listener. + * <!-- begin-user-doc --> <!-- end-user-doc --> * @generated */ public void removeListener(INotifyChangedListener notifyChangedListener) { @@ -1065,78 +998,42 @@ public class DGItemProviderAdapterFactory extends DGAdapterFactory implements * @generated */ public void dispose() { - if (canvasItemProvider != null) - canvasItemProvider.dispose(); - if (groupItemProvider != null) - groupItemProvider.dispose(); - if (moveToItemProvider != null) - moveToItemProvider.dispose(); - if (clipPathItemProvider != null) - clipPathItemProvider.dispose(); - if (styleItemProvider != null) - styleItemProvider.dispose(); - if (paintItemProvider != null) - paintItemProvider.dispose(); - if (circleItemProvider != null) - circleItemProvider.dispose(); - if (closePathItemProvider != null) - closePathItemProvider.dispose(); - if (cubicCurveToItemProvider != null) - cubicCurveToItemProvider.dispose(); - if (definitionsItemProvider != null) - definitionsItemProvider.dispose(); - if (styleSheetItemProvider != null) - styleSheetItemProvider.dispose(); - if (styleRuleItemProvider != null) - styleRuleItemProvider.dispose(); - if (styleSelectorItemProvider != null) - styleSelectorItemProvider.dispose(); - if (ellipseItemProvider != null) - ellipseItemProvider.dispose(); - if (ellipticalCurveToItemProvider != null) - ellipticalCurveToItemProvider.dispose(); - if (quadraticCurveToItemProvider != null) - quadraticCurveToItemProvider.dispose(); - if (gradientStopItemProvider != null) - gradientStopItemProvider.dispose(); - if (imageItemProvider != null) - imageItemProvider.dispose(); - if (lineItemProvider != null) - lineItemProvider.dispose(); - if (markerItemProvider != null) - markerItemProvider.dispose(); - if (linearGradientItemProvider != null) - linearGradientItemProvider.dispose(); - if (lineToItemProvider != null) - lineToItemProvider.dispose(); - if (matrixItemProvider != null) - matrixItemProvider.dispose(); - if (pathItemProvider != null) - pathItemProvider.dispose(); - if (patternItemProvider != null) - patternItemProvider.dispose(); - if (polygonItemProvider != null) - polygonItemProvider.dispose(); - if (polylineItemProvider != null) - polylineItemProvider.dispose(); - if (radialGradientItemProvider != null) - radialGradientItemProvider.dispose(); - if (rectangleItemProvider != null) - rectangleItemProvider.dispose(); - if (rootCanvasItemProvider != null) - rootCanvasItemProvider.dispose(); - if (rotateItemProvider != null) - rotateItemProvider.dispose(); - if (scaleItemProvider != null) - scaleItemProvider.dispose(); - if (skewItemProvider != null) - skewItemProvider.dispose(); - if (textItemProvider != null) - textItemProvider.dispose(); - if (translateItemProvider != null) - translateItemProvider.dispose(); - if (useItemProvider != null) - useItemProvider.dispose(); + if (canvasItemProvider != null) canvasItemProvider.dispose(); + if (groupItemProvider != null) groupItemProvider.dispose(); + if (moveToItemProvider != null) moveToItemProvider.dispose(); + if (clipPathItemProvider != null) clipPathItemProvider.dispose(); + if (styleItemProvider != null) styleItemProvider.dispose(); + if (paintItemProvider != null) paintItemProvider.dispose(); + if (circleItemProvider != null) circleItemProvider.dispose(); + if (closePathItemProvider != null) closePathItemProvider.dispose(); + if (cubicCurveToItemProvider != null) cubicCurveToItemProvider.dispose(); + if (definitionsItemProvider != null) definitionsItemProvider.dispose(); + if (styleSheetItemProvider != null) styleSheetItemProvider.dispose(); + if (styleRuleItemProvider != null) styleRuleItemProvider.dispose(); + if (styleSelectorItemProvider != null) styleSelectorItemProvider.dispose(); + if (ellipseItemProvider != null) ellipseItemProvider.dispose(); + if (ellipticalArcToItemProvider != null) ellipticalArcToItemProvider.dispose(); + if (quadraticCurveToItemProvider != null) quadraticCurveToItemProvider.dispose(); + if (gradientStopItemProvider != null) gradientStopItemProvider.dispose(); + if (imageItemProvider != null) imageItemProvider.dispose(); + if (lineItemProvider != null) lineItemProvider.dispose(); + if (markerItemProvider != null) markerItemProvider.dispose(); + if (linearGradientItemProvider != null) linearGradientItemProvider.dispose(); + if (lineToItemProvider != null) lineToItemProvider.dispose(); + if (matrixItemProvider != null) matrixItemProvider.dispose(); + if (pathItemProvider != null) pathItemProvider.dispose(); + if (patternItemProvider != null) patternItemProvider.dispose(); + if (polygonItemProvider != null) polygonItemProvider.dispose(); + if (polylineItemProvider != null) polylineItemProvider.dispose(); + if (radialGradientItemProvider != null) radialGradientItemProvider.dispose(); + if (rectangleItemProvider != null) rectangleItemProvider.dispose(); + if (rootCanvasItemProvider != null) rootCanvasItemProvider.dispose(); + if (rotateItemProvider != null) rotateItemProvider.dispose(); + if (scaleItemProvider != null) scaleItemProvider.dispose(); + if (skewItemProvider != null) skewItemProvider.dispose(); + if (textItemProvider != null) textItemProvider.dispose(); + if (translateItemProvider != null) translateItemProvider.dispose(); + if (useItemProvider != null) useItemProvider.dispose(); } } diff --git a/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/src/org/eclipse/papyrus/dd/dg/provider/DefinitionItemProvider.java b/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/src/org/eclipse/papyrus/dd/dg/provider/DefinitionItemProvider.java index 7430e990cc1..d334d2f0e02 100644 --- a/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/src/org/eclipse/papyrus/dd/dg/provider/DefinitionItemProvider.java +++ b/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/src/org/eclipse/papyrus/dd/dg/provider/DefinitionItemProvider.java @@ -38,10 +38,9 @@ import org.eclipse.papyrus.dd.dg.Definition; import org.eclipse.papyrus.dd.edit.DDEditPlugin; /** - * This is the item provider adapter for a - * {@link org.eclipse.papyrus.dd.dg.Definition} object. <!-- begin-user-doc --> + * This is the item provider adapter for a {@link org.eclipse.papyrus.dd.dg.Definition} object. + * <!-- begin-user-doc --> * <!-- end-user-doc --> - * * @generated */ public class DefinitionItemProvider extends ItemProviderAdapter implements @@ -75,42 +74,46 @@ public class DefinitionItemProvider extends ItemProviderAdapter implements } /** - * This adds a property descriptor for the Id feature. <!-- begin-user-doc + * This adds a property descriptor for the Id feature. + * <!-- begin-user-doc * --> <!-- end-user-doc --> - * * @generated */ protected void addIdPropertyDescriptor(Object object) { - itemPropertyDescriptors.add(createItemPropertyDescriptor( - ((ComposeableAdapterFactory) adapterFactory) - .getRootAdapterFactory(), - getResourceLocator(), - getString("_UI_Definition_id_feature"), - getString("_UI_PropertyDescriptor_description", - "_UI_Definition_id_feature", "_UI_Definition_type"), - DGPackage.Literals.DEFINITION__ID, true, false, false, - ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null)); + itemPropertyDescriptors.add + (createItemPropertyDescriptor + (((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(), + getResourceLocator(), + getString("_UI_Definition_id_feature"), + getString("_UI_PropertyDescriptor_description", "_UI_Definition_id_feature", "_UI_Definition_type"), + DGPackage.Literals.DEFINITION__ID, + true, + false, + false, + ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, + null, + null)); } /** - * This returns the label text for the adapted class. <!-- begin-user-doc + * This returns the label text for the adapted class. + * <!-- begin-user-doc * --> <!-- end-user-doc --> - * * @generated */ @Override public String getText(Object object) { - String label = ((Definition) object).getId(); - return label == null || label.length() == 0 ? getString("_UI_Definition_type") - : getString("_UI_Definition_type") + " " + label; + String label = ((Definition)object).getId(); + return label == null || label.length() == 0 ? + getString("_UI_Definition_type") : + getString("_UI_Definition_type") + " " + label; } /** - * 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 --> <!-- + * 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 @@ -118,10 +121,9 @@ public class DefinitionItemProvider extends ItemProviderAdapter implements updateChildren(notification); switch (notification.getFeatureID(Definition.class)) { - case DGPackage.DEFINITION__ID: - fireNotifyChanged(new ViewerNotification(notification, - notification.getNotifier(), false, true)); - return; + case DGPackage.DEFINITION__ID: + fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), false, true)); + return; } super.notifyChanged(notification); } diff --git a/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/src/org/eclipse/papyrus/dd/dg/provider/DefinitionsItemProvider.java b/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/src/org/eclipse/papyrus/dd/dg/provider/DefinitionsItemProvider.java index 9fa8e0ede77..b2c0a428222 100644 --- a/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/src/org/eclipse/papyrus/dd/dg/provider/DefinitionsItemProvider.java +++ b/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/src/org/eclipse/papyrus/dd/dg/provider/DefinitionsItemProvider.java @@ -39,10 +39,9 @@ import org.eclipse.papyrus.dd.dg.Definitions; import org.eclipse.papyrus.dd.edit.DDEditPlugin; /** - * This is the item provider adapter for a - * {@link org.eclipse.papyrus.dd.dg.Definitions} object. <!-- begin-user-doc --> + * This is the item provider adapter for a {@link org.eclipse.papyrus.dd.dg.Definitions} object. + * <!-- begin-user-doc --> * <!-- end-user-doc --> - * * @generated */ public class DefinitionsItemProvider extends ItemProviderAdapter implements @@ -75,13 +74,10 @@ public class DefinitionsItemProvider extends ItemProviderAdapter implements } /** - * This specifies how to implement {@link #getChildren} and is used to - * deduce an appropriate feature for an - * {@link org.eclipse.emf.edit.command.AddCommand}, - * {@link org.eclipse.emf.edit.command.RemoveCommand} or - * {@link org.eclipse.emf.edit.command.MoveCommand} in - * {@link #createCommand}. <!-- begin-user-doc --> <!-- end-user-doc --> - * + * This specifies how to implement {@link #getChildren} and is used to deduce an appropriate feature for an + * {@link org.eclipse.emf.edit.command.AddCommand}, {@link org.eclipse.emf.edit.command.RemoveCommand} or + * {@link org.eclipse.emf.edit.command.MoveCommand} in {@link #createCommand}. + * <!-- begin-user-doc --> <!-- end-user-doc --> * @generated */ @Override @@ -97,13 +93,11 @@ public class DefinitionsItemProvider extends ItemProviderAdapter implements /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ @Override protected EStructuralFeature getChildFeature(Object object, Object child) { - // Check the type of the specified child object and return the proper - // feature to use for + // Check the type of the specified child object and return the proper feature to use for // adding (see {@link AddCommand}) it as a child. return super.getChildFeature(object, child); @@ -117,14 +111,13 @@ public class DefinitionsItemProvider extends ItemProviderAdapter implements */ @Override public Object getImage(Object object) { - return overlayImage(object, - getResourceLocator().getImage("full/obj16/Definitions")); + return overlayImage(object, getResourceLocator().getImage("full/obj16/Definitions")); } /** - * This returns the label text for the adapted class. <!-- begin-user-doc + * This returns the label text for the adapted class. + * <!-- begin-user-doc * --> <!-- end-user-doc --> - * * @generated */ @Override @@ -133,11 +126,10 @@ public class DefinitionsItemProvider extends ItemProviderAdapter implements } /** - * 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 --> <!-- + * 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 @@ -145,11 +137,10 @@ public class DefinitionsItemProvider extends ItemProviderAdapter implements updateChildren(notification); switch (notification.getFeatureID(Definitions.class)) { - case DGPackage.DEFINITIONS__DEFNITION: - case DGPackage.DEFINITIONS__STYLE_SHEET: - fireNotifyChanged(new ViewerNotification(notification, - notification.getNotifier(), true, false)); - return; + case DGPackage.DEFINITIONS__DEFNITION: + case DGPackage.DEFINITIONS__STYLE_SHEET: + fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), true, false)); + return; } super.notifyChanged(notification); } @@ -166,81 +157,100 @@ public class DefinitionsItemProvider extends ItemProviderAdapter implements Collection<Object> newChildDescriptors, Object object) { super.collectNewChildDescriptors(newChildDescriptors, object); - newChildDescriptors.add(createChildParameter( - DGPackage.Literals.DEFINITIONS__DEFNITION, - DGFactory.eINSTANCE.createGroup())); - - newChildDescriptors.add(createChildParameter( - DGPackage.Literals.DEFINITIONS__DEFNITION, - DGFactory.eINSTANCE.createCanvas())); - - newChildDescriptors.add(createChildParameter( - DGPackage.Literals.DEFINITIONS__DEFNITION, - DGFactory.eINSTANCE.createClipPath())); - - newChildDescriptors.add(createChildParameter( - DGPackage.Literals.DEFINITIONS__DEFNITION, - DGFactory.eINSTANCE.createCircle())); - - newChildDescriptors.add(createChildParameter( - DGPackage.Literals.DEFINITIONS__DEFNITION, - DGFactory.eINSTANCE.createEllipse())); - - newChildDescriptors.add(createChildParameter( - DGPackage.Literals.DEFINITIONS__DEFNITION, - DGFactory.eINSTANCE.createImage())); - - newChildDescriptors.add(createChildParameter( - DGPackage.Literals.DEFINITIONS__DEFNITION, - DGFactory.eINSTANCE.createLine())); - - newChildDescriptors.add(createChildParameter( - DGPackage.Literals.DEFINITIONS__DEFNITION, - DGFactory.eINSTANCE.createMarker())); - - newChildDescriptors.add(createChildParameter( - DGPackage.Literals.DEFINITIONS__DEFNITION, - DGFactory.eINSTANCE.createLinearGradient())); - - newChildDescriptors.add(createChildParameter( - DGPackage.Literals.DEFINITIONS__DEFNITION, - DGFactory.eINSTANCE.createPath())); - - newChildDescriptors.add(createChildParameter( - DGPackage.Literals.DEFINITIONS__DEFNITION, - DGFactory.eINSTANCE.createPattern())); - - newChildDescriptors.add(createChildParameter( - DGPackage.Literals.DEFINITIONS__DEFNITION, - DGFactory.eINSTANCE.createPolygon())); - - newChildDescriptors.add(createChildParameter( - DGPackage.Literals.DEFINITIONS__DEFNITION, - DGFactory.eINSTANCE.createPolyline())); - - newChildDescriptors.add(createChildParameter( - DGPackage.Literals.DEFINITIONS__DEFNITION, - DGFactory.eINSTANCE.createRadialGradient())); - - newChildDescriptors.add(createChildParameter( - DGPackage.Literals.DEFINITIONS__DEFNITION, - DGFactory.eINSTANCE.createRectangle())); - - newChildDescriptors.add(createChildParameter( - DGPackage.Literals.DEFINITIONS__DEFNITION, - DGFactory.eINSTANCE.createRootCanvas())); - - newChildDescriptors.add(createChildParameter( - DGPackage.Literals.DEFINITIONS__DEFNITION, - DGFactory.eINSTANCE.createText())); - - newChildDescriptors.add(createChildParameter( - DGPackage.Literals.DEFINITIONS__DEFNITION, - DGFactory.eINSTANCE.createUse())); - - newChildDescriptors.add(createChildParameter( - DGPackage.Literals.DEFINITIONS__STYLE_SHEET, - DGFactory.eINSTANCE.createStyleSheet())); + newChildDescriptors.add + (createChildParameter + (DGPackage.Literals.DEFINITIONS__DEFNITION, + DGFactory.eINSTANCE.createGroup())); + + newChildDescriptors.add + (createChildParameter + (DGPackage.Literals.DEFINITIONS__DEFNITION, + DGFactory.eINSTANCE.createCanvas())); + + newChildDescriptors.add + (createChildParameter + (DGPackage.Literals.DEFINITIONS__DEFNITION, + DGFactory.eINSTANCE.createClipPath())); + + newChildDescriptors.add + (createChildParameter + (DGPackage.Literals.DEFINITIONS__DEFNITION, + DGFactory.eINSTANCE.createCircle())); + + newChildDescriptors.add + (createChildParameter + (DGPackage.Literals.DEFINITIONS__DEFNITION, + DGFactory.eINSTANCE.createEllipse())); + + newChildDescriptors.add + (createChildParameter + (DGPackage.Literals.DEFINITIONS__DEFNITION, + DGFactory.eINSTANCE.createImage())); + + newChildDescriptors.add + (createChildParameter + (DGPackage.Literals.DEFINITIONS__DEFNITION, + DGFactory.eINSTANCE.createLine())); + + newChildDescriptors.add + (createChildParameter + (DGPackage.Literals.DEFINITIONS__DEFNITION, + DGFactory.eINSTANCE.createMarker())); + + newChildDescriptors.add + (createChildParameter + (DGPackage.Literals.DEFINITIONS__DEFNITION, + DGFactory.eINSTANCE.createLinearGradient())); + + newChildDescriptors.add + (createChildParameter + (DGPackage.Literals.DEFINITIONS__DEFNITION, + DGFactory.eINSTANCE.createPath())); + + newChildDescriptors.add + (createChildParameter + (DGPackage.Literals.DEFINITIONS__DEFNITION, + DGFactory.eINSTANCE.createPattern())); + + newChildDescriptors.add + (createChildParameter + (DGPackage.Literals.DEFINITIONS__DEFNITION, + DGFactory.eINSTANCE.createPolygon())); + + newChildDescriptors.add + (createChildParameter + (DGPackage.Literals.DEFINITIONS__DEFNITION, + DGFactory.eINSTANCE.createPolyline())); + + newChildDescriptors.add + (createChildParameter + (DGPackage.Literals.DEFINITIONS__DEFNITION, + DGFactory.eINSTANCE.createRadialGradient())); + + newChildDescriptors.add + (createChildParameter + (DGPackage.Literals.DEFINITIONS__DEFNITION, + DGFactory.eINSTANCE.createRectangle())); + + newChildDescriptors.add + (createChildParameter + (DGPackage.Literals.DEFINITIONS__DEFNITION, + DGFactory.eINSTANCE.createRootCanvas())); + + newChildDescriptors.add + (createChildParameter + (DGPackage.Literals.DEFINITIONS__DEFNITION, + DGFactory.eINSTANCE.createText())); + + newChildDescriptors.add + (createChildParameter + (DGPackage.Literals.DEFINITIONS__DEFNITION, + DGFactory.eINSTANCE.createUse())); + + newChildDescriptors.add + (createChildParameter + (DGPackage.Literals.DEFINITIONS__STYLE_SHEET, + DGFactory.eINSTANCE.createStyleSheet())); } /** diff --git a/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/src/org/eclipse/papyrus/dd/dg/provider/EllipseItemProvider.java b/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/src/org/eclipse/papyrus/dd/dg/provider/EllipseItemProvider.java index 01fd974f71e..5f1fe66b8fb 100644 --- a/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/src/org/eclipse/papyrus/dd/dg/provider/EllipseItemProvider.java +++ b/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/src/org/eclipse/papyrus/dd/dg/provider/EllipseItemProvider.java @@ -35,10 +35,9 @@ import org.eclipse.papyrus.dd.dg.DGPackage; import org.eclipse.papyrus.dd.dg.Ellipse; /** - * This is the item provider adapter for a - * {@link org.eclipse.papyrus.dd.dg.Ellipse} object. <!-- begin-user-doc --> + * This is the item provider adapter for a {@link org.eclipse.papyrus.dd.dg.Ellipse} object. + * <!-- begin-user-doc --> * <!-- end-user-doc --> - * * @generated */ public class EllipseItemProvider extends GraphicalElementItemProvider implements @@ -71,13 +70,10 @@ public class EllipseItemProvider extends GraphicalElementItemProvider implements } /** - * This specifies how to implement {@link #getChildren} and is used to - * deduce an appropriate feature for an - * {@link org.eclipse.emf.edit.command.AddCommand}, - * {@link org.eclipse.emf.edit.command.RemoveCommand} or - * {@link org.eclipse.emf.edit.command.MoveCommand} in - * {@link #createCommand}. <!-- begin-user-doc --> <!-- end-user-doc --> - * + * This specifies how to implement {@link #getChildren} and is used to deduce an appropriate feature for an + * {@link org.eclipse.emf.edit.command.AddCommand}, {@link org.eclipse.emf.edit.command.RemoveCommand} or + * {@link org.eclipse.emf.edit.command.MoveCommand} in {@link #createCommand}. + * <!-- begin-user-doc --> <!-- end-user-doc --> * @generated */ @Override @@ -93,48 +89,45 @@ public class EllipseItemProvider extends GraphicalElementItemProvider implements /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ @Override protected EStructuralFeature getChildFeature(Object object, Object child) { - // Check the type of the specified child object and return the proper - // feature to use for + // Check the type of the specified child object and return the proper feature to use for // adding (see {@link AddCommand}) it as a child. return super.getChildFeature(object, child); } /** - * This returns Ellipse.gif. <!-- begin-user-doc --> <!-- end-user-doc --> - * + * This returns Ellipse.gif. + * <!-- begin-user-doc --> <!-- end-user-doc --> * @generated */ @Override public Object getImage(Object object) { - return overlayImage(object, - getResourceLocator().getImage("full/obj16/Ellipse")); + return overlayImage(object, getResourceLocator().getImage("full/obj16/Ellipse")); } /** - * This returns the label text for the adapted class. <!-- begin-user-doc + * This returns the label text for the adapted class. + * <!-- begin-user-doc * --> <!-- end-user-doc --> - * * @generated */ @Override public String getText(Object object) { - String label = ((Ellipse) object).getId(); - return label == null || label.length() == 0 ? getString("_UI_Ellipse_type") - : getString("_UI_Ellipse_type") + " " + label; + String label = ((Ellipse)object).getId(); + return label == null || label.length() == 0 ? + getString("_UI_Ellipse_type") : + getString("_UI_Ellipse_type") + " " + label; } /** - * 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 --> <!-- + * 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 @@ -142,11 +135,10 @@ public class EllipseItemProvider extends GraphicalElementItemProvider implements updateChildren(notification); switch (notification.getFeatureID(Ellipse.class)) { - case DGPackage.ELLIPSE__CENTER: - case DGPackage.ELLIPSE__RADII: - fireNotifyChanged(new ViewerNotification(notification, - notification.getNotifier(), true, false)); - return; + case DGPackage.ELLIPSE__CENTER: + case DGPackage.ELLIPSE__RADII: + fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), true, false)); + return; } super.notifyChanged(notification); } @@ -163,13 +155,15 @@ public class EllipseItemProvider extends GraphicalElementItemProvider implements Collection<Object> newChildDescriptors, Object object) { super.collectNewChildDescriptors(newChildDescriptors, object); - newChildDescriptors.add(createChildParameter( - DGPackage.Literals.ELLIPSE__CENTER, - DCFactory.eINSTANCE.createPoint())); + newChildDescriptors.add + (createChildParameter + (DGPackage.Literals.ELLIPSE__CENTER, + DCFactory.eINSTANCE.createPoint())); - newChildDescriptors.add(createChildParameter( - DGPackage.Literals.ELLIPSE__RADII, - DCFactory.eINSTANCE.createDimension())); + newChildDescriptors.add + (createChildParameter + (DGPackage.Literals.ELLIPSE__RADII, + DCFactory.eINSTANCE.createDimension())); } } diff --git a/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/src/org/eclipse/papyrus/dd/dg/provider/EllipticalCurveToItemProvider.java b/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/src/org/eclipse/papyrus/dd/dg/provider/EllipticalArcToItemProvider.java index 03c22108658..d5ccf84344e 100644 --- a/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/src/org/eclipse/papyrus/dd/dg/provider/EllipticalCurveToItemProvider.java +++ b/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/src/org/eclipse/papyrus/dd/dg/provider/EllipticalArcToItemProvider.java @@ -34,16 +34,15 @@ import org.eclipse.emf.edit.provider.ViewerNotification; import org.eclipse.papyrus.dd.dc.DCFactory; import org.eclipse.papyrus.dd.dg.DGPackage; -import org.eclipse.papyrus.dd.dg.EllipticalCurveTo; +import org.eclipse.papyrus.dd.dg.EllipticalArcTo; /** - * This is the item provider adapter for a - * {@link org.eclipse.papyrus.dd.dg.EllipticalCurveTo} object. <!-- - * begin-user-doc --> <!-- end-user-doc --> - * + * This is the item provider adapter for a {@link org.eclipse.papyrus.dd.dg.EllipticalArcTo} object. + * <!-- begin-user-doc + * --> <!-- end-user-doc --> * @generated */ -public class EllipticalCurveToItemProvider extends PathCommandItemProvider +public class EllipticalArcToItemProvider extends PathCommandItemProvider implements IEditingDomainItemProvider, IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource, IItemColorProvider, IItemFontProvider { @@ -53,7 +52,7 @@ public class EllipticalCurveToItemProvider extends PathCommandItemProvider * * @generated */ - public EllipticalCurveToItemProvider(AdapterFactory adapterFactory) { + public EllipticalArcToItemProvider(AdapterFactory adapterFactory) { super(adapterFactory); } @@ -82,16 +81,19 @@ public class EllipticalCurveToItemProvider extends PathCommandItemProvider * @generated */ protected void addRotationPropertyDescriptor(Object object) { - itemPropertyDescriptors.add(createItemPropertyDescriptor( - ((ComposeableAdapterFactory) adapterFactory) - .getRootAdapterFactory(), - getResourceLocator(), - getString("_UI_EllipticalCurveTo_rotation_feature"), - getString("_UI_PropertyDescriptor_description", - "_UI_EllipticalCurveTo_rotation_feature", - "_UI_EllipticalCurveTo_type"), - DGPackage.Literals.ELLIPTICAL_CURVE_TO__ROTATION, true, false, - false, ItemPropertyDescriptor.REAL_VALUE_IMAGE, null, null)); + itemPropertyDescriptors.add + (createItemPropertyDescriptor + (((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(), + getResourceLocator(), + getString("_UI_EllipticalArcTo_rotation_feature"), + getString("_UI_PropertyDescriptor_description", "_UI_EllipticalArcTo_rotation_feature", "_UI_EllipticalArcTo_type"), + DGPackage.Literals.ELLIPTICAL_ARC_TO__ROTATION, + true, + false, + false, + ItemPropertyDescriptor.REAL_VALUE_IMAGE, + null, + null)); } /** @@ -101,17 +103,19 @@ public class EllipticalCurveToItemProvider extends PathCommandItemProvider * @generated */ protected void addIsLargeArcPropertyDescriptor(Object object) { - itemPropertyDescriptors.add(createItemPropertyDescriptor( - ((ComposeableAdapterFactory) adapterFactory) - .getRootAdapterFactory(), - getResourceLocator(), - getString("_UI_EllipticalCurveTo_isLargeArc_feature"), - getString("_UI_PropertyDescriptor_description", - "_UI_EllipticalCurveTo_isLargeArc_feature", - "_UI_EllipticalCurveTo_type"), - DGPackage.Literals.ELLIPTICAL_CURVE_TO__IS_LARGE_ARC, true, - false, false, ItemPropertyDescriptor.BOOLEAN_VALUE_IMAGE, null, - null)); + itemPropertyDescriptors.add + (createItemPropertyDescriptor + (((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(), + getResourceLocator(), + getString("_UI_EllipticalArcTo_isLargeArc_feature"), + getString("_UI_PropertyDescriptor_description", "_UI_EllipticalArcTo_isLargeArc_feature", "_UI_EllipticalArcTo_type"), + DGPackage.Literals.ELLIPTICAL_ARC_TO__IS_LARGE_ARC, + true, + false, + false, + ItemPropertyDescriptor.BOOLEAN_VALUE_IMAGE, + null, + null)); } /** @@ -121,26 +125,26 @@ public class EllipticalCurveToItemProvider extends PathCommandItemProvider * @generated */ protected void addIsSweepPropertyDescriptor(Object object) { - itemPropertyDescriptors.add(createItemPropertyDescriptor( - ((ComposeableAdapterFactory) adapterFactory) - .getRootAdapterFactory(), - getResourceLocator(), - getString("_UI_EllipticalCurveTo_isSweep_feature"), - getString("_UI_PropertyDescriptor_description", - "_UI_EllipticalCurveTo_isSweep_feature", - "_UI_EllipticalCurveTo_type"), - DGPackage.Literals.ELLIPTICAL_CURVE_TO__IS_SWEEP, true, false, - false, ItemPropertyDescriptor.BOOLEAN_VALUE_IMAGE, null, null)); + itemPropertyDescriptors.add + (createItemPropertyDescriptor + (((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(), + getResourceLocator(), + getString("_UI_EllipticalArcTo_isSweep_feature"), + getString("_UI_PropertyDescriptor_description", "_UI_EllipticalArcTo_isSweep_feature", "_UI_EllipticalArcTo_type"), + DGPackage.Literals.ELLIPTICAL_ARC_TO__IS_SWEEP, + 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}, - * {@link org.eclipse.emf.edit.command.RemoveCommand} or - * {@link org.eclipse.emf.edit.command.MoveCommand} in - * {@link #createCommand}. <!-- begin-user-doc --> <!-- end-user-doc --> - * + * This specifies how to implement {@link #getChildren} and is used to deduce an appropriate feature for an + * {@link org.eclipse.emf.edit.command.AddCommand}, {@link org.eclipse.emf.edit.command.RemoveCommand} or + * {@link org.eclipse.emf.edit.command.MoveCommand} in {@link #createCommand}. + * <!-- begin-user-doc --> <!-- end-user-doc --> * @generated */ @Override @@ -148,75 +152,68 @@ public class EllipticalCurveToItemProvider extends PathCommandItemProvider Object object) { if (childrenFeatures == null) { super.getChildrenFeatures(object); - childrenFeatures.add(DGPackage.Literals.ELLIPTICAL_CURVE_TO__POINT); - childrenFeatures.add(DGPackage.Literals.ELLIPTICAL_CURVE_TO__RADII); + childrenFeatures.add(DGPackage.Literals.ELLIPTICAL_ARC_TO__RADII); + childrenFeatures.add(DGPackage.Literals.ELLIPTICAL_ARC_TO__POINT); } return childrenFeatures; } /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ @Override protected EStructuralFeature getChildFeature(Object object, Object child) { - // Check the type of the specified child object and return the proper - // feature to use for + // Check the type of the specified child object and return the proper feature to use for // adding (see {@link AddCommand}) it as a child. return super.getChildFeature(object, child); } /** - * This returns EllipticalCurveTo.gif. <!-- begin-user-doc --> <!-- + * This returns EllipticalArcTo.gif. + * <!-- begin-user-doc --> <!-- * end-user-doc --> - * * @generated */ @Override public Object getImage(Object object) { - return overlayImage(object, - getResourceLocator().getImage("full/obj16/EllipticalCurveTo")); + return overlayImage(object, getResourceLocator().getImage("full/obj16/EllipticalArcTo")); } /** - * This returns the label text for the adapted class. <!-- begin-user-doc + * This returns the label text for the adapted class. + * <!-- begin-user-doc * --> <!-- end-user-doc --> - * * @generated */ @Override public String getText(Object object) { - EllipticalCurveTo ellipticalCurveTo = (EllipticalCurveTo) object; - return getString("_UI_EllipticalCurveTo_type") + " " - + ellipticalCurveTo.isRelative(); + EllipticalArcTo ellipticalArcTo = (EllipticalArcTo)object; + return getString("_UI_EllipticalArcTo_type") + " " + ellipticalArcTo.isRelative(); } /** - * 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 --> <!-- + * 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(EllipticalCurveTo.class)) { - case DGPackage.ELLIPTICAL_CURVE_TO__ROTATION: - case DGPackage.ELLIPTICAL_CURVE_TO__IS_LARGE_ARC: - case DGPackage.ELLIPTICAL_CURVE_TO__IS_SWEEP: - fireNotifyChanged(new ViewerNotification(notification, - notification.getNotifier(), false, true)); - return; - case DGPackage.ELLIPTICAL_CURVE_TO__POINT: - case DGPackage.ELLIPTICAL_CURVE_TO__RADII: - fireNotifyChanged(new ViewerNotification(notification, - notification.getNotifier(), true, false)); - return; + switch (notification.getFeatureID(EllipticalArcTo.class)) { + case DGPackage.ELLIPTICAL_ARC_TO__ROTATION: + case DGPackage.ELLIPTICAL_ARC_TO__IS_LARGE_ARC: + case DGPackage.ELLIPTICAL_ARC_TO__IS_SWEEP: + fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), false, true)); + return; + case DGPackage.ELLIPTICAL_ARC_TO__RADII: + case DGPackage.ELLIPTICAL_ARC_TO__POINT: + fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), true, false)); + return; } super.notifyChanged(notification); } @@ -233,13 +230,15 @@ public class EllipticalCurveToItemProvider extends PathCommandItemProvider Collection<Object> newChildDescriptors, Object object) { super.collectNewChildDescriptors(newChildDescriptors, object); - newChildDescriptors.add(createChildParameter( - DGPackage.Literals.ELLIPTICAL_CURVE_TO__POINT, - DCFactory.eINSTANCE.createPoint())); + newChildDescriptors.add + (createChildParameter + (DGPackage.Literals.ELLIPTICAL_ARC_TO__RADII, + DCFactory.eINSTANCE.createDimension())); - newChildDescriptors.add(createChildParameter( - DGPackage.Literals.ELLIPTICAL_CURVE_TO__RADII, - DCFactory.eINSTANCE.createDimension())); + newChildDescriptors.add + (createChildParameter + (DGPackage.Literals.ELLIPTICAL_ARC_TO__POINT, + DCFactory.eINSTANCE.createPoint())); } } diff --git a/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/src/org/eclipse/papyrus/dd/dg/provider/GradientItemProvider.java b/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/src/org/eclipse/papyrus/dd/dg/provider/GradientItemProvider.java index 4c0694b5ab9..07eaa395f2b 100644 --- a/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/src/org/eclipse/papyrus/dd/dg/provider/GradientItemProvider.java +++ b/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/src/org/eclipse/papyrus/dd/dg/provider/GradientItemProvider.java @@ -13,12 +13,9 @@ package org.eclipse.papyrus.dd.dg.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.ecore.EStructuralFeature; - import org.eclipse.emf.edit.provider.IEditingDomainItemProvider; import org.eclipse.emf.edit.provider.IItemColorProvider; import org.eclipse.emf.edit.provider.IItemFontProvider; @@ -28,16 +25,14 @@ 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.ViewerNotification; - import org.eclipse.papyrus.dd.dg.DGFactory; import org.eclipse.papyrus.dd.dg.DGPackage; import org.eclipse.papyrus.dd.dg.Gradient; /** - * This is the item provider adapter for a - * {@link org.eclipse.papyrus.dd.dg.Gradient} object. <!-- begin-user-doc --> + * This is the item provider adapter for a {@link org.eclipse.papyrus.dd.dg.Gradient} object. + * <!-- begin-user-doc --> * <!-- end-user-doc --> - * * @generated */ public class GradientItemProvider extends PaintServerItemProvider implements @@ -70,13 +65,10 @@ public class GradientItemProvider extends PaintServerItemProvider implements } /** - * This specifies how to implement {@link #getChildren} and is used to - * deduce an appropriate feature for an - * {@link org.eclipse.emf.edit.command.AddCommand}, - * {@link org.eclipse.emf.edit.command.RemoveCommand} or - * {@link org.eclipse.emf.edit.command.MoveCommand} in - * {@link #createCommand}. <!-- begin-user-doc --> <!-- end-user-doc --> - * + * This specifies how to implement {@link #getChildren} and is used to deduce an appropriate feature for an + * {@link org.eclipse.emf.edit.command.AddCommand}, {@link org.eclipse.emf.edit.command.RemoveCommand} or + * {@link org.eclipse.emf.edit.command.MoveCommand} in {@link #createCommand}. + * <!-- begin-user-doc --> <!-- end-user-doc --> * @generated */ @Override @@ -91,37 +83,35 @@ public class GradientItemProvider extends PaintServerItemProvider implements /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ @Override protected EStructuralFeature getChildFeature(Object object, Object child) { - // Check the type of the specified child object and return the proper - // feature to use for + // Check the type of the specified child object and return the proper feature to use for // adding (see {@link AddCommand}) it as a child. return super.getChildFeature(object, child); } /** - * This returns the label text for the adapted class. <!-- begin-user-doc + * This returns the label text for the adapted class. + * <!-- begin-user-doc * --> <!-- end-user-doc --> - * * @generated */ @Override public String getText(Object object) { - String label = ((Gradient) object).getId(); - return label == null || label.length() == 0 ? getString("_UI_Gradient_type") - : getString("_UI_Gradient_type") + " " + label; + String label = ((Gradient)object).getId(); + return label == null || label.length() == 0 ? + getString("_UI_Gradient_type") : + getString("_UI_Gradient_type") + " " + label; } /** - * 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 --> <!-- + * 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 @@ -129,10 +119,9 @@ public class GradientItemProvider extends PaintServerItemProvider implements updateChildren(notification); switch (notification.getFeatureID(Gradient.class)) { - case DGPackage.GRADIENT__STOP: - fireNotifyChanged(new ViewerNotification(notification, - notification.getNotifier(), true, false)); - return; + case DGPackage.GRADIENT__STOP: + fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), true, false)); + return; } super.notifyChanged(notification); } @@ -149,9 +138,10 @@ public class GradientItemProvider extends PaintServerItemProvider implements Collection<Object> newChildDescriptors, Object object) { super.collectNewChildDescriptors(newChildDescriptors, object); - newChildDescriptors.add(createChildParameter( - DGPackage.Literals.GRADIENT__STOP, - DGFactory.eINSTANCE.createGradientStop())); + newChildDescriptors.add + (createChildParameter + (DGPackage.Literals.GRADIENT__STOP, + DGFactory.eINSTANCE.createGradientStop())); } } diff --git a/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/src/org/eclipse/papyrus/dd/dg/provider/GradientStopItemProvider.java b/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/src/org/eclipse/papyrus/dd/dg/provider/GradientStopItemProvider.java index a4b73567879..9f277529ea5 100644 --- a/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/src/org/eclipse/papyrus/dd/dg/provider/GradientStopItemProvider.java +++ b/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/src/org/eclipse/papyrus/dd/dg/provider/GradientStopItemProvider.java @@ -40,10 +40,9 @@ import org.eclipse.papyrus.dd.dg.GradientStop; import org.eclipse.papyrus.dd.edit.DDEditPlugin; /** - * This is the item provider adapter for a - * {@link org.eclipse.papyrus.dd.dg.GradientStop} object. <!-- begin-user-doc + * This is the item provider adapter for a {@link org.eclipse.papyrus.dd.dg.GradientStop} object. + * <!-- begin-user-doc * --> <!-- end-user-doc --> - * * @generated */ public class GradientStopItemProvider extends ItemProviderAdapter implements @@ -85,16 +84,19 @@ public class GradientStopItemProvider extends ItemProviderAdapter implements * @generated */ protected void addColorPropertyDescriptor(Object object) { - itemPropertyDescriptors.add(createItemPropertyDescriptor( - ((ComposeableAdapterFactory) adapterFactory) - .getRootAdapterFactory(), - getResourceLocator(), - getString("_UI_GradientStop_color_feature"), - getString("_UI_PropertyDescriptor_description", - "_UI_GradientStop_color_feature", - "_UI_GradientStop_type"), - DGPackage.Literals.GRADIENT_STOP__COLOR, true, false, false, - ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null)); + itemPropertyDescriptors.add + (createItemPropertyDescriptor + (((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(), + getResourceLocator(), + getString("_UI_GradientStop_color_feature"), + getString("_UI_PropertyDescriptor_description", "_UI_GradientStop_color_feature", "_UI_GradientStop_type"), + DGPackage.Literals.GRADIENT_STOP__COLOR, + true, + false, + false, + ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, + null, + null)); } /** @@ -104,16 +106,19 @@ public class GradientStopItemProvider extends ItemProviderAdapter implements * @generated */ protected void addOffsetPropertyDescriptor(Object object) { - itemPropertyDescriptors.add(createItemPropertyDescriptor( - ((ComposeableAdapterFactory) adapterFactory) - .getRootAdapterFactory(), - getResourceLocator(), - getString("_UI_GradientStop_offset_feature"), - getString("_UI_PropertyDescriptor_description", - "_UI_GradientStop_offset_feature", - "_UI_GradientStop_type"), - DGPackage.Literals.GRADIENT_STOP__OFFSET, true, false, false, - ItemPropertyDescriptor.REAL_VALUE_IMAGE, null, null)); + itemPropertyDescriptors.add + (createItemPropertyDescriptor + (((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(), + getResourceLocator(), + getString("_UI_GradientStop_offset_feature"), + getString("_UI_PropertyDescriptor_description", "_UI_GradientStop_offset_feature", "_UI_GradientStop_type"), + DGPackage.Literals.GRADIENT_STOP__OFFSET, + true, + false, + false, + ItemPropertyDescriptor.REAL_VALUE_IMAGE, + null, + null)); } /** @@ -123,16 +128,19 @@ public class GradientStopItemProvider extends ItemProviderAdapter implements * @generated */ protected void addOpacityPropertyDescriptor(Object object) { - itemPropertyDescriptors.add(createItemPropertyDescriptor( - ((ComposeableAdapterFactory) adapterFactory) - .getRootAdapterFactory(), - getResourceLocator(), - getString("_UI_GradientStop_opacity_feature"), - getString("_UI_PropertyDescriptor_description", - "_UI_GradientStop_opacity_feature", - "_UI_GradientStop_type"), - DGPackage.Literals.GRADIENT_STOP__OPACITY, true, false, false, - ItemPropertyDescriptor.REAL_VALUE_IMAGE, null, null)); + itemPropertyDescriptors.add + (createItemPropertyDescriptor + (((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(), + getResourceLocator(), + getString("_UI_GradientStop_opacity_feature"), + getString("_UI_PropertyDescriptor_description", "_UI_GradientStop_opacity_feature", "_UI_GradientStop_type"), + DGPackage.Literals.GRADIENT_STOP__OPACITY, + true, + false, + false, + ItemPropertyDescriptor.REAL_VALUE_IMAGE, + null, + null)); } /** @@ -143,30 +151,29 @@ public class GradientStopItemProvider extends ItemProviderAdapter implements */ @Override public Object getImage(Object object) { - return overlayImage(object, - getResourceLocator().getImage("full/obj16/GradientStop")); + return overlayImage(object, getResourceLocator().getImage("full/obj16/GradientStop")); } /** - * This returns the label text for the adapted class. <!-- begin-user-doc + * This returns the label text for the adapted class. + * <!-- begin-user-doc * --> <!-- end-user-doc --> - * * @generated */ @Override public String getText(Object object) { - Color labelValue = ((GradientStop) object).getColor(); + Color labelValue = ((GradientStop)object).getColor(); String label = labelValue == null ? null : labelValue.toString(); - return label == null || label.length() == 0 ? getString("_UI_GradientStop_type") - : getString("_UI_GradientStop_type") + " " + label; + return label == null || label.length() == 0 ? + getString("_UI_GradientStop_type") : + getString("_UI_GradientStop_type") + " " + label; } /** - * 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 --> <!-- + * 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 @@ -174,12 +181,11 @@ public class GradientStopItemProvider extends ItemProviderAdapter implements updateChildren(notification); switch (notification.getFeatureID(GradientStop.class)) { - case DGPackage.GRADIENT_STOP__COLOR: - case DGPackage.GRADIENT_STOP__OFFSET: - case DGPackage.GRADIENT_STOP__OPACITY: - fireNotifyChanged(new ViewerNotification(notification, - notification.getNotifier(), false, true)); - return; + case DGPackage.GRADIENT_STOP__COLOR: + case DGPackage.GRADIENT_STOP__OFFSET: + case DGPackage.GRADIENT_STOP__OPACITY: + fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), false, true)); + return; } super.notifyChanged(notification); } diff --git a/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/src/org/eclipse/papyrus/dd/dg/provider/GraphicalElementItemProvider.java b/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/src/org/eclipse/papyrus/dd/dg/provider/GraphicalElementItemProvider.java index 6654a152de4..78e42101755 100644 --- a/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/src/org/eclipse/papyrus/dd/dg/provider/GraphicalElementItemProvider.java +++ b/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/src/org/eclipse/papyrus/dd/dg/provider/GraphicalElementItemProvider.java @@ -68,7 +68,7 @@ public class GraphicalElementItemProvider extends DefinitionItemProvider super.getPropertyDescriptors(object); addClipPathPropertyDescriptor(object); - addKeywordPropertyDescriptor(object); + addClassPropertyDescriptor(object); } return itemPropertyDescriptors; } @@ -80,45 +80,48 @@ public class GraphicalElementItemProvider extends DefinitionItemProvider * @generated */ protected void addClipPathPropertyDescriptor(Object object) { - itemPropertyDescriptors.add(createItemPropertyDescriptor( - ((ComposeableAdapterFactory) adapterFactory) - .getRootAdapterFactory(), - getResourceLocator(), - getString("_UI_GraphicalElement_clipPath_feature"), - getString("_UI_PropertyDescriptor_description", - "_UI_GraphicalElement_clipPath_feature", - "_UI_GraphicalElement_type"), - DGPackage.Literals.GRAPHICAL_ELEMENT__CLIP_PATH, true, false, - true, null, null, null)); + itemPropertyDescriptors.add + (createItemPropertyDescriptor + (((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(), + getResourceLocator(), + getString("_UI_GraphicalElement_clipPath_feature"), + getString("_UI_PropertyDescriptor_description", "_UI_GraphicalElement_clipPath_feature", "_UI_GraphicalElement_type"), + DGPackage.Literals.GRAPHICAL_ELEMENT__CLIP_PATH, + true, + false, + true, + null, + null, + null)); } /** - * This adds a property descriptor for the Keyword feature. <!-- + * This adds a property descriptor for the Class feature. <!-- * begin-user-doc --> <!-- end-user-doc --> * * @generated */ - protected void addKeywordPropertyDescriptor(Object object) { - itemPropertyDescriptors.add(createItemPropertyDescriptor( - ((ComposeableAdapterFactory) adapterFactory) - .getRootAdapterFactory(), - getResourceLocator(), - getString("_UI_GraphicalElement_keyword_feature"), - getString("_UI_PropertyDescriptor_description", - "_UI_GraphicalElement_keyword_feature", - "_UI_GraphicalElement_type"), - DGPackage.Literals.GRAPHICAL_ELEMENT__KEYWORD, true, false, - false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null)); + protected void addClassPropertyDescriptor(Object object) { + itemPropertyDescriptors.add + (createItemPropertyDescriptor + (((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(), + getResourceLocator(), + getString("_UI_GraphicalElement_class_feature"), + getString("_UI_PropertyDescriptor_description", "_UI_GraphicalElement_class_feature", "_UI_GraphicalElement_type"), + DGPackage.Literals.GRAPHICAL_ELEMENT__CLASS, + true, + false, + false, + ItemPropertyDescriptor.GENERIC_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}, - * {@link org.eclipse.emf.edit.command.RemoveCommand} or - * {@link org.eclipse.emf.edit.command.MoveCommand} in - * {@link #createCommand}. <!-- begin-user-doc --> <!-- end-user-doc --> - * + * This specifies how to implement {@link #getChildren} and is used to deduce an appropriate feature for an + * {@link org.eclipse.emf.edit.command.AddCommand}, {@link org.eclipse.emf.edit.command.RemoveCommand} or + * {@link org.eclipse.emf.edit.command.MoveCommand} in {@link #createCommand}. + * <!-- begin-user-doc --> <!-- end-user-doc --> * @generated */ @Override @@ -127,45 +130,42 @@ public class GraphicalElementItemProvider extends DefinitionItemProvider if (childrenFeatures == null) { super.getChildrenFeatures(object); childrenFeatures.add(DGPackage.Literals.GRAPHICAL_ELEMENT__STYLE); - childrenFeatures - .add(DGPackage.Literals.GRAPHICAL_ELEMENT__TRANSFORM); + childrenFeatures.add(DGPackage.Literals.GRAPHICAL_ELEMENT__TRANSFORM); } return childrenFeatures; } /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ @Override protected EStructuralFeature getChildFeature(Object object, Object child) { - // Check the type of the specified child object and return the proper - // feature to use for + // Check the type of the specified child object and return the proper feature to use for // adding (see {@link AddCommand}) it as a child. return super.getChildFeature(object, child); } /** - * This returns the label text for the adapted class. <!-- begin-user-doc + * This returns the label text for the adapted class. + * <!-- begin-user-doc * --> <!-- end-user-doc --> - * * @generated */ @Override public String getText(Object object) { - String label = ((GraphicalElement) object).getId(); - return label == null || label.length() == 0 ? getString("_UI_GraphicalElement_type") - : getString("_UI_GraphicalElement_type") + " " + label; + String label = ((GraphicalElement)object).getId(); + return label == null || label.length() == 0 ? + getString("_UI_GraphicalElement_type") : + getString("_UI_GraphicalElement_type") + " " + label; } /** - * 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 --> <!-- + * 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 @@ -173,15 +173,13 @@ public class GraphicalElementItemProvider extends DefinitionItemProvider updateChildren(notification); switch (notification.getFeatureID(GraphicalElement.class)) { - case DGPackage.GRAPHICAL_ELEMENT__KEYWORD: - fireNotifyChanged(new ViewerNotification(notification, - notification.getNotifier(), false, true)); - return; - case DGPackage.GRAPHICAL_ELEMENT__STYLE: - case DGPackage.GRAPHICAL_ELEMENT__TRANSFORM: - fireNotifyChanged(new ViewerNotification(notification, - notification.getNotifier(), true, false)); - return; + case DGPackage.GRAPHICAL_ELEMENT__CLASS: + fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), false, true)); + return; + case DGPackage.GRAPHICAL_ELEMENT__STYLE: + case DGPackage.GRAPHICAL_ELEMENT__TRANSFORM: + fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), true, false)); + return; } super.notifyChanged(notification); } @@ -198,29 +196,35 @@ public class GraphicalElementItemProvider extends DefinitionItemProvider Collection<Object> newChildDescriptors, Object object) { super.collectNewChildDescriptors(newChildDescriptors, object); - newChildDescriptors.add(createChildParameter( - DGPackage.Literals.GRAPHICAL_ELEMENT__STYLE, - DGFactory.eINSTANCE.createStyle())); - - newChildDescriptors.add(createChildParameter( - DGPackage.Literals.GRAPHICAL_ELEMENT__TRANSFORM, - DGFactory.eINSTANCE.createMatrix())); - - newChildDescriptors.add(createChildParameter( - DGPackage.Literals.GRAPHICAL_ELEMENT__TRANSFORM, - DGFactory.eINSTANCE.createRotate())); - - newChildDescriptors.add(createChildParameter( - DGPackage.Literals.GRAPHICAL_ELEMENT__TRANSFORM, - DGFactory.eINSTANCE.createScale())); - - newChildDescriptors.add(createChildParameter( - DGPackage.Literals.GRAPHICAL_ELEMENT__TRANSFORM, - DGFactory.eINSTANCE.createSkew())); - - newChildDescriptors.add(createChildParameter( - DGPackage.Literals.GRAPHICAL_ELEMENT__TRANSFORM, - DGFactory.eINSTANCE.createTranslate())); + newChildDescriptors.add + (createChildParameter + (DGPackage.Literals.GRAPHICAL_ELEMENT__STYLE, + DGFactory.eINSTANCE.createStyle())); + + newChildDescriptors.add + (createChildParameter + (DGPackage.Literals.GRAPHICAL_ELEMENT__TRANSFORM, + DGFactory.eINSTANCE.createMatrix())); + + newChildDescriptors.add + (createChildParameter + (DGPackage.Literals.GRAPHICAL_ELEMENT__TRANSFORM, + DGFactory.eINSTANCE.createRotate())); + + newChildDescriptors.add + (createChildParameter + (DGPackage.Literals.GRAPHICAL_ELEMENT__TRANSFORM, + DGFactory.eINSTANCE.createScale())); + + newChildDescriptors.add + (createChildParameter + (DGPackage.Literals.GRAPHICAL_ELEMENT__TRANSFORM, + DGFactory.eINSTANCE.createSkew())); + + newChildDescriptors.add + (createChildParameter + (DGPackage.Literals.GRAPHICAL_ELEMENT__TRANSFORM, + DGFactory.eINSTANCE.createTranslate())); } } diff --git a/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/src/org/eclipse/papyrus/dd/dg/provider/GroupItemProvider.java b/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/src/org/eclipse/papyrus/dd/dg/provider/GroupItemProvider.java index 8a6f5a1963c..8e0da315e94 100644 --- a/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/src/org/eclipse/papyrus/dd/dg/provider/GroupItemProvider.java +++ b/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/src/org/eclipse/papyrus/dd/dg/provider/GroupItemProvider.java @@ -34,10 +34,9 @@ import org.eclipse.papyrus.dd.dg.DGPackage; import org.eclipse.papyrus.dd.dg.Group; /** - * This is the item provider adapter for a - * {@link org.eclipse.papyrus.dd.dg.Group} object. <!-- begin-user-doc --> <!-- + * This is the item provider adapter for a {@link org.eclipse.papyrus.dd.dg.Group} object. + * <!-- begin-user-doc --> <!-- * end-user-doc --> - * * @generated */ public class GroupItemProvider extends GraphicalElementItemProvider implements @@ -70,13 +69,10 @@ public class GroupItemProvider extends GraphicalElementItemProvider implements } /** - * This specifies how to implement {@link #getChildren} and is used to - * deduce an appropriate feature for an - * {@link org.eclipse.emf.edit.command.AddCommand}, - * {@link org.eclipse.emf.edit.command.RemoveCommand} or - * {@link org.eclipse.emf.edit.command.MoveCommand} in - * {@link #createCommand}. <!-- begin-user-doc --> <!-- end-user-doc --> - * + * This specifies how to implement {@link #getChildren} and is used to deduce an appropriate feature for an + * {@link org.eclipse.emf.edit.command.AddCommand}, {@link org.eclipse.emf.edit.command.RemoveCommand} or + * {@link org.eclipse.emf.edit.command.MoveCommand} in {@link #createCommand}. + * <!-- begin-user-doc --> <!-- end-user-doc --> * @generated */ @Override @@ -91,48 +87,45 @@ public class GroupItemProvider extends GraphicalElementItemProvider implements /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ @Override protected EStructuralFeature getChildFeature(Object object, Object child) { - // Check the type of the specified child object and return the proper - // feature to use for + // Check the type of the specified child object and return the proper feature to use for // adding (see {@link AddCommand}) it as a child. return super.getChildFeature(object, child); } /** - * This returns Group.gif. <!-- begin-user-doc --> <!-- end-user-doc --> - * + * This returns Group.gif. + * <!-- begin-user-doc --> <!-- end-user-doc --> * @generated */ @Override public Object getImage(Object object) { - return overlayImage(object, - getResourceLocator().getImage("full/obj16/Group")); + return overlayImage(object, getResourceLocator().getImage("full/obj16/Group")); } /** - * This returns the label text for the adapted class. <!-- begin-user-doc + * This returns the label text for the adapted class. + * <!-- begin-user-doc * --> <!-- end-user-doc --> - * * @generated */ @Override public String getText(Object object) { - String label = ((Group) object).getId(); - return label == null || label.length() == 0 ? getString("_UI_Group_type") - : getString("_UI_Group_type") + " " + label; + String label = ((Group)object).getId(); + return label == null || label.length() == 0 ? + getString("_UI_Group_type") : + getString("_UI_Group_type") + " " + label; } /** - * 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 --> <!-- + * 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 @@ -140,10 +133,9 @@ public class GroupItemProvider extends GraphicalElementItemProvider implements updateChildren(notification); switch (notification.getFeatureID(Group.class)) { - case DGPackage.GROUP__MEMBER: - fireNotifyChanged(new ViewerNotification(notification, - notification.getNotifier(), true, false)); - return; + case DGPackage.GROUP__MEMBER: + fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), true, false)); + return; } super.notifyChanged(notification); } @@ -160,65 +152,80 @@ public class GroupItemProvider extends GraphicalElementItemProvider implements Collection<Object> newChildDescriptors, Object object) { super.collectNewChildDescriptors(newChildDescriptors, object); - newChildDescriptors.add(createChildParameter( - DGPackage.Literals.GROUP__MEMBER, - DGFactory.eINSTANCE.createGroup())); - - newChildDescriptors.add(createChildParameter( - DGPackage.Literals.GROUP__MEMBER, - DGFactory.eINSTANCE.createCanvas())); - - newChildDescriptors.add(createChildParameter( - DGPackage.Literals.GROUP__MEMBER, - DGFactory.eINSTANCE.createClipPath())); - - newChildDescriptors.add(createChildParameter( - DGPackage.Literals.GROUP__MEMBER, - DGFactory.eINSTANCE.createCircle())); - - newChildDescriptors.add(createChildParameter( - DGPackage.Literals.GROUP__MEMBER, - DGFactory.eINSTANCE.createEllipse())); - - newChildDescriptors.add(createChildParameter( - DGPackage.Literals.GROUP__MEMBER, - DGFactory.eINSTANCE.createImage())); - - newChildDescriptors.add(createChildParameter( - DGPackage.Literals.GROUP__MEMBER, - DGFactory.eINSTANCE.createLine())); - - newChildDescriptors.add(createChildParameter( - DGPackage.Literals.GROUP__MEMBER, - DGFactory.eINSTANCE.createMarker())); - - newChildDescriptors.add(createChildParameter( - DGPackage.Literals.GROUP__MEMBER, - DGFactory.eINSTANCE.createPath())); - - newChildDescriptors.add(createChildParameter( - DGPackage.Literals.GROUP__MEMBER, - DGFactory.eINSTANCE.createPolygon())); - - newChildDescriptors.add(createChildParameter( - DGPackage.Literals.GROUP__MEMBER, - DGFactory.eINSTANCE.createPolyline())); - - newChildDescriptors.add(createChildParameter( - DGPackage.Literals.GROUP__MEMBER, - DGFactory.eINSTANCE.createRectangle())); - - newChildDescriptors.add(createChildParameter( - DGPackage.Literals.GROUP__MEMBER, - DGFactory.eINSTANCE.createRootCanvas())); - - newChildDescriptors.add(createChildParameter( - DGPackage.Literals.GROUP__MEMBER, - DGFactory.eINSTANCE.createText())); - - newChildDescriptors.add(createChildParameter( - DGPackage.Literals.GROUP__MEMBER, - DGFactory.eINSTANCE.createUse())); + newChildDescriptors.add + (createChildParameter + (DGPackage.Literals.GROUP__MEMBER, + DGFactory.eINSTANCE.createGroup())); + + newChildDescriptors.add + (createChildParameter + (DGPackage.Literals.GROUP__MEMBER, + DGFactory.eINSTANCE.createCanvas())); + + newChildDescriptors.add + (createChildParameter + (DGPackage.Literals.GROUP__MEMBER, + DGFactory.eINSTANCE.createClipPath())); + + newChildDescriptors.add + (createChildParameter + (DGPackage.Literals.GROUP__MEMBER, + DGFactory.eINSTANCE.createCircle())); + + newChildDescriptors.add + (createChildParameter + (DGPackage.Literals.GROUP__MEMBER, + DGFactory.eINSTANCE.createEllipse())); + + newChildDescriptors.add + (createChildParameter + (DGPackage.Literals.GROUP__MEMBER, + DGFactory.eINSTANCE.createImage())); + + newChildDescriptors.add + (createChildParameter + (DGPackage.Literals.GROUP__MEMBER, + DGFactory.eINSTANCE.createLine())); + + newChildDescriptors.add + (createChildParameter + (DGPackage.Literals.GROUP__MEMBER, + DGFactory.eINSTANCE.createMarker())); + + newChildDescriptors.add + (createChildParameter + (DGPackage.Literals.GROUP__MEMBER, + DGFactory.eINSTANCE.createPath())); + + newChildDescriptors.add + (createChildParameter + (DGPackage.Literals.GROUP__MEMBER, + DGFactory.eINSTANCE.createPolygon())); + + newChildDescriptors.add + (createChildParameter + (DGPackage.Literals.GROUP__MEMBER, + DGFactory.eINSTANCE.createPolyline())); + + newChildDescriptors.add + (createChildParameter + (DGPackage.Literals.GROUP__MEMBER, + DGFactory.eINSTANCE.createRectangle())); + + newChildDescriptors.add + (createChildParameter + (DGPackage.Literals.GROUP__MEMBER, + DGFactory.eINSTANCE.createRootCanvas())); + + newChildDescriptors.add + (createChildParameter + (DGPackage.Literals.GROUP__MEMBER, + DGFactory.eINSTANCE.createText())); + + newChildDescriptors.add + (createChildParameter + (DGPackage.Literals.GROUP__MEMBER, + DGFactory.eINSTANCE.createUse())); } } diff --git a/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/src/org/eclipse/papyrus/dd/dg/provider/ImageItemProvider.java b/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/src/org/eclipse/papyrus/dd/dg/provider/ImageItemProvider.java index c03c1c78dc3..833458fddd7 100644 --- a/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/src/org/eclipse/papyrus/dd/dg/provider/ImageItemProvider.java +++ b/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/src/org/eclipse/papyrus/dd/dg/provider/ImageItemProvider.java @@ -37,10 +37,9 @@ import org.eclipse.papyrus.dd.dg.DGPackage; import org.eclipse.papyrus.dd.dg.Image; /** - * This is the item provider adapter for a - * {@link org.eclipse.papyrus.dd.dg.Image} object. <!-- begin-user-doc --> <!-- + * This is the item provider adapter for a {@link org.eclipse.papyrus.dd.dg.Image} object. + * <!-- begin-user-doc --> <!-- * end-user-doc --> - * * @generated */ public class ImageItemProvider extends GraphicalElementItemProvider implements @@ -81,45 +80,47 @@ public class ImageItemProvider extends GraphicalElementItemProvider implements * @generated */ protected void addSourcePropertyDescriptor(Object object) { - itemPropertyDescriptors.add(createItemPropertyDescriptor( - ((ComposeableAdapterFactory) adapterFactory) - .getRootAdapterFactory(), - getResourceLocator(), - getString("_UI_Image_source_feature"), - getString("_UI_PropertyDescriptor_description", - "_UI_Image_source_feature", "_UI_Image_type"), - DGPackage.Literals.IMAGE__SOURCE, true, false, false, - ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null)); + itemPropertyDescriptors.add + (createItemPropertyDescriptor + (((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(), + getResourceLocator(), + getString("_UI_Image_source_feature"), + getString("_UI_PropertyDescriptor_description", "_UI_Image_source_feature", "_UI_Image_type"), + DGPackage.Literals.IMAGE__SOURCE, + true, + false, + false, + ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, + null, + null)); } /** - * This adds a property descriptor for the Is Aspect Ratio Preserved - * feature. <!-- begin-user-doc --> <!-- end-user-doc --> - * + * This adds a property descriptor for the Is Aspect Ratio Preserved feature. + * <!-- begin-user-doc --> <!-- end-user-doc --> * @generated */ protected void addIsAspectRatioPreservedPropertyDescriptor(Object object) { - itemPropertyDescriptors.add(createItemPropertyDescriptor( - ((ComposeableAdapterFactory) adapterFactory) - .getRootAdapterFactory(), - getResourceLocator(), - getString("_UI_Image_isAspectRatioPreserved_feature"), - getString("_UI_PropertyDescriptor_description", - "_UI_Image_isAspectRatioPreserved_feature", - "_UI_Image_type"), - DGPackage.Literals.IMAGE__IS_ASPECT_RATIO_PRESERVED, true, - false, false, ItemPropertyDescriptor.BOOLEAN_VALUE_IMAGE, null, - null)); + itemPropertyDescriptors.add + (createItemPropertyDescriptor + (((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(), + getResourceLocator(), + getString("_UI_Image_isAspectRatioPreserved_feature"), + getString("_UI_PropertyDescriptor_description", "_UI_Image_isAspectRatioPreserved_feature", "_UI_Image_type"), + DGPackage.Literals.IMAGE__IS_ASPECT_RATIO_PRESERVED, + 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}, - * {@link org.eclipse.emf.edit.command.RemoveCommand} or - * {@link org.eclipse.emf.edit.command.MoveCommand} in - * {@link #createCommand}. <!-- begin-user-doc --> <!-- end-user-doc --> - * + * This specifies how to implement {@link #getChildren} and is used to deduce an appropriate feature for an + * {@link org.eclipse.emf.edit.command.AddCommand}, {@link org.eclipse.emf.edit.command.RemoveCommand} or + * {@link org.eclipse.emf.edit.command.MoveCommand} in {@link #createCommand}. + * <!-- begin-user-doc --> <!-- end-user-doc --> * @generated */ @Override @@ -134,48 +135,45 @@ public class ImageItemProvider extends GraphicalElementItemProvider implements /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ @Override protected EStructuralFeature getChildFeature(Object object, Object child) { - // Check the type of the specified child object and return the proper - // feature to use for + // Check the type of the specified child object and return the proper feature to use for // adding (see {@link AddCommand}) it as a child. return super.getChildFeature(object, child); } /** - * This returns Image.gif. <!-- begin-user-doc --> <!-- end-user-doc --> - * + * This returns Image.gif. + * <!-- begin-user-doc --> <!-- end-user-doc --> * @generated */ @Override public Object getImage(Object object) { - return overlayImage(object, - getResourceLocator().getImage("full/obj16/Image")); + return overlayImage(object, getResourceLocator().getImage("full/obj16/Image")); } /** - * This returns the label text for the adapted class. <!-- begin-user-doc + * This returns the label text for the adapted class. + * <!-- begin-user-doc * --> <!-- end-user-doc --> - * * @generated */ @Override public String getText(Object object) { - String label = ((Image) object).getId(); - return label == null || label.length() == 0 ? getString("_UI_Image_type") - : getString("_UI_Image_type") + " " + label; + String label = ((Image)object).getId(); + return label == null || label.length() == 0 ? + getString("_UI_Image_type") : + getString("_UI_Image_type") + " " + label; } /** - * 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 --> <!-- + * 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 @@ -183,15 +181,13 @@ public class ImageItemProvider extends GraphicalElementItemProvider implements updateChildren(notification); switch (notification.getFeatureID(Image.class)) { - case DGPackage.IMAGE__SOURCE: - case DGPackage.IMAGE__IS_ASPECT_RATIO_PRESERVED: - fireNotifyChanged(new ViewerNotification(notification, - notification.getNotifier(), false, true)); - return; - case DGPackage.IMAGE__BOUNDS: - fireNotifyChanged(new ViewerNotification(notification, - notification.getNotifier(), true, false)); - return; + case DGPackage.IMAGE__SOURCE: + case DGPackage.IMAGE__IS_ASPECT_RATIO_PRESERVED: + fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), false, true)); + return; + case DGPackage.IMAGE__BOUNDS: + fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), true, false)); + return; } super.notifyChanged(notification); } @@ -208,9 +204,10 @@ public class ImageItemProvider extends GraphicalElementItemProvider implements Collection<Object> newChildDescriptors, Object object) { super.collectNewChildDescriptors(newChildDescriptors, object); - newChildDescriptors.add(createChildParameter( - DGPackage.Literals.IMAGE__BOUNDS, - DCFactory.eINSTANCE.createBounds())); + newChildDescriptors.add + (createChildParameter + (DGPackage.Literals.IMAGE__BOUNDS, + DCFactory.eINSTANCE.createBounds())); } } diff --git a/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/src/org/eclipse/papyrus/dd/dg/provider/LineItemProvider.java b/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/src/org/eclipse/papyrus/dd/dg/provider/LineItemProvider.java index 78793b152ba..1c5325c65ce 100644 --- a/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/src/org/eclipse/papyrus/dd/dg/provider/LineItemProvider.java +++ b/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/src/org/eclipse/papyrus/dd/dg/provider/LineItemProvider.java @@ -35,10 +35,9 @@ import org.eclipse.papyrus.dd.dg.DGPackage; import org.eclipse.papyrus.dd.dg.Line; /** - * This is the item provider adapter for a - * {@link org.eclipse.papyrus.dd.dg.Line} object. <!-- begin-user-doc --> <!-- + * This is the item provider adapter for a {@link org.eclipse.papyrus.dd.dg.Line} object. + * <!-- begin-user-doc --> <!-- * end-user-doc --> - * * @generated */ public class LineItemProvider extends MarkedElementItemProvider implements @@ -71,13 +70,10 @@ public class LineItemProvider extends MarkedElementItemProvider implements } /** - * This specifies how to implement {@link #getChildren} and is used to - * deduce an appropriate feature for an - * {@link org.eclipse.emf.edit.command.AddCommand}, - * {@link org.eclipse.emf.edit.command.RemoveCommand} or - * {@link org.eclipse.emf.edit.command.MoveCommand} in - * {@link #createCommand}. <!-- begin-user-doc --> <!-- end-user-doc --> - * + * This specifies how to implement {@link #getChildren} and is used to deduce an appropriate feature for an + * {@link org.eclipse.emf.edit.command.AddCommand}, {@link org.eclipse.emf.edit.command.RemoveCommand} or + * {@link org.eclipse.emf.edit.command.MoveCommand} in {@link #createCommand}. + * <!-- begin-user-doc --> <!-- end-user-doc --> * @generated */ @Override @@ -93,48 +89,45 @@ public class LineItemProvider extends MarkedElementItemProvider implements /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ @Override protected EStructuralFeature getChildFeature(Object object, Object child) { - // Check the type of the specified child object and return the proper - // feature to use for + // Check the type of the specified child object and return the proper feature to use for // adding (see {@link AddCommand}) it as a child. return super.getChildFeature(object, child); } /** - * This returns Line.gif. <!-- begin-user-doc --> <!-- end-user-doc --> - * + * This returns Line.gif. + * <!-- begin-user-doc --> <!-- end-user-doc --> * @generated */ @Override public Object getImage(Object object) { - return overlayImage(object, - getResourceLocator().getImage("full/obj16/Line")); + return overlayImage(object, getResourceLocator().getImage("full/obj16/Line")); } /** - * This returns the label text for the adapted class. <!-- begin-user-doc + * This returns the label text for the adapted class. + * <!-- begin-user-doc * --> <!-- end-user-doc --> - * * @generated */ @Override public String getText(Object object) { - String label = ((Line) object).getId(); - return label == null || label.length() == 0 ? getString("_UI_Line_type") - : getString("_UI_Line_type") + " " + label; + String label = ((Line)object).getId(); + return label == null || label.length() == 0 ? + getString("_UI_Line_type") : + getString("_UI_Line_type") + " " + label; } /** - * 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 --> <!-- + * 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 @@ -142,11 +135,10 @@ public class LineItemProvider extends MarkedElementItemProvider implements updateChildren(notification); switch (notification.getFeatureID(Line.class)) { - case DGPackage.LINE__START: - case DGPackage.LINE__END: - fireNotifyChanged(new ViewerNotification(notification, - notification.getNotifier(), true, false)); - return; + case DGPackage.LINE__START: + case DGPackage.LINE__END: + fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), true, false)); + return; } super.notifyChanged(notification); } @@ -163,13 +155,15 @@ public class LineItemProvider extends MarkedElementItemProvider implements Collection<Object> newChildDescriptors, Object object) { super.collectNewChildDescriptors(newChildDescriptors, object); - newChildDescriptors.add(createChildParameter( - DGPackage.Literals.LINE__START, - DCFactory.eINSTANCE.createPoint())); + newChildDescriptors.add + (createChildParameter + (DGPackage.Literals.LINE__START, + DCFactory.eINSTANCE.createPoint())); - newChildDescriptors - .add(createChildParameter(DGPackage.Literals.LINE__END, - DCFactory.eINSTANCE.createPoint())); + newChildDescriptors.add + (createChildParameter + (DGPackage.Literals.LINE__END, + DCFactory.eINSTANCE.createPoint())); } /** @@ -185,13 +179,14 @@ public class LineItemProvider extends MarkedElementItemProvider implements Object childFeature = feature; Object childObject = child; - boolean qualify = childFeature == DGPackage.Literals.LINE__START - || childFeature == DGPackage.Literals.LINE__END; + boolean qualify = + childFeature == DGPackage.Literals.LINE__START || + childFeature == DGPackage.Literals.LINE__END; if (qualify) { - return getString("_UI_CreateChild_text2", new Object[] { - getTypeText(childObject), getFeatureText(childFeature), - getTypeText(owner) }); + return getString + ("_UI_CreateChild_text2", + new Object[] { getTypeText(childObject), getFeatureText(childFeature), getTypeText(owner) }); } return super.getCreateChildText(owner, feature, child, selection); } diff --git a/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/src/org/eclipse/papyrus/dd/dg/provider/LineToItemProvider.java b/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/src/org/eclipse/papyrus/dd/dg/provider/LineToItemProvider.java index c2d6566a7c0..8cb70eb8d90 100644 --- a/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/src/org/eclipse/papyrus/dd/dg/provider/LineToItemProvider.java +++ b/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/src/org/eclipse/papyrus/dd/dg/provider/LineToItemProvider.java @@ -35,10 +35,9 @@ import org.eclipse.papyrus.dd.dg.DGPackage; import org.eclipse.papyrus.dd.dg.LineTo; /** - * This is the item provider adapter for a - * {@link org.eclipse.papyrus.dd.dg.LineTo} object. <!-- begin-user-doc --> <!-- + * This is the item provider adapter for a {@link org.eclipse.papyrus.dd.dg.LineTo} object. + * <!-- begin-user-doc --> <!-- * end-user-doc --> - * * @generated */ public class LineToItemProvider extends PathCommandItemProvider implements @@ -71,13 +70,10 @@ public class LineToItemProvider extends PathCommandItemProvider implements } /** - * This specifies how to implement {@link #getChildren} and is used to - * deduce an appropriate feature for an - * {@link org.eclipse.emf.edit.command.AddCommand}, - * {@link org.eclipse.emf.edit.command.RemoveCommand} or - * {@link org.eclipse.emf.edit.command.MoveCommand} in - * {@link #createCommand}. <!-- begin-user-doc --> <!-- end-user-doc --> - * + * This specifies how to implement {@link #getChildren} and is used to deduce an appropriate feature for an + * {@link org.eclipse.emf.edit.command.AddCommand}, {@link org.eclipse.emf.edit.command.RemoveCommand} or + * {@link org.eclipse.emf.edit.command.MoveCommand} in {@link #createCommand}. + * <!-- begin-user-doc --> <!-- end-user-doc --> * @generated */ @Override @@ -92,47 +88,43 @@ public class LineToItemProvider extends PathCommandItemProvider implements /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ @Override protected EStructuralFeature getChildFeature(Object object, Object child) { - // Check the type of the specified child object and return the proper - // feature to use for + // Check the type of the specified child object and return the proper feature to use for // adding (see {@link AddCommand}) it as a child. return super.getChildFeature(object, child); } /** - * This returns LineTo.gif. <!-- begin-user-doc --> <!-- end-user-doc --> - * + * This returns LineTo.gif. + * <!-- begin-user-doc --> <!-- end-user-doc --> * @generated */ @Override public Object getImage(Object object) { - return overlayImage(object, - getResourceLocator().getImage("full/obj16/LineTo")); + return overlayImage(object, getResourceLocator().getImage("full/obj16/LineTo")); } /** - * This returns the label text for the adapted class. <!-- begin-user-doc + * This returns the label text for the adapted class. + * <!-- begin-user-doc * --> <!-- end-user-doc --> - * * @generated */ @Override public String getText(Object object) { - LineTo lineTo = (LineTo) object; + LineTo lineTo = (LineTo)object; return getString("_UI_LineTo_type") + " " + lineTo.isRelative(); } /** - * 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 --> <!-- + * 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 @@ -140,10 +132,9 @@ public class LineToItemProvider extends PathCommandItemProvider implements updateChildren(notification); switch (notification.getFeatureID(LineTo.class)) { - case DGPackage.LINE_TO__POINT: - fireNotifyChanged(new ViewerNotification(notification, - notification.getNotifier(), true, false)); - return; + case DGPackage.LINE_TO__POINT: + fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), true, false)); + return; } super.notifyChanged(notification); } @@ -160,9 +151,10 @@ public class LineToItemProvider extends PathCommandItemProvider implements Collection<Object> newChildDescriptors, Object object) { super.collectNewChildDescriptors(newChildDescriptors, object); - newChildDescriptors.add(createChildParameter( - DGPackage.Literals.LINE_TO__POINT, - DCFactory.eINSTANCE.createPoint())); + newChildDescriptors.add + (createChildParameter + (DGPackage.Literals.LINE_TO__POINT, + DCFactory.eINSTANCE.createPoint())); } } diff --git a/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/src/org/eclipse/papyrus/dd/dg/provider/LinearGradientItemProvider.java b/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/src/org/eclipse/papyrus/dd/dg/provider/LinearGradientItemProvider.java index 50ef81221c1..28a5b7b1d9c 100644 --- a/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/src/org/eclipse/papyrus/dd/dg/provider/LinearGradientItemProvider.java +++ b/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/src/org/eclipse/papyrus/dd/dg/provider/LinearGradientItemProvider.java @@ -13,12 +13,9 @@ package org.eclipse.papyrus.dd.dg.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.ecore.EStructuralFeature; - import org.eclipse.emf.edit.provider.IEditingDomainItemProvider; import org.eclipse.emf.edit.provider.IItemColorProvider; import org.eclipse.emf.edit.provider.IItemFontProvider; @@ -28,17 +25,14 @@ 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.ViewerNotification; - import org.eclipse.papyrus.dd.dc.DCFactory; - import org.eclipse.papyrus.dd.dg.DGPackage; import org.eclipse.papyrus.dd.dg.LinearGradient; /** - * This is the item provider adapter for a - * {@link org.eclipse.papyrus.dd.dg.LinearGradient} object. <!-- begin-user-doc + * This is the item provider adapter for a {@link org.eclipse.papyrus.dd.dg.LinearGradient} object. + * <!-- begin-user-doc * --> <!-- end-user-doc --> - * * @generated */ public class LinearGradientItemProvider extends GradientItemProvider implements @@ -71,13 +65,10 @@ public class LinearGradientItemProvider extends GradientItemProvider implements } /** - * This specifies how to implement {@link #getChildren} and is used to - * deduce an appropriate feature for an - * {@link org.eclipse.emf.edit.command.AddCommand}, - * {@link org.eclipse.emf.edit.command.RemoveCommand} or - * {@link org.eclipse.emf.edit.command.MoveCommand} in - * {@link #createCommand}. <!-- begin-user-doc --> <!-- end-user-doc --> - * + * This specifies how to implement {@link #getChildren} and is used to deduce an appropriate feature for an + * {@link org.eclipse.emf.edit.command.AddCommand}, {@link org.eclipse.emf.edit.command.RemoveCommand} or + * {@link org.eclipse.emf.edit.command.MoveCommand} in {@link #createCommand}. + * <!-- begin-user-doc --> <!-- end-user-doc --> * @generated */ @Override @@ -93,49 +84,46 @@ public class LinearGradientItemProvider extends GradientItemProvider implements /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ @Override protected EStructuralFeature getChildFeature(Object object, Object child) { - // Check the type of the specified child object and return the proper - // feature to use for + // Check the type of the specified child object and return the proper feature to use for // adding (see {@link AddCommand}) it as a child. return super.getChildFeature(object, child); } /** - * This returns LinearGradient.gif. <!-- begin-user-doc --> <!-- + * This returns LinearGradient.gif. + * <!-- begin-user-doc --> <!-- * end-user-doc --> - * * @generated */ @Override public Object getImage(Object object) { - return overlayImage(object, - getResourceLocator().getImage("full/obj16/LinearGradient")); + return overlayImage(object, getResourceLocator().getImage("full/obj16/LinearGradient")); } /** - * This returns the label text for the adapted class. <!-- begin-user-doc + * This returns the label text for the adapted class. + * <!-- begin-user-doc * --> <!-- end-user-doc --> - * * @generated */ @Override public String getText(Object object) { - String label = ((LinearGradient) object).getId(); - return label == null || label.length() == 0 ? getString("_UI_LinearGradient_type") - : getString("_UI_LinearGradient_type") + " " + label; + String label = ((LinearGradient)object).getId(); + return label == null || label.length() == 0 ? + getString("_UI_LinearGradient_type") : + getString("_UI_LinearGradient_type") + " " + label; } /** - * 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 --> <!-- + * 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 @@ -143,11 +131,10 @@ public class LinearGradientItemProvider extends GradientItemProvider implements updateChildren(notification); switch (notification.getFeatureID(LinearGradient.class)) { - case DGPackage.LINEAR_GRADIENT__START: - case DGPackage.LINEAR_GRADIENT__END: - fireNotifyChanged(new ViewerNotification(notification, - notification.getNotifier(), true, false)); - return; + case DGPackage.LINEAR_GRADIENT__START: + case DGPackage.LINEAR_GRADIENT__END: + fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), true, false)); + return; } super.notifyChanged(notification); } @@ -164,13 +151,15 @@ public class LinearGradientItemProvider extends GradientItemProvider implements Collection<Object> newChildDescriptors, Object object) { super.collectNewChildDescriptors(newChildDescriptors, object); - newChildDescriptors.add(createChildParameter( - DGPackage.Literals.LINEAR_GRADIENT__START, - DCFactory.eINSTANCE.createPoint())); + newChildDescriptors.add + (createChildParameter + (DGPackage.Literals.LINEAR_GRADIENT__START, + DCFactory.eINSTANCE.createPoint())); - newChildDescriptors.add(createChildParameter( - DGPackage.Literals.LINEAR_GRADIENT__END, - DCFactory.eINSTANCE.createPoint())); + newChildDescriptors.add + (createChildParameter + (DGPackage.Literals.LINEAR_GRADIENT__END, + DCFactory.eINSTANCE.createPoint())); } /** @@ -186,13 +175,14 @@ public class LinearGradientItemProvider extends GradientItemProvider implements Object childFeature = feature; Object childObject = child; - boolean qualify = childFeature == DGPackage.Literals.LINEAR_GRADIENT__START - || childFeature == DGPackage.Literals.LINEAR_GRADIENT__END; + boolean qualify = + childFeature == DGPackage.Literals.LINEAR_GRADIENT__START || + childFeature == DGPackage.Literals.LINEAR_GRADIENT__END; if (qualify) { - return getString("_UI_CreateChild_text2", new Object[] { - getTypeText(childObject), getFeatureText(childFeature), - getTypeText(owner) }); + return getString + ("_UI_CreateChild_text2", + new Object[] { getTypeText(childObject), getFeatureText(childFeature), getTypeText(owner) }); } return super.getCreateChildText(owner, feature, child, selection); } diff --git a/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/src/org/eclipse/papyrus/dd/dg/provider/MarkedElementItemProvider.java b/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/src/org/eclipse/papyrus/dd/dg/provider/MarkedElementItemProvider.java index 96f7c49a10d..87d0edd3baa 100644 --- a/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/src/org/eclipse/papyrus/dd/dg/provider/MarkedElementItemProvider.java +++ b/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/src/org/eclipse/papyrus/dd/dg/provider/MarkedElementItemProvider.java @@ -31,10 +31,9 @@ import org.eclipse.papyrus.dd.dg.DGPackage; import org.eclipse.papyrus.dd.dg.MarkedElement; /** - * This is the item provider adapter for a - * {@link org.eclipse.papyrus.dd.dg.MarkedElement} object. <!-- begin-user-doc + * This is the item provider adapter for a {@link org.eclipse.papyrus.dd.dg.MarkedElement} object. + * <!-- begin-user-doc * --> <!-- end-user-doc --> - * * @generated */ public class MarkedElementItemProvider extends GraphicalElementItemProvider @@ -76,16 +75,19 @@ public class MarkedElementItemProvider extends GraphicalElementItemProvider * @generated */ protected void addEndMarkerPropertyDescriptor(Object object) { - itemPropertyDescriptors.add(createItemPropertyDescriptor( - ((ComposeableAdapterFactory) adapterFactory) - .getRootAdapterFactory(), - getResourceLocator(), - getString("_UI_MarkedElement_endMarker_feature"), - getString("_UI_PropertyDescriptor_description", - "_UI_MarkedElement_endMarker_feature", - "_UI_MarkedElement_type"), - DGPackage.Literals.MARKED_ELEMENT__END_MARKER, true, false, - true, null, null, null)); + itemPropertyDescriptors.add + (createItemPropertyDescriptor + (((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(), + getResourceLocator(), + getString("_UI_MarkedElement_endMarker_feature"), + getString("_UI_PropertyDescriptor_description", "_UI_MarkedElement_endMarker_feature", "_UI_MarkedElement_type"), + DGPackage.Literals.MARKED_ELEMENT__END_MARKER, + true, + false, + true, + null, + null, + null)); } /** @@ -95,16 +97,19 @@ public class MarkedElementItemProvider extends GraphicalElementItemProvider * @generated */ protected void addMidMarkerPropertyDescriptor(Object object) { - itemPropertyDescriptors.add(createItemPropertyDescriptor( - ((ComposeableAdapterFactory) adapterFactory) - .getRootAdapterFactory(), - getResourceLocator(), - getString("_UI_MarkedElement_midMarker_feature"), - getString("_UI_PropertyDescriptor_description", - "_UI_MarkedElement_midMarker_feature", - "_UI_MarkedElement_type"), - DGPackage.Literals.MARKED_ELEMENT__MID_MARKER, true, false, - true, null, null, null)); + itemPropertyDescriptors.add + (createItemPropertyDescriptor + (((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(), + getResourceLocator(), + getString("_UI_MarkedElement_midMarker_feature"), + getString("_UI_PropertyDescriptor_description", "_UI_MarkedElement_midMarker_feature", "_UI_MarkedElement_type"), + DGPackage.Literals.MARKED_ELEMENT__MID_MARKER, + true, + false, + true, + null, + null, + null)); } /** @@ -114,37 +119,40 @@ public class MarkedElementItemProvider extends GraphicalElementItemProvider * @generated */ protected void addStartMarkerPropertyDescriptor(Object object) { - itemPropertyDescriptors.add(createItemPropertyDescriptor( - ((ComposeableAdapterFactory) adapterFactory) - .getRootAdapterFactory(), - getResourceLocator(), - getString("_UI_MarkedElement_startMarker_feature"), - getString("_UI_PropertyDescriptor_description", - "_UI_MarkedElement_startMarker_feature", - "_UI_MarkedElement_type"), - DGPackage.Literals.MARKED_ELEMENT__START_MARKER, true, false, - true, null, null, null)); + itemPropertyDescriptors.add + (createItemPropertyDescriptor + (((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(), + getResourceLocator(), + getString("_UI_MarkedElement_startMarker_feature"), + getString("_UI_PropertyDescriptor_description", "_UI_MarkedElement_startMarker_feature", "_UI_MarkedElement_type"), + DGPackage.Literals.MARKED_ELEMENT__START_MARKER, + true, + false, + true, + null, + null, + null)); } /** - * This returns the label text for the adapted class. <!-- begin-user-doc + * This returns the label text for the adapted class. + * <!-- begin-user-doc * --> <!-- end-user-doc --> - * * @generated */ @Override public String getText(Object object) { - String label = ((MarkedElement) object).getId(); - return label == null || label.length() == 0 ? getString("_UI_MarkedElement_type") - : getString("_UI_MarkedElement_type") + " " + label; + String label = ((MarkedElement)object).getId(); + return label == null || label.length() == 0 ? + getString("_UI_MarkedElement_type") : + getString("_UI_MarkedElement_type") + " " + label; } /** - * 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 --> <!-- + * 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 diff --git a/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/src/org/eclipse/papyrus/dd/dg/provider/MarkerItemProvider.java b/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/src/org/eclipse/papyrus/dd/dg/provider/MarkerItemProvider.java index 66bbbc28cc1..8fb604fdad0 100644 --- a/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/src/org/eclipse/papyrus/dd/dg/provider/MarkerItemProvider.java +++ b/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/src/org/eclipse/papyrus/dd/dg/provider/MarkerItemProvider.java @@ -35,10 +35,9 @@ import org.eclipse.papyrus.dd.dg.DGPackage; import org.eclipse.papyrus.dd.dg.Marker; /** - * This is the item provider adapter for a - * {@link org.eclipse.papyrus.dd.dg.Marker} object. <!-- begin-user-doc --> <!-- + * This is the item provider adapter for a {@link org.eclipse.papyrus.dd.dg.Marker} object. + * <!-- begin-user-doc --> <!-- * end-user-doc --> - * * @generated */ public class MarkerItemProvider extends GroupItemProvider implements @@ -71,13 +70,10 @@ public class MarkerItemProvider extends GroupItemProvider implements } /** - * This specifies how to implement {@link #getChildren} and is used to - * deduce an appropriate feature for an - * {@link org.eclipse.emf.edit.command.AddCommand}, - * {@link org.eclipse.emf.edit.command.RemoveCommand} or - * {@link org.eclipse.emf.edit.command.MoveCommand} in - * {@link #createCommand}. <!-- begin-user-doc --> <!-- end-user-doc --> - * + * This specifies how to implement {@link #getChildren} and is used to deduce an appropriate feature for an + * {@link org.eclipse.emf.edit.command.AddCommand}, {@link org.eclipse.emf.edit.command.RemoveCommand} or + * {@link org.eclipse.emf.edit.command.MoveCommand} in {@link #createCommand}. + * <!-- begin-user-doc --> <!-- end-user-doc --> * @generated */ @Override @@ -93,48 +89,45 @@ public class MarkerItemProvider extends GroupItemProvider implements /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ @Override protected EStructuralFeature getChildFeature(Object object, Object child) { - // Check the type of the specified child object and return the proper - // feature to use for + // Check the type of the specified child object and return the proper feature to use for // adding (see {@link AddCommand}) it as a child. return super.getChildFeature(object, child); } /** - * This returns Marker.gif. <!-- begin-user-doc --> <!-- end-user-doc --> - * + * This returns Marker.gif. + * <!-- begin-user-doc --> <!-- end-user-doc --> * @generated */ @Override public Object getImage(Object object) { - return overlayImage(object, - getResourceLocator().getImage("full/obj16/Marker")); + return overlayImage(object, getResourceLocator().getImage("full/obj16/Marker")); } /** - * This returns the label text for the adapted class. <!-- begin-user-doc + * This returns the label text for the adapted class. + * <!-- begin-user-doc * --> <!-- end-user-doc --> - * * @generated */ @Override public String getText(Object object) { - String label = ((Marker) object).getId(); - return label == null || label.length() == 0 ? getString("_UI_Marker_type") - : getString("_UI_Marker_type") + " " + label; + String label = ((Marker)object).getId(); + return label == null || label.length() == 0 ? + getString("_UI_Marker_type") : + getString("_UI_Marker_type") + " " + label; } /** - * 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 --> <!-- + * 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 @@ -142,11 +135,10 @@ public class MarkerItemProvider extends GroupItemProvider implements updateChildren(notification); switch (notification.getFeatureID(Marker.class)) { - case DGPackage.MARKER__SIZE: - case DGPackage.MARKER__REFERENCE: - fireNotifyChanged(new ViewerNotification(notification, - notification.getNotifier(), true, false)); - return; + case DGPackage.MARKER__SIZE: + case DGPackage.MARKER__REFERENCE: + fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), true, false)); + return; } super.notifyChanged(notification); } @@ -163,13 +155,15 @@ public class MarkerItemProvider extends GroupItemProvider implements Collection<Object> newChildDescriptors, Object object) { super.collectNewChildDescriptors(newChildDescriptors, object); - newChildDescriptors.add(createChildParameter( - DGPackage.Literals.MARKER__SIZE, - DCFactory.eINSTANCE.createDimension())); + newChildDescriptors.add + (createChildParameter + (DGPackage.Literals.MARKER__SIZE, + DCFactory.eINSTANCE.createDimension())); - newChildDescriptors.add(createChildParameter( - DGPackage.Literals.MARKER__REFERENCE, - DCFactory.eINSTANCE.createPoint())); + newChildDescriptors.add + (createChildParameter + (DGPackage.Literals.MARKER__REFERENCE, + DCFactory.eINSTANCE.createPoint())); } } diff --git a/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/src/org/eclipse/papyrus/dd/dg/provider/MatrixItemProvider.java b/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/src/org/eclipse/papyrus/dd/dg/provider/MatrixItemProvider.java index 271aedfd875..b12c1304084 100644 --- a/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/src/org/eclipse/papyrus/dd/dg/provider/MatrixItemProvider.java +++ b/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/src/org/eclipse/papyrus/dd/dg/provider/MatrixItemProvider.java @@ -33,10 +33,9 @@ import org.eclipse.papyrus.dd.dg.DGPackage; import org.eclipse.papyrus.dd.dg.Matrix; /** - * This is the item provider adapter for a - * {@link org.eclipse.papyrus.dd.dg.Matrix} object. <!-- begin-user-doc --> <!-- + * This is the item provider adapter for a {@link org.eclipse.papyrus.dd.dg.Matrix} object. + * <!-- begin-user-doc --> <!-- * end-user-doc --> - * * @generated */ public class MatrixItemProvider extends TransformItemProvider implements @@ -75,142 +74,164 @@ public class MatrixItemProvider extends TransformItemProvider implements } /** - * This adds a property descriptor for the A feature. <!-- begin-user-doc + * This adds a property descriptor for the A feature. + * <!-- begin-user-doc * --> <!-- end-user-doc --> - * * @generated */ protected void addAPropertyDescriptor(Object object) { - itemPropertyDescriptors.add(createItemPropertyDescriptor( - ((ComposeableAdapterFactory) adapterFactory) - .getRootAdapterFactory(), - getResourceLocator(), - getString("_UI_Matrix_a_feature"), - getString("_UI_PropertyDescriptor_description", - "_UI_Matrix_a_feature", "_UI_Matrix_type"), - DGPackage.Literals.MATRIX__A, true, false, false, - ItemPropertyDescriptor.REAL_VALUE_IMAGE, null, null)); + itemPropertyDescriptors.add + (createItemPropertyDescriptor + (((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(), + getResourceLocator(), + getString("_UI_Matrix_a_feature"), + getString("_UI_PropertyDescriptor_description", "_UI_Matrix_a_feature", "_UI_Matrix_type"), + DGPackage.Literals.MATRIX__A, + true, + false, + false, + ItemPropertyDescriptor.REAL_VALUE_IMAGE, + null, + null)); } /** - * This adds a property descriptor for the B feature. <!-- begin-user-doc + * This adds a property descriptor for the B feature. + * <!-- begin-user-doc * --> <!-- end-user-doc --> - * * @generated */ protected void addBPropertyDescriptor(Object object) { - itemPropertyDescriptors.add(createItemPropertyDescriptor( - ((ComposeableAdapterFactory) adapterFactory) - .getRootAdapterFactory(), - getResourceLocator(), - getString("_UI_Matrix_b_feature"), - getString("_UI_PropertyDescriptor_description", - "_UI_Matrix_b_feature", "_UI_Matrix_type"), - DGPackage.Literals.MATRIX__B, true, false, false, - ItemPropertyDescriptor.REAL_VALUE_IMAGE, null, null)); + itemPropertyDescriptors.add + (createItemPropertyDescriptor + (((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(), + getResourceLocator(), + getString("_UI_Matrix_b_feature"), + getString("_UI_PropertyDescriptor_description", "_UI_Matrix_b_feature", "_UI_Matrix_type"), + DGPackage.Literals.MATRIX__B, + true, + false, + false, + ItemPropertyDescriptor.REAL_VALUE_IMAGE, + null, + null)); } /** - * This adds a property descriptor for the C feature. <!-- begin-user-doc + * This adds a property descriptor for the C feature. + * <!-- begin-user-doc * --> <!-- end-user-doc --> - * * @generated */ protected void addCPropertyDescriptor(Object object) { - itemPropertyDescriptors.add(createItemPropertyDescriptor( - ((ComposeableAdapterFactory) adapterFactory) - .getRootAdapterFactory(), - getResourceLocator(), - getString("_UI_Matrix_c_feature"), - getString("_UI_PropertyDescriptor_description", - "_UI_Matrix_c_feature", "_UI_Matrix_type"), - DGPackage.Literals.MATRIX__C, true, false, false, - ItemPropertyDescriptor.REAL_VALUE_IMAGE, null, null)); + itemPropertyDescriptors.add + (createItemPropertyDescriptor + (((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(), + getResourceLocator(), + getString("_UI_Matrix_c_feature"), + getString("_UI_PropertyDescriptor_description", "_UI_Matrix_c_feature", "_UI_Matrix_type"), + DGPackage.Literals.MATRIX__C, + true, + false, + false, + ItemPropertyDescriptor.REAL_VALUE_IMAGE, + null, + null)); } /** - * This adds a property descriptor for the D feature. <!-- begin-user-doc + * This adds a property descriptor for the D feature. + * <!-- begin-user-doc * --> <!-- end-user-doc --> - * * @generated */ protected void addDPropertyDescriptor(Object object) { - itemPropertyDescriptors.add(createItemPropertyDescriptor( - ((ComposeableAdapterFactory) adapterFactory) - .getRootAdapterFactory(), - getResourceLocator(), - getString("_UI_Matrix_d_feature"), - getString("_UI_PropertyDescriptor_description", - "_UI_Matrix_d_feature", "_UI_Matrix_type"), - DGPackage.Literals.MATRIX__D, true, false, false, - ItemPropertyDescriptor.REAL_VALUE_IMAGE, null, null)); + itemPropertyDescriptors.add + (createItemPropertyDescriptor + (((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(), + getResourceLocator(), + getString("_UI_Matrix_d_feature"), + getString("_UI_PropertyDescriptor_description", "_UI_Matrix_d_feature", "_UI_Matrix_type"), + DGPackage.Literals.MATRIX__D, + true, + false, + false, + ItemPropertyDescriptor.REAL_VALUE_IMAGE, + null, + null)); } /** - * This adds a property descriptor for the E feature. <!-- begin-user-doc + * This adds a property descriptor for the E feature. + * <!-- begin-user-doc * --> <!-- end-user-doc --> - * * @generated */ protected void addEPropertyDescriptor(Object object) { - itemPropertyDescriptors.add(createItemPropertyDescriptor( - ((ComposeableAdapterFactory) adapterFactory) - .getRootAdapterFactory(), - getResourceLocator(), - getString("_UI_Matrix_e_feature"), - getString("_UI_PropertyDescriptor_description", - "_UI_Matrix_e_feature", "_UI_Matrix_type"), - DGPackage.Literals.MATRIX__E, true, false, false, - ItemPropertyDescriptor.REAL_VALUE_IMAGE, null, null)); + itemPropertyDescriptors.add + (createItemPropertyDescriptor + (((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(), + getResourceLocator(), + getString("_UI_Matrix_e_feature"), + getString("_UI_PropertyDescriptor_description", "_UI_Matrix_e_feature", "_UI_Matrix_type"), + DGPackage.Literals.MATRIX__E, + true, + false, + false, + ItemPropertyDescriptor.REAL_VALUE_IMAGE, + null, + null)); } /** - * This adds a property descriptor for the F feature. <!-- begin-user-doc + * This adds a property descriptor for the F feature. + * <!-- begin-user-doc * --> <!-- end-user-doc --> - * * @generated */ protected void addFPropertyDescriptor(Object object) { - itemPropertyDescriptors.add(createItemPropertyDescriptor( - ((ComposeableAdapterFactory) adapterFactory) - .getRootAdapterFactory(), - getResourceLocator(), - getString("_UI_Matrix_f_feature"), - getString("_UI_PropertyDescriptor_description", - "_UI_Matrix_f_feature", "_UI_Matrix_type"), - DGPackage.Literals.MATRIX__F, true, false, false, - ItemPropertyDescriptor.REAL_VALUE_IMAGE, null, null)); + itemPropertyDescriptors.add + (createItemPropertyDescriptor + (((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(), + getResourceLocator(), + getString("_UI_Matrix_f_feature"), + getString("_UI_PropertyDescriptor_description", "_UI_Matrix_f_feature", "_UI_Matrix_type"), + DGPackage.Literals.MATRIX__F, + true, + false, + false, + ItemPropertyDescriptor.REAL_VALUE_IMAGE, + null, + null)); } /** - * This returns Matrix.gif. <!-- begin-user-doc --> <!-- end-user-doc --> - * + * This returns Matrix.gif. + * <!-- begin-user-doc --> <!-- end-user-doc --> * @generated */ @Override public Object getImage(Object object) { - return overlayImage(object, - getResourceLocator().getImage("full/obj16/Matrix")); + return overlayImage(object, getResourceLocator().getImage("full/obj16/Matrix")); } /** - * This returns the label text for the adapted class. <!-- begin-user-doc + * This returns the label text for the adapted class. + * <!-- begin-user-doc * --> <!-- end-user-doc --> - * * @generated */ @Override public String getText(Object object) { - Matrix matrix = (Matrix) object; + Matrix matrix = (Matrix)object; return getString("_UI_Matrix_type") + " " + matrix.getA(); } /** - * 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 --> <!-- + * 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 @@ -218,15 +239,14 @@ public class MatrixItemProvider extends TransformItemProvider implements updateChildren(notification); switch (notification.getFeatureID(Matrix.class)) { - case DGPackage.MATRIX__A: - case DGPackage.MATRIX__B: - case DGPackage.MATRIX__C: - case DGPackage.MATRIX__D: - case DGPackage.MATRIX__E: - case DGPackage.MATRIX__F: - fireNotifyChanged(new ViewerNotification(notification, - notification.getNotifier(), false, true)); - return; + case DGPackage.MATRIX__A: + case DGPackage.MATRIX__B: + case DGPackage.MATRIX__C: + case DGPackage.MATRIX__D: + case DGPackage.MATRIX__E: + case DGPackage.MATRIX__F: + fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), false, true)); + return; } super.notifyChanged(notification); } diff --git a/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/src/org/eclipse/papyrus/dd/dg/provider/MoveToItemProvider.java b/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/src/org/eclipse/papyrus/dd/dg/provider/MoveToItemProvider.java index 91c112fa410..6987e9fff29 100644 --- a/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/src/org/eclipse/papyrus/dd/dg/provider/MoveToItemProvider.java +++ b/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/src/org/eclipse/papyrus/dd/dg/provider/MoveToItemProvider.java @@ -35,10 +35,9 @@ import org.eclipse.papyrus.dd.dg.DGPackage; import org.eclipse.papyrus.dd.dg.MoveTo; /** - * This is the item provider adapter for a - * {@link org.eclipse.papyrus.dd.dg.MoveTo} object. <!-- begin-user-doc --> <!-- + * This is the item provider adapter for a {@link org.eclipse.papyrus.dd.dg.MoveTo} object. + * <!-- begin-user-doc --> <!-- * end-user-doc --> - * * @generated */ public class MoveToItemProvider extends PathCommandItemProvider implements @@ -71,13 +70,10 @@ public class MoveToItemProvider extends PathCommandItemProvider implements } /** - * This specifies how to implement {@link #getChildren} and is used to - * deduce an appropriate feature for an - * {@link org.eclipse.emf.edit.command.AddCommand}, - * {@link org.eclipse.emf.edit.command.RemoveCommand} or - * {@link org.eclipse.emf.edit.command.MoveCommand} in - * {@link #createCommand}. <!-- begin-user-doc --> <!-- end-user-doc --> - * + * This specifies how to implement {@link #getChildren} and is used to deduce an appropriate feature for an + * {@link org.eclipse.emf.edit.command.AddCommand}, {@link org.eclipse.emf.edit.command.RemoveCommand} or + * {@link org.eclipse.emf.edit.command.MoveCommand} in {@link #createCommand}. + * <!-- begin-user-doc --> <!-- end-user-doc --> * @generated */ @Override @@ -92,47 +88,43 @@ public class MoveToItemProvider extends PathCommandItemProvider implements /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ @Override protected EStructuralFeature getChildFeature(Object object, Object child) { - // Check the type of the specified child object and return the proper - // feature to use for + // Check the type of the specified child object and return the proper feature to use for // adding (see {@link AddCommand}) it as a child. return super.getChildFeature(object, child); } /** - * This returns MoveTo.gif. <!-- begin-user-doc --> <!-- end-user-doc --> - * + * This returns MoveTo.gif. + * <!-- begin-user-doc --> <!-- end-user-doc --> * @generated */ @Override public Object getImage(Object object) { - return overlayImage(object, - getResourceLocator().getImage("full/obj16/MoveTo")); + return overlayImage(object, getResourceLocator().getImage("full/obj16/MoveTo")); } /** - * This returns the label text for the adapted class. <!-- begin-user-doc + * This returns the label text for the adapted class. + * <!-- begin-user-doc * --> <!-- end-user-doc --> - * * @generated */ @Override public String getText(Object object) { - MoveTo moveTo = (MoveTo) object; + MoveTo moveTo = (MoveTo)object; return getString("_UI_MoveTo_type") + " " + moveTo.isRelative(); } /** - * 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 --> <!-- + * 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 @@ -140,10 +132,9 @@ public class MoveToItemProvider extends PathCommandItemProvider implements updateChildren(notification); switch (notification.getFeatureID(MoveTo.class)) { - case DGPackage.MOVE_TO__POINT: - fireNotifyChanged(new ViewerNotification(notification, - notification.getNotifier(), true, false)); - return; + case DGPackage.MOVE_TO__POINT: + fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), true, false)); + return; } super.notifyChanged(notification); } @@ -160,9 +151,10 @@ public class MoveToItemProvider extends PathCommandItemProvider implements Collection<Object> newChildDescriptors, Object object) { super.collectNewChildDescriptors(newChildDescriptors, object); - newChildDescriptors.add(createChildParameter( - DGPackage.Literals.MOVE_TO__POINT, - DCFactory.eINSTANCE.createPoint())); + newChildDescriptors.add + (createChildParameter + (DGPackage.Literals.MOVE_TO__POINT, + DCFactory.eINSTANCE.createPoint())); } } diff --git a/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/src/org/eclipse/papyrus/dd/dg/provider/PaintItemProvider.java b/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/src/org/eclipse/papyrus/dd/dg/provider/PaintItemProvider.java index d3fbcf9a186..81fbd4cf24d 100644 --- a/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/src/org/eclipse/papyrus/dd/dg/provider/PaintItemProvider.java +++ b/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/src/org/eclipse/papyrus/dd/dg/provider/PaintItemProvider.java @@ -40,10 +40,9 @@ import org.eclipse.papyrus.dd.dg.Paint; import org.eclipse.papyrus.dd.edit.DDEditPlugin; /** - * This is the item provider adapter for a - * {@link org.eclipse.papyrus.dd.dg.Paint} object. <!-- begin-user-doc --> <!-- + * This is the item provider adapter for a {@link org.eclipse.papyrus.dd.dg.Paint} object. + * <!-- begin-user-doc --> <!-- * end-user-doc --> - * * @generated */ public class PaintItemProvider extends ItemProviderAdapter implements @@ -84,15 +83,19 @@ public class PaintItemProvider extends ItemProviderAdapter implements * @generated */ protected void addColorPropertyDescriptor(Object object) { - itemPropertyDescriptors.add(createItemPropertyDescriptor( - ((ComposeableAdapterFactory) adapterFactory) - .getRootAdapterFactory(), - getResourceLocator(), - getString("_UI_Paint_color_feature"), - getString("_UI_PropertyDescriptor_description", - "_UI_Paint_color_feature", "_UI_Paint_type"), - DGPackage.Literals.PAINT__COLOR, true, false, false, - ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null)); + itemPropertyDescriptors.add + (createItemPropertyDescriptor + (((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(), + getResourceLocator(), + getString("_UI_Paint_color_feature"), + getString("_UI_PropertyDescriptor_description", "_UI_Paint_color_feature", "_UI_Paint_type"), + DGPackage.Literals.PAINT__COLOR, + true, + false, + false, + ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, + null, + null)); } /** @@ -102,48 +105,51 @@ public class PaintItemProvider extends ItemProviderAdapter implements * @generated */ protected void addPaintServerPropertyDescriptor(Object object) { - itemPropertyDescriptors.add(createItemPropertyDescriptor( - ((ComposeableAdapterFactory) adapterFactory) - .getRootAdapterFactory(), - getResourceLocator(), - getString("_UI_Paint_paintServer_feature"), - getString("_UI_PropertyDescriptor_description", - "_UI_Paint_paintServer_feature", "_UI_Paint_type"), - DGPackage.Literals.PAINT__PAINT_SERVER, true, false, true, - null, null, null)); + itemPropertyDescriptors.add + (createItemPropertyDescriptor + (((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(), + getResourceLocator(), + getString("_UI_Paint_paintServer_feature"), + getString("_UI_PropertyDescriptor_description", "_UI_Paint_paintServer_feature", "_UI_Paint_type"), + DGPackage.Literals.PAINT__PAINT_SERVER, + true, + false, + true, + null, + null, + null)); } /** - * This returns Paint.gif. <!-- begin-user-doc --> <!-- end-user-doc --> - * + * This returns Paint.gif. + * <!-- begin-user-doc --> <!-- end-user-doc --> * @generated */ @Override public Object getImage(Object object) { - return overlayImage(object, - getResourceLocator().getImage("full/obj16/Paint")); + return overlayImage(object, getResourceLocator().getImage("full/obj16/Paint")); } /** - * This returns the label text for the adapted class. <!-- begin-user-doc + * This returns the label text for the adapted class. + * <!-- begin-user-doc * --> <!-- end-user-doc --> - * * @generated */ @Override public String getText(Object object) { - Color labelValue = ((Paint) object).getColor(); + Color labelValue = ((Paint)object).getColor(); String label = labelValue == null ? null : labelValue.toString(); - return label == null || label.length() == 0 ? getString("_UI_Paint_type") - : getString("_UI_Paint_type") + " " + label; + return label == null || label.length() == 0 ? + getString("_UI_Paint_type") : + getString("_UI_Paint_type") + " " + label; } /** - * 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 --> <!-- + * 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 @@ -151,10 +157,9 @@ public class PaintItemProvider extends ItemProviderAdapter implements updateChildren(notification); switch (notification.getFeatureID(Paint.class)) { - case DGPackage.PAINT__COLOR: - fireNotifyChanged(new ViewerNotification(notification, - notification.getNotifier(), false, true)); - return; + case DGPackage.PAINT__COLOR: + fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), false, true)); + return; } super.notifyChanged(notification); } diff --git a/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/src/org/eclipse/papyrus/dd/dg/provider/PaintServerItemProvider.java b/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/src/org/eclipse/papyrus/dd/dg/provider/PaintServerItemProvider.java index 7cec9e55627..ebaded5b87a 100644 --- a/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/src/org/eclipse/papyrus/dd/dg/provider/PaintServerItemProvider.java +++ b/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/src/org/eclipse/papyrus/dd/dg/provider/PaintServerItemProvider.java @@ -34,10 +34,9 @@ import org.eclipse.papyrus.dd.dg.DGPackage; import org.eclipse.papyrus.dd.dg.PaintServer; /** - * This is the item provider adapter for a - * {@link org.eclipse.papyrus.dd.dg.PaintServer} object. <!-- begin-user-doc --> + * This is the item provider adapter for a {@link org.eclipse.papyrus.dd.dg.PaintServer} object. + * <!-- begin-user-doc --> * <!-- end-user-doc --> - * * @generated */ public class PaintServerItemProvider extends DefinitionItemProvider implements @@ -70,13 +69,10 @@ public class PaintServerItemProvider extends DefinitionItemProvider implements } /** - * This specifies how to implement {@link #getChildren} and is used to - * deduce an appropriate feature for an - * {@link org.eclipse.emf.edit.command.AddCommand}, - * {@link org.eclipse.emf.edit.command.RemoveCommand} or - * {@link org.eclipse.emf.edit.command.MoveCommand} in - * {@link #createCommand}. <!-- begin-user-doc --> <!-- end-user-doc --> - * + * This specifies how to implement {@link #getChildren} and is used to deduce an appropriate feature for an + * {@link org.eclipse.emf.edit.command.AddCommand}, {@link org.eclipse.emf.edit.command.RemoveCommand} or + * {@link org.eclipse.emf.edit.command.MoveCommand} in {@link #createCommand}. + * <!-- begin-user-doc --> <!-- end-user-doc --> * @generated */ @Override @@ -91,37 +87,35 @@ public class PaintServerItemProvider extends DefinitionItemProvider implements /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ @Override protected EStructuralFeature getChildFeature(Object object, Object child) { - // Check the type of the specified child object and return the proper - // feature to use for + // Check the type of the specified child object and return the proper feature to use for // adding (see {@link AddCommand}) it as a child. return super.getChildFeature(object, child); } /** - * This returns the label text for the adapted class. <!-- begin-user-doc + * This returns the label text for the adapted class. + * <!-- begin-user-doc * --> <!-- end-user-doc --> - * * @generated */ @Override public String getText(Object object) { - String label = ((PaintServer) object).getId(); - return label == null || label.length() == 0 ? getString("_UI_PaintServer_type") - : getString("_UI_PaintServer_type") + " " + label; + String label = ((PaintServer)object).getId(); + return label == null || label.length() == 0 ? + getString("_UI_PaintServer_type") : + getString("_UI_PaintServer_type") + " " + label; } /** - * 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 --> <!-- + * 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 @@ -129,10 +123,9 @@ public class PaintServerItemProvider extends DefinitionItemProvider implements updateChildren(notification); switch (notification.getFeatureID(PaintServer.class)) { - case DGPackage.PAINT_SERVER__TRANSFORM: - fireNotifyChanged(new ViewerNotification(notification, - notification.getNotifier(), true, false)); - return; + case DGPackage.PAINT_SERVER__TRANSFORM: + fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), true, false)); + return; } super.notifyChanged(notification); } @@ -149,25 +142,30 @@ public class PaintServerItemProvider extends DefinitionItemProvider implements Collection<Object> newChildDescriptors, Object object) { super.collectNewChildDescriptors(newChildDescriptors, object); - newChildDescriptors.add(createChildParameter( - DGPackage.Literals.PAINT_SERVER__TRANSFORM, - DGFactory.eINSTANCE.createMatrix())); - - newChildDescriptors.add(createChildParameter( - DGPackage.Literals.PAINT_SERVER__TRANSFORM, - DGFactory.eINSTANCE.createRotate())); - - newChildDescriptors.add(createChildParameter( - DGPackage.Literals.PAINT_SERVER__TRANSFORM, - DGFactory.eINSTANCE.createScale())); - - newChildDescriptors.add(createChildParameter( - DGPackage.Literals.PAINT_SERVER__TRANSFORM, - DGFactory.eINSTANCE.createSkew())); - - newChildDescriptors.add(createChildParameter( - DGPackage.Literals.PAINT_SERVER__TRANSFORM, - DGFactory.eINSTANCE.createTranslate())); + newChildDescriptors.add + (createChildParameter + (DGPackage.Literals.PAINT_SERVER__TRANSFORM, + DGFactory.eINSTANCE.createMatrix())); + + newChildDescriptors.add + (createChildParameter + (DGPackage.Literals.PAINT_SERVER__TRANSFORM, + DGFactory.eINSTANCE.createRotate())); + + newChildDescriptors.add + (createChildParameter + (DGPackage.Literals.PAINT_SERVER__TRANSFORM, + DGFactory.eINSTANCE.createScale())); + + newChildDescriptors.add + (createChildParameter + (DGPackage.Literals.PAINT_SERVER__TRANSFORM, + DGFactory.eINSTANCE.createSkew())); + + newChildDescriptors.add + (createChildParameter + (DGPackage.Literals.PAINT_SERVER__TRANSFORM, + DGFactory.eINSTANCE.createTranslate())); } } diff --git a/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/src/org/eclipse/papyrus/dd/dg/provider/PathCommandItemProvider.java b/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/src/org/eclipse/papyrus/dd/dg/provider/PathCommandItemProvider.java index 0c3773c4200..10955bca3c7 100644 --- a/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/src/org/eclipse/papyrus/dd/dg/provider/PathCommandItemProvider.java +++ b/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/src/org/eclipse/papyrus/dd/dg/provider/PathCommandItemProvider.java @@ -38,10 +38,9 @@ import org.eclipse.papyrus.dd.dg.PathCommand; import org.eclipse.papyrus.dd.edit.DDEditPlugin; /** - * This is the item provider adapter for a - * {@link org.eclipse.papyrus.dd.dg.PathCommand} object. <!-- begin-user-doc --> + * This is the item provider adapter for a {@link org.eclipse.papyrus.dd.dg.PathCommand} object. + * <!-- begin-user-doc --> * <!-- end-user-doc --> - * * @generated */ public class PathCommandItemProvider extends ItemProviderAdapter implements @@ -81,37 +80,38 @@ public class PathCommandItemProvider extends ItemProviderAdapter implements * @generated */ protected void addIsRelativePropertyDescriptor(Object object) { - itemPropertyDescriptors.add(createItemPropertyDescriptor( - ((ComposeableAdapterFactory) adapterFactory) - .getRootAdapterFactory(), - getResourceLocator(), - getString("_UI_PathCommand_isRelative_feature"), - getString("_UI_PropertyDescriptor_description", - "_UI_PathCommand_isRelative_feature", - "_UI_PathCommand_type"), - DGPackage.Literals.PATH_COMMAND__IS_RELATIVE, true, false, - false, ItemPropertyDescriptor.BOOLEAN_VALUE_IMAGE, null, null)); + itemPropertyDescriptors.add + (createItemPropertyDescriptor + (((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(), + getResourceLocator(), + getString("_UI_PathCommand_isRelative_feature"), + getString("_UI_PropertyDescriptor_description", "_UI_PathCommand_isRelative_feature", "_UI_PathCommand_type"), + DGPackage.Literals.PATH_COMMAND__IS_RELATIVE, + true, + false, + false, + ItemPropertyDescriptor.BOOLEAN_VALUE_IMAGE, + null, + null)); } /** - * This returns the label text for the adapted class. <!-- begin-user-doc + * This returns the label text for the adapted class. + * <!-- begin-user-doc * --> <!-- end-user-doc --> - * * @generated */ @Override public String getText(Object object) { - PathCommand pathCommand = (PathCommand) object; - return getString("_UI_PathCommand_type") + " " - + pathCommand.isRelative(); + PathCommand pathCommand = (PathCommand)object; + return getString("_UI_PathCommand_type") + " " + pathCommand.isRelative(); } /** - * 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 --> <!-- + * 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 @@ -119,10 +119,9 @@ public class PathCommandItemProvider extends ItemProviderAdapter implements updateChildren(notification); switch (notification.getFeatureID(PathCommand.class)) { - case DGPackage.PATH_COMMAND__IS_RELATIVE: - fireNotifyChanged(new ViewerNotification(notification, - notification.getNotifier(), false, true)); - return; + case DGPackage.PATH_COMMAND__IS_RELATIVE: + fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), false, true)); + return; } super.notifyChanged(notification); } diff --git a/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/src/org/eclipse/papyrus/dd/dg/provider/PathItemProvider.java b/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/src/org/eclipse/papyrus/dd/dg/provider/PathItemProvider.java index 1964dc9ec8e..01d4e890a3b 100644 --- a/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/src/org/eclipse/papyrus/dd/dg/provider/PathItemProvider.java +++ b/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/src/org/eclipse/papyrus/dd/dg/provider/PathItemProvider.java @@ -34,10 +34,9 @@ import org.eclipse.papyrus.dd.dg.DGPackage; import org.eclipse.papyrus.dd.dg.Path; /** - * This is the item provider adapter for a - * {@link org.eclipse.papyrus.dd.dg.Path} object. <!-- begin-user-doc --> <!-- + * This is the item provider adapter for a {@link org.eclipse.papyrus.dd.dg.Path} object. + * <!-- begin-user-doc --> <!-- * end-user-doc --> - * * @generated */ public class PathItemProvider extends MarkedElementItemProvider implements @@ -70,13 +69,10 @@ public class PathItemProvider extends MarkedElementItemProvider implements } /** - * This specifies how to implement {@link #getChildren} and is used to - * deduce an appropriate feature for an - * {@link org.eclipse.emf.edit.command.AddCommand}, - * {@link org.eclipse.emf.edit.command.RemoveCommand} or - * {@link org.eclipse.emf.edit.command.MoveCommand} in - * {@link #createCommand}. <!-- begin-user-doc --> <!-- end-user-doc --> - * + * This specifies how to implement {@link #getChildren} and is used to deduce an appropriate feature for an + * {@link org.eclipse.emf.edit.command.AddCommand}, {@link org.eclipse.emf.edit.command.RemoveCommand} or + * {@link org.eclipse.emf.edit.command.MoveCommand} in {@link #createCommand}. + * <!-- begin-user-doc --> <!-- end-user-doc --> * @generated */ @Override @@ -91,48 +87,45 @@ public class PathItemProvider extends MarkedElementItemProvider implements /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ @Override protected EStructuralFeature getChildFeature(Object object, Object child) { - // Check the type of the specified child object and return the proper - // feature to use for + // Check the type of the specified child object and return the proper feature to use for // adding (see {@link AddCommand}) it as a child. return super.getChildFeature(object, child); } /** - * This returns Path.gif. <!-- begin-user-doc --> <!-- end-user-doc --> - * + * This returns Path.gif. + * <!-- begin-user-doc --> <!-- end-user-doc --> * @generated */ @Override public Object getImage(Object object) { - return overlayImage(object, - getResourceLocator().getImage("full/obj16/Path")); + return overlayImage(object, getResourceLocator().getImage("full/obj16/Path")); } /** - * This returns the label text for the adapted class. <!-- begin-user-doc + * This returns the label text for the adapted class. + * <!-- begin-user-doc * --> <!-- end-user-doc --> - * * @generated */ @Override public String getText(Object object) { - String label = ((Path) object).getId(); - return label == null || label.length() == 0 ? getString("_UI_Path_type") - : getString("_UI_Path_type") + " " + label; + String label = ((Path)object).getId(); + return label == null || label.length() == 0 ? + getString("_UI_Path_type") : + getString("_UI_Path_type") + " " + label; } /** - * 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 --> <!-- + * 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 @@ -140,10 +133,9 @@ public class PathItemProvider extends MarkedElementItemProvider implements updateChildren(notification); switch (notification.getFeatureID(Path.class)) { - case DGPackage.PATH__COMMAND: - fireNotifyChanged(new ViewerNotification(notification, - notification.getNotifier(), true, false)); - return; + case DGPackage.PATH__COMMAND: + fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), true, false)); + return; } super.notifyChanged(notification); } @@ -160,29 +152,35 @@ public class PathItemProvider extends MarkedElementItemProvider implements Collection<Object> newChildDescriptors, Object object) { super.collectNewChildDescriptors(newChildDescriptors, object); - newChildDescriptors.add(createChildParameter( - DGPackage.Literals.PATH__COMMAND, - DGFactory.eINSTANCE.createMoveTo())); - - newChildDescriptors.add(createChildParameter( - DGPackage.Literals.PATH__COMMAND, - DGFactory.eINSTANCE.createClosePath())); - - newChildDescriptors.add(createChildParameter( - DGPackage.Literals.PATH__COMMAND, - DGFactory.eINSTANCE.createCubicCurveTo())); - - newChildDescriptors.add(createChildParameter( - DGPackage.Literals.PATH__COMMAND, - DGFactory.eINSTANCE.createEllipticalCurveTo())); - - newChildDescriptors.add(createChildParameter( - DGPackage.Literals.PATH__COMMAND, - DGFactory.eINSTANCE.createQuadraticCurveTo())); - - newChildDescriptors.add(createChildParameter( - DGPackage.Literals.PATH__COMMAND, - DGFactory.eINSTANCE.createLineTo())); + newChildDescriptors.add + (createChildParameter + (DGPackage.Literals.PATH__COMMAND, + DGFactory.eINSTANCE.createMoveTo())); + + newChildDescriptors.add + (createChildParameter + (DGPackage.Literals.PATH__COMMAND, + DGFactory.eINSTANCE.createClosePath())); + + newChildDescriptors.add + (createChildParameter + (DGPackage.Literals.PATH__COMMAND, + DGFactory.eINSTANCE.createCubicCurveTo())); + + newChildDescriptors.add + (createChildParameter + (DGPackage.Literals.PATH__COMMAND, + DGFactory.eINSTANCE.createEllipticalArcTo())); + + newChildDescriptors.add + (createChildParameter + (DGPackage.Literals.PATH__COMMAND, + DGFactory.eINSTANCE.createQuadraticCurveTo())); + + newChildDescriptors.add + (createChildParameter + (DGPackage.Literals.PATH__COMMAND, + DGFactory.eINSTANCE.createLineTo())); } } diff --git a/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/src/org/eclipse/papyrus/dd/dg/provider/PatternItemProvider.java b/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/src/org/eclipse/papyrus/dd/dg/provider/PatternItemProvider.java index e4aec7be8b7..0aa9e094c13 100644 --- a/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/src/org/eclipse/papyrus/dd/dg/provider/PatternItemProvider.java +++ b/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/src/org/eclipse/papyrus/dd/dg/provider/PatternItemProvider.java @@ -36,10 +36,9 @@ import org.eclipse.papyrus.dd.dg.DGPackage; import org.eclipse.papyrus.dd.dg.Pattern; /** - * This is the item provider adapter for a - * {@link org.eclipse.papyrus.dd.dg.Pattern} object. <!-- begin-user-doc --> + * This is the item provider adapter for a {@link org.eclipse.papyrus.dd.dg.Pattern} object. + * <!-- begin-user-doc --> * <!-- end-user-doc --> - * * @generated */ public class PatternItemProvider extends PaintServerItemProvider implements @@ -72,13 +71,10 @@ public class PatternItemProvider extends PaintServerItemProvider implements } /** - * This specifies how to implement {@link #getChildren} and is used to - * deduce an appropriate feature for an - * {@link org.eclipse.emf.edit.command.AddCommand}, - * {@link org.eclipse.emf.edit.command.RemoveCommand} or - * {@link org.eclipse.emf.edit.command.MoveCommand} in - * {@link #createCommand}. <!-- begin-user-doc --> <!-- end-user-doc --> - * + * This specifies how to implement {@link #getChildren} and is used to deduce an appropriate feature for an + * {@link org.eclipse.emf.edit.command.AddCommand}, {@link org.eclipse.emf.edit.command.RemoveCommand} or + * {@link org.eclipse.emf.edit.command.MoveCommand} in {@link #createCommand}. + * <!-- begin-user-doc --> <!-- end-user-doc --> * @generated */ @Override @@ -94,48 +90,45 @@ public class PatternItemProvider extends PaintServerItemProvider implements /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ @Override protected EStructuralFeature getChildFeature(Object object, Object child) { - // Check the type of the specified child object and return the proper - // feature to use for + // Check the type of the specified child object and return the proper feature to use for // adding (see {@link AddCommand}) it as a child. return super.getChildFeature(object, child); } /** - * This returns Pattern.gif. <!-- begin-user-doc --> <!-- end-user-doc --> - * + * This returns Pattern.gif. + * <!-- begin-user-doc --> <!-- end-user-doc --> * @generated */ @Override public Object getImage(Object object) { - return overlayImage(object, - getResourceLocator().getImage("full/obj16/Pattern")); + return overlayImage(object, getResourceLocator().getImage("full/obj16/Pattern")); } /** - * This returns the label text for the adapted class. <!-- begin-user-doc + * This returns the label text for the adapted class. + * <!-- begin-user-doc * --> <!-- end-user-doc --> - * * @generated */ @Override public String getText(Object object) { - String label = ((Pattern) object).getId(); - return label == null || label.length() == 0 ? getString("_UI_Pattern_type") - : getString("_UI_Pattern_type") + " " + label; + String label = ((Pattern)object).getId(); + return label == null || label.length() == 0 ? + getString("_UI_Pattern_type") : + getString("_UI_Pattern_type") + " " + label; } /** - * 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 --> <!-- + * 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 @@ -143,11 +136,10 @@ public class PatternItemProvider extends PaintServerItemProvider implements updateChildren(notification); switch (notification.getFeatureID(Pattern.class)) { - case DGPackage.PATTERN__BOUNDS: - case DGPackage.PATTERN__TILE: - fireNotifyChanged(new ViewerNotification(notification, - notification.getNotifier(), true, false)); - return; + case DGPackage.PATTERN__BOUNDS: + case DGPackage.PATTERN__TILE: + fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), true, false)); + return; } super.notifyChanged(notification); } @@ -164,69 +156,85 @@ public class PatternItemProvider extends PaintServerItemProvider implements Collection<Object> newChildDescriptors, Object object) { super.collectNewChildDescriptors(newChildDescriptors, object); - newChildDescriptors.add(createChildParameter( - DGPackage.Literals.PATTERN__BOUNDS, - DCFactory.eINSTANCE.createBounds())); - - newChildDescriptors.add(createChildParameter( - DGPackage.Literals.PATTERN__TILE, - DGFactory.eINSTANCE.createGroup())); - - newChildDescriptors.add(createChildParameter( - DGPackage.Literals.PATTERN__TILE, - DGFactory.eINSTANCE.createCanvas())); - - newChildDescriptors.add(createChildParameter( - DGPackage.Literals.PATTERN__TILE, - DGFactory.eINSTANCE.createClipPath())); - - newChildDescriptors.add(createChildParameter( - DGPackage.Literals.PATTERN__TILE, - DGFactory.eINSTANCE.createCircle())); - - newChildDescriptors.add(createChildParameter( - DGPackage.Literals.PATTERN__TILE, - DGFactory.eINSTANCE.createEllipse())); - - newChildDescriptors.add(createChildParameter( - DGPackage.Literals.PATTERN__TILE, - DGFactory.eINSTANCE.createImage())); - - newChildDescriptors.add(createChildParameter( - DGPackage.Literals.PATTERN__TILE, - DGFactory.eINSTANCE.createLine())); - - newChildDescriptors.add(createChildParameter( - DGPackage.Literals.PATTERN__TILE, - DGFactory.eINSTANCE.createMarker())); - - newChildDescriptors.add(createChildParameter( - DGPackage.Literals.PATTERN__TILE, - DGFactory.eINSTANCE.createPath())); - - newChildDescriptors.add(createChildParameter( - DGPackage.Literals.PATTERN__TILE, - DGFactory.eINSTANCE.createPolygon())); - - newChildDescriptors.add(createChildParameter( - DGPackage.Literals.PATTERN__TILE, - DGFactory.eINSTANCE.createPolyline())); - - newChildDescriptors.add(createChildParameter( - DGPackage.Literals.PATTERN__TILE, - DGFactory.eINSTANCE.createRectangle())); - - newChildDescriptors.add(createChildParameter( - DGPackage.Literals.PATTERN__TILE, - DGFactory.eINSTANCE.createRootCanvas())); - - newChildDescriptors.add(createChildParameter( - DGPackage.Literals.PATTERN__TILE, - DGFactory.eINSTANCE.createText())); - - newChildDescriptors.add(createChildParameter( - DGPackage.Literals.PATTERN__TILE, - DGFactory.eINSTANCE.createUse())); + newChildDescriptors.add + (createChildParameter + (DGPackage.Literals.PATTERN__BOUNDS, + DCFactory.eINSTANCE.createBounds())); + + newChildDescriptors.add + (createChildParameter + (DGPackage.Literals.PATTERN__TILE, + DGFactory.eINSTANCE.createGroup())); + + newChildDescriptors.add + (createChildParameter + (DGPackage.Literals.PATTERN__TILE, + DGFactory.eINSTANCE.createCanvas())); + + newChildDescriptors.add + (createChildParameter + (DGPackage.Literals.PATTERN__TILE, + DGFactory.eINSTANCE.createClipPath())); + + newChildDescriptors.add + (createChildParameter + (DGPackage.Literals.PATTERN__TILE, + DGFactory.eINSTANCE.createCircle())); + + newChildDescriptors.add + (createChildParameter + (DGPackage.Literals.PATTERN__TILE, + DGFactory.eINSTANCE.createEllipse())); + + newChildDescriptors.add + (createChildParameter + (DGPackage.Literals.PATTERN__TILE, + DGFactory.eINSTANCE.createImage())); + + newChildDescriptors.add + (createChildParameter + (DGPackage.Literals.PATTERN__TILE, + DGFactory.eINSTANCE.createLine())); + + newChildDescriptors.add + (createChildParameter + (DGPackage.Literals.PATTERN__TILE, + DGFactory.eINSTANCE.createMarker())); + + newChildDescriptors.add + (createChildParameter + (DGPackage.Literals.PATTERN__TILE, + DGFactory.eINSTANCE.createPath())); + + newChildDescriptors.add + (createChildParameter + (DGPackage.Literals.PATTERN__TILE, + DGFactory.eINSTANCE.createPolygon())); + + newChildDescriptors.add + (createChildParameter + (DGPackage.Literals.PATTERN__TILE, + DGFactory.eINSTANCE.createPolyline())); + + newChildDescriptors.add + (createChildParameter + (DGPackage.Literals.PATTERN__TILE, + DGFactory.eINSTANCE.createRectangle())); + + newChildDescriptors.add + (createChildParameter + (DGPackage.Literals.PATTERN__TILE, + DGFactory.eINSTANCE.createRootCanvas())); + + newChildDescriptors.add + (createChildParameter + (DGPackage.Literals.PATTERN__TILE, + DGFactory.eINSTANCE.createText())); + + newChildDescriptors.add + (createChildParameter + (DGPackage.Literals.PATTERN__TILE, + DGFactory.eINSTANCE.createUse())); } } diff --git a/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/src/org/eclipse/papyrus/dd/dg/provider/PolygonItemProvider.java b/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/src/org/eclipse/papyrus/dd/dg/provider/PolygonItemProvider.java index 86fa760d947..1d9e77c4827 100644 --- a/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/src/org/eclipse/papyrus/dd/dg/provider/PolygonItemProvider.java +++ b/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/src/org/eclipse/papyrus/dd/dg/provider/PolygonItemProvider.java @@ -35,10 +35,9 @@ import org.eclipse.papyrus.dd.dg.DGPackage; import org.eclipse.papyrus.dd.dg.Polygon; /** - * This is the item provider adapter for a - * {@link org.eclipse.papyrus.dd.dg.Polygon} object. <!-- begin-user-doc --> + * This is the item provider adapter for a {@link org.eclipse.papyrus.dd.dg.Polygon} object. + * <!-- begin-user-doc --> * <!-- end-user-doc --> - * * @generated */ public class PolygonItemProvider extends MarkedElementItemProvider implements @@ -71,13 +70,10 @@ public class PolygonItemProvider extends MarkedElementItemProvider implements } /** - * This specifies how to implement {@link #getChildren} and is used to - * deduce an appropriate feature for an - * {@link org.eclipse.emf.edit.command.AddCommand}, - * {@link org.eclipse.emf.edit.command.RemoveCommand} or - * {@link org.eclipse.emf.edit.command.MoveCommand} in - * {@link #createCommand}. <!-- begin-user-doc --> <!-- end-user-doc --> - * + * This specifies how to implement {@link #getChildren} and is used to deduce an appropriate feature for an + * {@link org.eclipse.emf.edit.command.AddCommand}, {@link org.eclipse.emf.edit.command.RemoveCommand} or + * {@link org.eclipse.emf.edit.command.MoveCommand} in {@link #createCommand}. + * <!-- begin-user-doc --> <!-- end-user-doc --> * @generated */ @Override @@ -92,48 +88,45 @@ public class PolygonItemProvider extends MarkedElementItemProvider implements /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ @Override protected EStructuralFeature getChildFeature(Object object, Object child) { - // Check the type of the specified child object and return the proper - // feature to use for + // Check the type of the specified child object and return the proper feature to use for // adding (see {@link AddCommand}) it as a child. return super.getChildFeature(object, child); } /** - * This returns Polygon.gif. <!-- begin-user-doc --> <!-- end-user-doc --> - * + * This returns Polygon.gif. + * <!-- begin-user-doc --> <!-- end-user-doc --> * @generated */ @Override public Object getImage(Object object) { - return overlayImage(object, - getResourceLocator().getImage("full/obj16/Polygon")); + return overlayImage(object, getResourceLocator().getImage("full/obj16/Polygon")); } /** - * This returns the label text for the adapted class. <!-- begin-user-doc + * This returns the label text for the adapted class. + * <!-- begin-user-doc * --> <!-- end-user-doc --> - * * @generated */ @Override public String getText(Object object) { - String label = ((Polygon) object).getId(); - return label == null || label.length() == 0 ? getString("_UI_Polygon_type") - : getString("_UI_Polygon_type") + " " + label; + String label = ((Polygon)object).getId(); + return label == null || label.length() == 0 ? + getString("_UI_Polygon_type") : + getString("_UI_Polygon_type") + " " + label; } /** - * 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 --> <!-- + * 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 @@ -141,10 +134,9 @@ public class PolygonItemProvider extends MarkedElementItemProvider implements updateChildren(notification); switch (notification.getFeatureID(Polygon.class)) { - case DGPackage.POLYGON__POINT: - fireNotifyChanged(new ViewerNotification(notification, - notification.getNotifier(), true, false)); - return; + case DGPackage.POLYGON__POINT: + fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), true, false)); + return; } super.notifyChanged(notification); } @@ -161,9 +153,10 @@ public class PolygonItemProvider extends MarkedElementItemProvider implements Collection<Object> newChildDescriptors, Object object) { super.collectNewChildDescriptors(newChildDescriptors, object); - newChildDescriptors.add(createChildParameter( - DGPackage.Literals.POLYGON__POINT, - DCFactory.eINSTANCE.createPoint())); + newChildDescriptors.add + (createChildParameter + (DGPackage.Literals.POLYGON__POINT, + DCFactory.eINSTANCE.createPoint())); } } diff --git a/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/src/org/eclipse/papyrus/dd/dg/provider/PolylineItemProvider.java b/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/src/org/eclipse/papyrus/dd/dg/provider/PolylineItemProvider.java index 25c6b572071..f15043ab333 100644 --- a/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/src/org/eclipse/papyrus/dd/dg/provider/PolylineItemProvider.java +++ b/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/src/org/eclipse/papyrus/dd/dg/provider/PolylineItemProvider.java @@ -35,10 +35,9 @@ import org.eclipse.papyrus.dd.dg.DGPackage; import org.eclipse.papyrus.dd.dg.Polyline; /** - * This is the item provider adapter for a - * {@link org.eclipse.papyrus.dd.dg.Polyline} object. <!-- begin-user-doc --> + * This is the item provider adapter for a {@link org.eclipse.papyrus.dd.dg.Polyline} object. + * <!-- begin-user-doc --> * <!-- end-user-doc --> - * * @generated */ public class PolylineItemProvider extends MarkedElementItemProvider implements @@ -71,13 +70,10 @@ public class PolylineItemProvider extends MarkedElementItemProvider implements } /** - * This specifies how to implement {@link #getChildren} and is used to - * deduce an appropriate feature for an - * {@link org.eclipse.emf.edit.command.AddCommand}, - * {@link org.eclipse.emf.edit.command.RemoveCommand} or - * {@link org.eclipse.emf.edit.command.MoveCommand} in - * {@link #createCommand}. <!-- begin-user-doc --> <!-- end-user-doc --> - * + * This specifies how to implement {@link #getChildren} and is used to deduce an appropriate feature for an + * {@link org.eclipse.emf.edit.command.AddCommand}, {@link org.eclipse.emf.edit.command.RemoveCommand} or + * {@link org.eclipse.emf.edit.command.MoveCommand} in {@link #createCommand}. + * <!-- begin-user-doc --> <!-- end-user-doc --> * @generated */ @Override @@ -92,48 +88,45 @@ public class PolylineItemProvider extends MarkedElementItemProvider implements /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ @Override protected EStructuralFeature getChildFeature(Object object, Object child) { - // Check the type of the specified child object and return the proper - // feature to use for + // Check the type of the specified child object and return the proper feature to use for // adding (see {@link AddCommand}) it as a child. return super.getChildFeature(object, child); } /** - * This returns Polyline.gif. <!-- begin-user-doc --> <!-- end-user-doc --> - * + * This returns Polyline.gif. + * <!-- begin-user-doc --> <!-- end-user-doc --> * @generated */ @Override public Object getImage(Object object) { - return overlayImage(object, - getResourceLocator().getImage("full/obj16/Polyline")); + return overlayImage(object, getResourceLocator().getImage("full/obj16/Polyline")); } /** - * This returns the label text for the adapted class. <!-- begin-user-doc + * This returns the label text for the adapted class. + * <!-- begin-user-doc * --> <!-- end-user-doc --> - * * @generated */ @Override public String getText(Object object) { - String label = ((Polyline) object).getId(); - return label == null || label.length() == 0 ? getString("_UI_Polyline_type") - : getString("_UI_Polyline_type") + " " + label; + String label = ((Polyline)object).getId(); + return label == null || label.length() == 0 ? + getString("_UI_Polyline_type") : + getString("_UI_Polyline_type") + " " + label; } /** - * 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 --> <!-- + * 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 @@ -141,10 +134,9 @@ public class PolylineItemProvider extends MarkedElementItemProvider implements updateChildren(notification); switch (notification.getFeatureID(Polyline.class)) { - case DGPackage.POLYLINE__POINT: - fireNotifyChanged(new ViewerNotification(notification, - notification.getNotifier(), true, false)); - return; + case DGPackage.POLYLINE__POINT: + fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), true, false)); + return; } super.notifyChanged(notification); } @@ -161,9 +153,10 @@ public class PolylineItemProvider extends MarkedElementItemProvider implements Collection<Object> newChildDescriptors, Object object) { super.collectNewChildDescriptors(newChildDescriptors, object); - newChildDescriptors.add(createChildParameter( - DGPackage.Literals.POLYLINE__POINT, - DCFactory.eINSTANCE.createPoint())); + newChildDescriptors.add + (createChildParameter + (DGPackage.Literals.POLYLINE__POINT, + DCFactory.eINSTANCE.createPoint())); } } diff --git a/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/src/org/eclipse/papyrus/dd/dg/provider/QuadraticCurveToItemProvider.java b/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/src/org/eclipse/papyrus/dd/dg/provider/QuadraticCurveToItemProvider.java index cccbbbe70c0..b53005cfcb6 100644 --- a/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/src/org/eclipse/papyrus/dd/dg/provider/QuadraticCurveToItemProvider.java +++ b/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/src/org/eclipse/papyrus/dd/dg/provider/QuadraticCurveToItemProvider.java @@ -71,13 +71,10 @@ public class QuadraticCurveToItemProvider extends PathCommandItemProvider } /** - * This specifies how to implement {@link #getChildren} and is used to - * deduce an appropriate feature for an - * {@link org.eclipse.emf.edit.command.AddCommand}, - * {@link org.eclipse.emf.edit.command.RemoveCommand} or - * {@link org.eclipse.emf.edit.command.MoveCommand} in - * {@link #createCommand}. <!-- begin-user-doc --> <!-- end-user-doc --> - * + * This specifies how to implement {@link #getChildren} and is used to deduce an appropriate feature for an + * {@link org.eclipse.emf.edit.command.AddCommand}, {@link org.eclipse.emf.edit.command.RemoveCommand} or + * {@link org.eclipse.emf.edit.command.MoveCommand} in {@link #createCommand}. + * <!-- begin-user-doc --> <!-- end-user-doc --> * @generated */ @Override @@ -85,58 +82,52 @@ public class QuadraticCurveToItemProvider extends PathCommandItemProvider Object object) { if (childrenFeatures == null) { super.getChildrenFeatures(object); + childrenFeatures.add(DGPackage.Literals.QUADRATIC_CURVE_TO__CONTROL); childrenFeatures.add(DGPackage.Literals.QUADRATIC_CURVE_TO__POINT); - childrenFeatures - .add(DGPackage.Literals.QUADRATIC_CURVE_TO__CONTROL); } return childrenFeatures; } /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ @Override protected EStructuralFeature getChildFeature(Object object, Object child) { - // Check the type of the specified child object and return the proper - // feature to use for + // Check the type of the specified child object and return the proper feature to use for // adding (see {@link AddCommand}) it as a child. return super.getChildFeature(object, child); } /** - * This returns QuadraticCurveTo.gif. <!-- begin-user-doc --> <!-- + * This returns QuadraticCurveTo.gif. + * <!-- begin-user-doc --> <!-- * end-user-doc --> - * * @generated */ @Override public Object getImage(Object object) { - return overlayImage(object, - getResourceLocator().getImage("full/obj16/QuadraticCurveTo")); + return overlayImage(object, getResourceLocator().getImage("full/obj16/QuadraticCurveTo")); } /** - * This returns the label text for the adapted class. <!-- begin-user-doc + * This returns the label text for the adapted class. + * <!-- begin-user-doc * --> <!-- end-user-doc --> - * * @generated */ @Override public String getText(Object object) { - QuadraticCurveTo quadraticCurveTo = (QuadraticCurveTo) object; - return getString("_UI_QuadraticCurveTo_type") + " " - + quadraticCurveTo.isRelative(); + QuadraticCurveTo quadraticCurveTo = (QuadraticCurveTo)object; + return getString("_UI_QuadraticCurveTo_type") + " " + quadraticCurveTo.isRelative(); } /** - * 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 --> <!-- + * 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 @@ -144,11 +135,10 @@ public class QuadraticCurveToItemProvider extends PathCommandItemProvider updateChildren(notification); switch (notification.getFeatureID(QuadraticCurveTo.class)) { - case DGPackage.QUADRATIC_CURVE_TO__POINT: - case DGPackage.QUADRATIC_CURVE_TO__CONTROL: - fireNotifyChanged(new ViewerNotification(notification, - notification.getNotifier(), true, false)); - return; + case DGPackage.QUADRATIC_CURVE_TO__CONTROL: + case DGPackage.QUADRATIC_CURVE_TO__POINT: + fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), true, false)); + return; } super.notifyChanged(notification); } @@ -165,13 +155,15 @@ public class QuadraticCurveToItemProvider extends PathCommandItemProvider Collection<Object> newChildDescriptors, Object object) { super.collectNewChildDescriptors(newChildDescriptors, object); - newChildDescriptors.add(createChildParameter( - DGPackage.Literals.QUADRATIC_CURVE_TO__POINT, - DCFactory.eINSTANCE.createPoint())); + newChildDescriptors.add + (createChildParameter + (DGPackage.Literals.QUADRATIC_CURVE_TO__CONTROL, + DCFactory.eINSTANCE.createPoint())); - newChildDescriptors.add(createChildParameter( - DGPackage.Literals.QUADRATIC_CURVE_TO__CONTROL, - DCFactory.eINSTANCE.createPoint())); + newChildDescriptors.add + (createChildParameter + (DGPackage.Literals.QUADRATIC_CURVE_TO__POINT, + DCFactory.eINSTANCE.createPoint())); } /** @@ -187,13 +179,14 @@ public class QuadraticCurveToItemProvider extends PathCommandItemProvider Object childFeature = feature; Object childObject = child; - boolean qualify = childFeature == DGPackage.Literals.QUADRATIC_CURVE_TO__POINT - || childFeature == DGPackage.Literals.QUADRATIC_CURVE_TO__CONTROL; + boolean qualify = + childFeature == DGPackage.Literals.QUADRATIC_CURVE_TO__CONTROL || + childFeature == DGPackage.Literals.QUADRATIC_CURVE_TO__POINT; if (qualify) { - return getString("_UI_CreateChild_text2", new Object[] { - getTypeText(childObject), getFeatureText(childFeature), - getTypeText(owner) }); + return getString + ("_UI_CreateChild_text2", + new Object[] { getTypeText(childObject), getFeatureText(childFeature), getTypeText(owner) }); } return super.getCreateChildText(owner, feature, child, selection); } diff --git a/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/src/org/eclipse/papyrus/dd/dg/provider/RadialGradientItemProvider.java b/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/src/org/eclipse/papyrus/dd/dg/provider/RadialGradientItemProvider.java index 9079431f594..8eccf4cdd20 100644 --- a/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/src/org/eclipse/papyrus/dd/dg/provider/RadialGradientItemProvider.java +++ b/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/src/org/eclipse/papyrus/dd/dg/provider/RadialGradientItemProvider.java @@ -18,7 +18,6 @@ import org.eclipse.emf.common.notify.AdapterFactory; import org.eclipse.emf.common.notify.Notification; import org.eclipse.emf.ecore.EStructuralFeature; - import org.eclipse.emf.edit.provider.ComposeableAdapterFactory; import org.eclipse.emf.edit.provider.IEditingDomainItemProvider; import org.eclipse.emf.edit.provider.IItemColorProvider; @@ -32,15 +31,13 @@ import org.eclipse.emf.edit.provider.ItemPropertyDescriptor; import org.eclipse.emf.edit.provider.ViewerNotification; import org.eclipse.papyrus.dd.dc.DCFactory; - import org.eclipse.papyrus.dd.dg.DGPackage; import org.eclipse.papyrus.dd.dg.RadialGradient; /** - * This is the item provider adapter for a - * {@link org.eclipse.papyrus.dd.dg.RadialGradient} object. <!-- begin-user-doc + * This is the item provider adapter for a {@link org.eclipse.papyrus.dd.dg.RadialGradient} object. + * <!-- begin-user-doc * --> <!-- end-user-doc --> - * * @generated */ public class RadialGradientItemProvider extends GradientItemProvider implements @@ -80,26 +77,26 @@ public class RadialGradientItemProvider extends GradientItemProvider implements * @generated */ protected void addRadiusPropertyDescriptor(Object object) { - itemPropertyDescriptors.add(createItemPropertyDescriptor( - ((ComposeableAdapterFactory) adapterFactory) - .getRootAdapterFactory(), - getResourceLocator(), - getString("_UI_RadialGradient_radius_feature"), - getString("_UI_PropertyDescriptor_description", - "_UI_RadialGradient_radius_feature", - "_UI_RadialGradient_type"), - DGPackage.Literals.RADIAL_GRADIENT__RADIUS, true, false, false, - ItemPropertyDescriptor.REAL_VALUE_IMAGE, null, null)); + itemPropertyDescriptors.add + (createItemPropertyDescriptor + (((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(), + getResourceLocator(), + getString("_UI_RadialGradient_radius_feature"), + getString("_UI_PropertyDescriptor_description", "_UI_RadialGradient_radius_feature", "_UI_RadialGradient_type"), + DGPackage.Literals.RADIAL_GRADIENT__RADIUS, + true, + false, + false, + ItemPropertyDescriptor.REAL_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}, - * {@link org.eclipse.emf.edit.command.RemoveCommand} or - * {@link org.eclipse.emf.edit.command.MoveCommand} in - * {@link #createCommand}. <!-- begin-user-doc --> <!-- end-user-doc --> - * + * This specifies how to implement {@link #getChildren} and is used to deduce an appropriate feature for an + * {@link org.eclipse.emf.edit.command.AddCommand}, {@link org.eclipse.emf.edit.command.RemoveCommand} or + * {@link org.eclipse.emf.edit.command.MoveCommand} in {@link #createCommand}. + * <!-- begin-user-doc --> <!-- end-user-doc --> * @generated */ @Override @@ -115,49 +112,46 @@ public class RadialGradientItemProvider extends GradientItemProvider implements /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ @Override protected EStructuralFeature getChildFeature(Object object, Object child) { - // Check the type of the specified child object and return the proper - // feature to use for + // Check the type of the specified child object and return the proper feature to use for // adding (see {@link AddCommand}) it as a child. return super.getChildFeature(object, child); } /** - * This returns RadialGradient.gif. <!-- begin-user-doc --> <!-- + * This returns RadialGradient.gif. + * <!-- begin-user-doc --> <!-- * end-user-doc --> - * * @generated */ @Override public Object getImage(Object object) { - return overlayImage(object, - getResourceLocator().getImage("full/obj16/RadialGradient")); + return overlayImage(object, getResourceLocator().getImage("full/obj16/RadialGradient")); } /** - * This returns the label text for the adapted class. <!-- begin-user-doc + * This returns the label text for the adapted class. + * <!-- begin-user-doc * --> <!-- end-user-doc --> - * * @generated */ @Override public String getText(Object object) { - String label = ((RadialGradient) object).getId(); - return label == null || label.length() == 0 ? getString("_UI_RadialGradient_type") - : getString("_UI_RadialGradient_type") + " " + label; + String label = ((RadialGradient)object).getId(); + return label == null || label.length() == 0 ? + getString("_UI_RadialGradient_type") : + getString("_UI_RadialGradient_type") + " " + label; } /** - * 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 --> <!-- + * 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 @@ -165,15 +159,13 @@ public class RadialGradientItemProvider extends GradientItemProvider implements updateChildren(notification); switch (notification.getFeatureID(RadialGradient.class)) { - case DGPackage.RADIAL_GRADIENT__RADIUS: - fireNotifyChanged(new ViewerNotification(notification, - notification.getNotifier(), false, true)); - return; - case DGPackage.RADIAL_GRADIENT__CENTER: - case DGPackage.RADIAL_GRADIENT__FOCUS: - fireNotifyChanged(new ViewerNotification(notification, - notification.getNotifier(), true, false)); - return; + case DGPackage.RADIAL_GRADIENT__RADIUS: + fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), false, true)); + return; + case DGPackage.RADIAL_GRADIENT__CENTER: + case DGPackage.RADIAL_GRADIENT__FOCUS: + fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), true, false)); + return; } super.notifyChanged(notification); } @@ -190,13 +182,15 @@ public class RadialGradientItemProvider extends GradientItemProvider implements Collection<Object> newChildDescriptors, Object object) { super.collectNewChildDescriptors(newChildDescriptors, object); - newChildDescriptors.add(createChildParameter( - DGPackage.Literals.RADIAL_GRADIENT__CENTER, - DCFactory.eINSTANCE.createPoint())); + newChildDescriptors.add + (createChildParameter + (DGPackage.Literals.RADIAL_GRADIENT__CENTER, + DCFactory.eINSTANCE.createPoint())); - newChildDescriptors.add(createChildParameter( - DGPackage.Literals.RADIAL_GRADIENT__FOCUS, - DCFactory.eINSTANCE.createPoint())); + newChildDescriptors.add + (createChildParameter + (DGPackage.Literals.RADIAL_GRADIENT__FOCUS, + DCFactory.eINSTANCE.createPoint())); } /** @@ -212,13 +206,14 @@ public class RadialGradientItemProvider extends GradientItemProvider implements Object childFeature = feature; Object childObject = child; - boolean qualify = childFeature == DGPackage.Literals.RADIAL_GRADIENT__CENTER - || childFeature == DGPackage.Literals.RADIAL_GRADIENT__FOCUS; + boolean qualify = + childFeature == DGPackage.Literals.RADIAL_GRADIENT__CENTER || + childFeature == DGPackage.Literals.RADIAL_GRADIENT__FOCUS; if (qualify) { - return getString("_UI_CreateChild_text2", new Object[] { - getTypeText(childObject), getFeatureText(childFeature), - getTypeText(owner) }); + return getString + ("_UI_CreateChild_text2", + new Object[] { getTypeText(childObject), getFeatureText(childFeature), getTypeText(owner) }); } return super.getCreateChildText(owner, feature, child, selection); } diff --git a/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/src/org/eclipse/papyrus/dd/dg/provider/RectangleItemProvider.java b/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/src/org/eclipse/papyrus/dd/dg/provider/RectangleItemProvider.java index 188335d54fc..7cd140a0565 100644 --- a/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/src/org/eclipse/papyrus/dd/dg/provider/RectangleItemProvider.java +++ b/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/src/org/eclipse/papyrus/dd/dg/provider/RectangleItemProvider.java @@ -37,10 +37,9 @@ import org.eclipse.papyrus.dd.dg.DGPackage; import org.eclipse.papyrus.dd.dg.Rectangle; /** - * This is the item provider adapter for a - * {@link org.eclipse.papyrus.dd.dg.Rectangle} object. <!-- begin-user-doc --> + * This is the item provider adapter for a {@link org.eclipse.papyrus.dd.dg.Rectangle} object. + * <!-- begin-user-doc --> * <!-- end-user-doc --> - * * @generated */ public class RectangleItemProvider extends GraphicalElementItemProvider @@ -80,26 +79,26 @@ public class RectangleItemProvider extends GraphicalElementItemProvider * @generated */ protected void addCornerRadiusPropertyDescriptor(Object object) { - itemPropertyDescriptors.add(createItemPropertyDescriptor( - ((ComposeableAdapterFactory) adapterFactory) - .getRootAdapterFactory(), - getResourceLocator(), - getString("_UI_Rectangle_cornerRadius_feature"), - getString("_UI_PropertyDescriptor_description", - "_UI_Rectangle_cornerRadius_feature", - "_UI_Rectangle_type"), - DGPackage.Literals.RECTANGLE__CORNER_RADIUS, true, false, - false, ItemPropertyDescriptor.REAL_VALUE_IMAGE, null, null)); + itemPropertyDescriptors.add + (createItemPropertyDescriptor + (((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(), + getResourceLocator(), + getString("_UI_Rectangle_cornerRadius_feature"), + getString("_UI_PropertyDescriptor_description", "_UI_Rectangle_cornerRadius_feature", "_UI_Rectangle_type"), + DGPackage.Literals.RECTANGLE__CORNER_RADIUS, + true, + false, + false, + ItemPropertyDescriptor.REAL_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}, - * {@link org.eclipse.emf.edit.command.RemoveCommand} or - * {@link org.eclipse.emf.edit.command.MoveCommand} in - * {@link #createCommand}. <!-- begin-user-doc --> <!-- end-user-doc --> - * + * This specifies how to implement {@link #getChildren} and is used to deduce an appropriate feature for an + * {@link org.eclipse.emf.edit.command.AddCommand}, {@link org.eclipse.emf.edit.command.RemoveCommand} or + * {@link org.eclipse.emf.edit.command.MoveCommand} in {@link #createCommand}. + * <!-- begin-user-doc --> <!-- end-user-doc --> * @generated */ @Override @@ -114,48 +113,45 @@ public class RectangleItemProvider extends GraphicalElementItemProvider /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ @Override protected EStructuralFeature getChildFeature(Object object, Object child) { - // Check the type of the specified child object and return the proper - // feature to use for + // Check the type of the specified child object and return the proper feature to use for // adding (see {@link AddCommand}) it as a child. return super.getChildFeature(object, child); } /** - * This returns Rectangle.gif. <!-- begin-user-doc --> <!-- end-user-doc --> - * + * This returns Rectangle.gif. + * <!-- begin-user-doc --> <!-- end-user-doc --> * @generated */ @Override public Object getImage(Object object) { - return overlayImage(object, - getResourceLocator().getImage("full/obj16/Rectangle")); + return overlayImage(object, getResourceLocator().getImage("full/obj16/Rectangle")); } /** - * This returns the label text for the adapted class. <!-- begin-user-doc + * This returns the label text for the adapted class. + * <!-- begin-user-doc * --> <!-- end-user-doc --> - * * @generated */ @Override public String getText(Object object) { - String label = ((Rectangle) object).getId(); - return label == null || label.length() == 0 ? getString("_UI_Rectangle_type") - : getString("_UI_Rectangle_type") + " " + label; + String label = ((Rectangle)object).getId(); + return label == null || label.length() == 0 ? + getString("_UI_Rectangle_type") : + getString("_UI_Rectangle_type") + " " + label; } /** - * 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 --> <!-- + * 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 @@ -163,14 +159,12 @@ public class RectangleItemProvider extends GraphicalElementItemProvider updateChildren(notification); switch (notification.getFeatureID(Rectangle.class)) { - case DGPackage.RECTANGLE__CORNER_RADIUS: - fireNotifyChanged(new ViewerNotification(notification, - notification.getNotifier(), false, true)); - return; - case DGPackage.RECTANGLE__BOUNDS: - fireNotifyChanged(new ViewerNotification(notification, - notification.getNotifier(), true, false)); - return; + case DGPackage.RECTANGLE__CORNER_RADIUS: + fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), false, true)); + return; + case DGPackage.RECTANGLE__BOUNDS: + fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), true, false)); + return; } super.notifyChanged(notification); } @@ -187,9 +181,10 @@ public class RectangleItemProvider extends GraphicalElementItemProvider Collection<Object> newChildDescriptors, Object object) { super.collectNewChildDescriptors(newChildDescriptors, object); - newChildDescriptors.add(createChildParameter( - DGPackage.Literals.RECTANGLE__BOUNDS, - DCFactory.eINSTANCE.createBounds())); + newChildDescriptors.add + (createChildParameter + (DGPackage.Literals.RECTANGLE__BOUNDS, + DCFactory.eINSTANCE.createBounds())); } } diff --git a/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/src/org/eclipse/papyrus/dd/dg/provider/RootCanvasItemProvider.java b/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/src/org/eclipse/papyrus/dd/dg/provider/RootCanvasItemProvider.java index df83bb6af92..08588dd1354 100644 --- a/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/src/org/eclipse/papyrus/dd/dg/provider/RootCanvasItemProvider.java +++ b/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/src/org/eclipse/papyrus/dd/dg/provider/RootCanvasItemProvider.java @@ -36,10 +36,9 @@ import org.eclipse.papyrus.dd.dg.DGPackage; import org.eclipse.papyrus.dd.dg.RootCanvas; /** - * This is the item provider adapter for a - * {@link org.eclipse.papyrus.dd.dg.RootCanvas} object. <!-- begin-user-doc --> + * This is the item provider adapter for a {@link org.eclipse.papyrus.dd.dg.RootCanvas} object. + * <!-- begin-user-doc --> * <!-- end-user-doc --> - * * @generated */ public class RootCanvasItemProvider extends CanvasItemProvider implements @@ -68,7 +67,7 @@ public class RootCanvasItemProvider extends CanvasItemProvider implements super.getPropertyDescriptors(object); addBackgroundColorPropertyDescriptor(object); - addStyleSheetPropertyDescriptor(object); + addExternalStyleSheetPropertyDescriptor(object); } return itemPropertyDescriptors; } @@ -80,45 +79,47 @@ public class RootCanvasItemProvider extends CanvasItemProvider implements * @generated */ protected void addBackgroundColorPropertyDescriptor(Object object) { - itemPropertyDescriptors.add(createItemPropertyDescriptor( - ((ComposeableAdapterFactory) adapterFactory) - .getRootAdapterFactory(), - getResourceLocator(), - getString("_UI_RootCanvas_backgroundColor_feature"), - getString("_UI_PropertyDescriptor_description", - "_UI_RootCanvas_backgroundColor_feature", - "_UI_RootCanvas_type"), - DGPackage.Literals.ROOT_CANVAS__BACKGROUND_COLOR, true, false, - false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null)); + itemPropertyDescriptors.add + (createItemPropertyDescriptor + (((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(), + getResourceLocator(), + getString("_UI_RootCanvas_backgroundColor_feature"), + getString("_UI_PropertyDescriptor_description", "_UI_RootCanvas_backgroundColor_feature", "_UI_RootCanvas_type"), + DGPackage.Literals.ROOT_CANVAS__BACKGROUND_COLOR, + true, + false, + false, + ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, + null, + null)); } /** - * This adds a property descriptor for the Style Sheet feature. <!-- - * begin-user-doc --> <!-- end-user-doc --> - * + * This adds a property descriptor for the External Style Sheet feature. + * <!-- begin-user-doc --> <!-- end-user-doc --> * @generated */ - protected void addStyleSheetPropertyDescriptor(Object object) { - itemPropertyDescriptors.add(createItemPropertyDescriptor( - ((ComposeableAdapterFactory) adapterFactory) - .getRootAdapterFactory(), - getResourceLocator(), - getString("_UI_RootCanvas_styleSheet_feature"), - getString("_UI_PropertyDescriptor_description", - "_UI_RootCanvas_styleSheet_feature", - "_UI_RootCanvas_type"), - DGPackage.Literals.ROOT_CANVAS__STYLE_SHEET, true, false, true, - null, null, null)); + protected void addExternalStyleSheetPropertyDescriptor(Object object) { + itemPropertyDescriptors.add + (createItemPropertyDescriptor + (((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(), + getResourceLocator(), + getString("_UI_RootCanvas_externalStyleSheet_feature"), + getString("_UI_PropertyDescriptor_description", "_UI_RootCanvas_externalStyleSheet_feature", "_UI_RootCanvas_type"), + DGPackage.Literals.ROOT_CANVAS__EXTERNAL_STYLE_SHEET, + true, + false, + true, + null, + 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}, - * {@link org.eclipse.emf.edit.command.RemoveCommand} or - * {@link org.eclipse.emf.edit.command.MoveCommand} in - * {@link #createCommand}. <!-- begin-user-doc --> <!-- end-user-doc --> - * + * This specifies how to implement {@link #getChildren} and is used to deduce an appropriate feature for an + * {@link org.eclipse.emf.edit.command.AddCommand}, {@link org.eclipse.emf.edit.command.RemoveCommand} or + * {@link org.eclipse.emf.edit.command.MoveCommand} in {@link #createCommand}. + * <!-- begin-user-doc --> <!-- end-user-doc --> * @generated */ @Override @@ -133,13 +134,11 @@ public class RootCanvasItemProvider extends CanvasItemProvider implements /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ @Override protected EStructuralFeature getChildFeature(Object object, Object child) { - // Check the type of the specified child object and return the proper - // feature to use for + // Check the type of the specified child object and return the proper feature to use for // adding (see {@link AddCommand}) it as a child. return super.getChildFeature(object, child); @@ -153,29 +152,28 @@ public class RootCanvasItemProvider extends CanvasItemProvider implements */ @Override public Object getImage(Object object) { - return overlayImage(object, - getResourceLocator().getImage("full/obj16/RootCanvas")); + return overlayImage(object, getResourceLocator().getImage("full/obj16/RootCanvas")); } /** - * This returns the label text for the adapted class. <!-- begin-user-doc + * This returns the label text for the adapted class. + * <!-- begin-user-doc * --> <!-- end-user-doc --> - * * @generated */ @Override public String getText(Object object) { - String label = ((RootCanvas) object).getId(); - return label == null || label.length() == 0 ? getString("_UI_RootCanvas_type") - : getString("_UI_RootCanvas_type") + " " + label; + String label = ((RootCanvas)object).getId(); + return label == null || label.length() == 0 ? + getString("_UI_RootCanvas_type") : + getString("_UI_RootCanvas_type") + " " + label; } /** - * 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 --> <!-- + * 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 @@ -183,14 +181,12 @@ public class RootCanvasItemProvider extends CanvasItemProvider implements updateChildren(notification); switch (notification.getFeatureID(RootCanvas.class)) { - case DGPackage.ROOT_CANVAS__BACKGROUND_COLOR: - fireNotifyChanged(new ViewerNotification(notification, - notification.getNotifier(), false, true)); - return; - case DGPackage.ROOT_CANVAS__DEFINITIONS: - fireNotifyChanged(new ViewerNotification(notification, - notification.getNotifier(), true, false)); - return; + case DGPackage.ROOT_CANVAS__BACKGROUND_COLOR: + fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), false, true)); + return; + case DGPackage.ROOT_CANVAS__DEFINITIONS: + fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), true, false)); + return; } super.notifyChanged(notification); } @@ -207,9 +203,10 @@ public class RootCanvasItemProvider extends CanvasItemProvider implements Collection<Object> newChildDescriptors, Object object) { super.collectNewChildDescriptors(newChildDescriptors, object); - newChildDescriptors.add(createChildParameter( - DGPackage.Literals.ROOT_CANVAS__DEFINITIONS, - DGFactory.eINSTANCE.createDefinitions())); + newChildDescriptors.add + (createChildParameter + (DGPackage.Literals.ROOT_CANVAS__DEFINITIONS, + DGFactory.eINSTANCE.createDefinitions())); } } diff --git a/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/src/org/eclipse/papyrus/dd/dg/provider/RotateItemProvider.java b/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/src/org/eclipse/papyrus/dd/dg/provider/RotateItemProvider.java index afb79f4c770..db397dddaa4 100644 --- a/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/src/org/eclipse/papyrus/dd/dg/provider/RotateItemProvider.java +++ b/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/src/org/eclipse/papyrus/dd/dg/provider/RotateItemProvider.java @@ -37,10 +37,9 @@ import org.eclipse.papyrus.dd.dg.DGPackage; import org.eclipse.papyrus.dd.dg.Rotate; /** - * This is the item provider adapter for a - * {@link org.eclipse.papyrus.dd.dg.Rotate} object. <!-- begin-user-doc --> <!-- + * This is the item provider adapter for a {@link org.eclipse.papyrus.dd.dg.Rotate} object. + * <!-- begin-user-doc --> <!-- * end-user-doc --> - * * @generated */ public class RotateItemProvider extends TransformItemProvider implements @@ -80,25 +79,26 @@ public class RotateItemProvider extends TransformItemProvider implements * @generated */ protected void addAnglePropertyDescriptor(Object object) { - itemPropertyDescriptors.add(createItemPropertyDescriptor( - ((ComposeableAdapterFactory) adapterFactory) - .getRootAdapterFactory(), - getResourceLocator(), - getString("_UI_Rotate_angle_feature"), - getString("_UI_PropertyDescriptor_description", - "_UI_Rotate_angle_feature", "_UI_Rotate_type"), - DGPackage.Literals.ROTATE__ANGLE, true, false, false, - ItemPropertyDescriptor.REAL_VALUE_IMAGE, null, null)); + itemPropertyDescriptors.add + (createItemPropertyDescriptor + (((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(), + getResourceLocator(), + getString("_UI_Rotate_angle_feature"), + getString("_UI_PropertyDescriptor_description", "_UI_Rotate_angle_feature", "_UI_Rotate_type"), + DGPackage.Literals.ROTATE__ANGLE, + true, + false, + false, + ItemPropertyDescriptor.REAL_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}, - * {@link org.eclipse.emf.edit.command.RemoveCommand} or - * {@link org.eclipse.emf.edit.command.MoveCommand} in - * {@link #createCommand}. <!-- begin-user-doc --> <!-- end-user-doc --> - * + * This specifies how to implement {@link #getChildren} and is used to deduce an appropriate feature for an + * {@link org.eclipse.emf.edit.command.AddCommand}, {@link org.eclipse.emf.edit.command.RemoveCommand} or + * {@link org.eclipse.emf.edit.command.MoveCommand} in {@link #createCommand}. + * <!-- begin-user-doc --> <!-- end-user-doc --> * @generated */ @Override @@ -113,47 +113,43 @@ public class RotateItemProvider extends TransformItemProvider implements /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ @Override protected EStructuralFeature getChildFeature(Object object, Object child) { - // Check the type of the specified child object and return the proper - // feature to use for + // Check the type of the specified child object and return the proper feature to use for // adding (see {@link AddCommand}) it as a child. return super.getChildFeature(object, child); } /** - * This returns Rotate.gif. <!-- begin-user-doc --> <!-- end-user-doc --> - * + * This returns Rotate.gif. + * <!-- begin-user-doc --> <!-- end-user-doc --> * @generated */ @Override public Object getImage(Object object) { - return overlayImage(object, - getResourceLocator().getImage("full/obj16/Rotate")); + return overlayImage(object, getResourceLocator().getImage("full/obj16/Rotate")); } /** - * This returns the label text for the adapted class. <!-- begin-user-doc + * This returns the label text for the adapted class. + * <!-- begin-user-doc * --> <!-- end-user-doc --> - * * @generated */ @Override public String getText(Object object) { - Rotate rotate = (Rotate) object; + Rotate rotate = (Rotate)object; return getString("_UI_Rotate_type") + " " + rotate.getAngle(); } /** - * 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 --> <!-- + * 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 @@ -161,14 +157,12 @@ public class RotateItemProvider extends TransformItemProvider implements updateChildren(notification); switch (notification.getFeatureID(Rotate.class)) { - case DGPackage.ROTATE__ANGLE: - fireNotifyChanged(new ViewerNotification(notification, - notification.getNotifier(), false, true)); - return; - case DGPackage.ROTATE__CENTER: - fireNotifyChanged(new ViewerNotification(notification, - notification.getNotifier(), true, false)); - return; + case DGPackage.ROTATE__ANGLE: + fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), false, true)); + return; + case DGPackage.ROTATE__CENTER: + fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), true, false)); + return; } super.notifyChanged(notification); } @@ -185,9 +179,10 @@ public class RotateItemProvider extends TransformItemProvider implements Collection<Object> newChildDescriptors, Object object) { super.collectNewChildDescriptors(newChildDescriptors, object); - newChildDescriptors.add(createChildParameter( - DGPackage.Literals.ROTATE__CENTER, - DCFactory.eINSTANCE.createPoint())); + newChildDescriptors.add + (createChildParameter + (DGPackage.Literals.ROTATE__CENTER, + DCFactory.eINSTANCE.createPoint())); } } diff --git a/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/src/org/eclipse/papyrus/dd/dg/provider/ScaleItemProvider.java b/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/src/org/eclipse/papyrus/dd/dg/provider/ScaleItemProvider.java index 56096939bbe..1133c16998d 100644 --- a/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/src/org/eclipse/papyrus/dd/dg/provider/ScaleItemProvider.java +++ b/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/src/org/eclipse/papyrus/dd/dg/provider/ScaleItemProvider.java @@ -33,10 +33,9 @@ import org.eclipse.papyrus.dd.dg.DGPackage; import org.eclipse.papyrus.dd.dg.Scale; /** - * This is the item provider adapter for a - * {@link org.eclipse.papyrus.dd.dg.Scale} object. <!-- begin-user-doc --> <!-- + * This is the item provider adapter for a {@link org.eclipse.papyrus.dd.dg.Scale} object. + * <!-- begin-user-doc --> <!-- * end-user-doc --> - * * @generated */ public class ScaleItemProvider extends TransformItemProvider implements @@ -77,15 +76,19 @@ public class ScaleItemProvider extends TransformItemProvider implements * @generated */ protected void addFactorXPropertyDescriptor(Object object) { - itemPropertyDescriptors.add(createItemPropertyDescriptor( - ((ComposeableAdapterFactory) adapterFactory) - .getRootAdapterFactory(), - getResourceLocator(), - getString("_UI_Scale_factorX_feature"), - getString("_UI_PropertyDescriptor_description", - "_UI_Scale_factorX_feature", "_UI_Scale_type"), - DGPackage.Literals.SCALE__FACTOR_X, true, false, false, - ItemPropertyDescriptor.REAL_VALUE_IMAGE, null, null)); + itemPropertyDescriptors.add + (createItemPropertyDescriptor + (((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(), + getResourceLocator(), + getString("_UI_Scale_factorX_feature"), + getString("_UI_PropertyDescriptor_description", "_UI_Scale_factorX_feature", "_UI_Scale_type"), + DGPackage.Literals.SCALE__FACTOR_X, + true, + false, + false, + ItemPropertyDescriptor.REAL_VALUE_IMAGE, + null, + null)); } /** @@ -95,46 +98,48 @@ public class ScaleItemProvider extends TransformItemProvider implements * @generated */ protected void addFactorYPropertyDescriptor(Object object) { - itemPropertyDescriptors.add(createItemPropertyDescriptor( - ((ComposeableAdapterFactory) adapterFactory) - .getRootAdapterFactory(), - getResourceLocator(), - getString("_UI_Scale_factorY_feature"), - getString("_UI_PropertyDescriptor_description", - "_UI_Scale_factorY_feature", "_UI_Scale_type"), - DGPackage.Literals.SCALE__FACTOR_Y, true, false, false, - ItemPropertyDescriptor.REAL_VALUE_IMAGE, null, null)); + itemPropertyDescriptors.add + (createItemPropertyDescriptor + (((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(), + getResourceLocator(), + getString("_UI_Scale_factorY_feature"), + getString("_UI_PropertyDescriptor_description", "_UI_Scale_factorY_feature", "_UI_Scale_type"), + DGPackage.Literals.SCALE__FACTOR_Y, + true, + false, + false, + ItemPropertyDescriptor.REAL_VALUE_IMAGE, + null, + null)); } /** - * This returns Scale.gif. <!-- begin-user-doc --> <!-- end-user-doc --> - * + * This returns Scale.gif. + * <!-- begin-user-doc --> <!-- end-user-doc --> * @generated */ @Override public Object getImage(Object object) { - return overlayImage(object, - getResourceLocator().getImage("full/obj16/Scale")); + return overlayImage(object, getResourceLocator().getImage("full/obj16/Scale")); } /** - * This returns the label text for the adapted class. <!-- begin-user-doc + * This returns the label text for the adapted class. + * <!-- begin-user-doc * --> <!-- end-user-doc --> - * * @generated */ @Override public String getText(Object object) { - Scale scale = (Scale) object; + Scale scale = (Scale)object; return getString("_UI_Scale_type") + " " + scale.getFactorX(); } /** - * 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 --> <!-- + * 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 @@ -142,11 +147,10 @@ public class ScaleItemProvider extends TransformItemProvider implements updateChildren(notification); switch (notification.getFeatureID(Scale.class)) { - case DGPackage.SCALE__FACTOR_X: - case DGPackage.SCALE__FACTOR_Y: - fireNotifyChanged(new ViewerNotification(notification, - notification.getNotifier(), false, true)); - return; + case DGPackage.SCALE__FACTOR_X: + case DGPackage.SCALE__FACTOR_Y: + fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), false, true)); + return; } super.notifyChanged(notification); } diff --git a/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/src/org/eclipse/papyrus/dd/dg/provider/SkewItemProvider.java b/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/src/org/eclipse/papyrus/dd/dg/provider/SkewItemProvider.java index c1ca8260139..968c5e90c38 100644 --- a/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/src/org/eclipse/papyrus/dd/dg/provider/SkewItemProvider.java +++ b/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/src/org/eclipse/papyrus/dd/dg/provider/SkewItemProvider.java @@ -33,10 +33,9 @@ import org.eclipse.papyrus.dd.dg.DGPackage; import org.eclipse.papyrus.dd.dg.Skew; /** - * This is the item provider adapter for a - * {@link org.eclipse.papyrus.dd.dg.Skew} object. <!-- begin-user-doc --> <!-- + * This is the item provider adapter for a {@link org.eclipse.papyrus.dd.dg.Skew} object. + * <!-- begin-user-doc --> <!-- * end-user-doc --> - * * @generated */ public class SkewItemProvider extends TransformItemProvider implements @@ -77,15 +76,19 @@ public class SkewItemProvider extends TransformItemProvider implements * @generated */ protected void addAngleXPropertyDescriptor(Object object) { - itemPropertyDescriptors.add(createItemPropertyDescriptor( - ((ComposeableAdapterFactory) adapterFactory) - .getRootAdapterFactory(), - getResourceLocator(), - getString("_UI_Skew_angleX_feature"), - getString("_UI_PropertyDescriptor_description", - "_UI_Skew_angleX_feature", "_UI_Skew_type"), - DGPackage.Literals.SKEW__ANGLE_X, true, false, false, - ItemPropertyDescriptor.REAL_VALUE_IMAGE, null, null)); + itemPropertyDescriptors.add + (createItemPropertyDescriptor + (((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(), + getResourceLocator(), + getString("_UI_Skew_angleX_feature"), + getString("_UI_PropertyDescriptor_description", "_UI_Skew_angleX_feature", "_UI_Skew_type"), + DGPackage.Literals.SKEW__ANGLE_X, + true, + false, + false, + ItemPropertyDescriptor.REAL_VALUE_IMAGE, + null, + null)); } /** @@ -95,46 +98,48 @@ public class SkewItemProvider extends TransformItemProvider implements * @generated */ protected void addAngleYPropertyDescriptor(Object object) { - itemPropertyDescriptors.add(createItemPropertyDescriptor( - ((ComposeableAdapterFactory) adapterFactory) - .getRootAdapterFactory(), - getResourceLocator(), - getString("_UI_Skew_angleY_feature"), - getString("_UI_PropertyDescriptor_description", - "_UI_Skew_angleY_feature", "_UI_Skew_type"), - DGPackage.Literals.SKEW__ANGLE_Y, true, false, false, - ItemPropertyDescriptor.REAL_VALUE_IMAGE, null, null)); + itemPropertyDescriptors.add + (createItemPropertyDescriptor + (((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(), + getResourceLocator(), + getString("_UI_Skew_angleY_feature"), + getString("_UI_PropertyDescriptor_description", "_UI_Skew_angleY_feature", "_UI_Skew_type"), + DGPackage.Literals.SKEW__ANGLE_Y, + true, + false, + false, + ItemPropertyDescriptor.REAL_VALUE_IMAGE, + null, + null)); } /** - * This returns Skew.gif. <!-- begin-user-doc --> <!-- end-user-doc --> - * + * This returns Skew.gif. + * <!-- begin-user-doc --> <!-- end-user-doc --> * @generated */ @Override public Object getImage(Object object) { - return overlayImage(object, - getResourceLocator().getImage("full/obj16/Skew")); + return overlayImage(object, getResourceLocator().getImage("full/obj16/Skew")); } /** - * This returns the label text for the adapted class. <!-- begin-user-doc + * This returns the label text for the adapted class. + * <!-- begin-user-doc * --> <!-- end-user-doc --> - * * @generated */ @Override public String getText(Object object) { - Skew skew = (Skew) object; + Skew skew = (Skew)object; return getString("_UI_Skew_type") + " " + skew.getAngleX(); } /** - * 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 --> <!-- + * 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 @@ -142,11 +147,10 @@ public class SkewItemProvider extends TransformItemProvider implements updateChildren(notification); switch (notification.getFeatureID(Skew.class)) { - case DGPackage.SKEW__ANGLE_X: - case DGPackage.SKEW__ANGLE_Y: - fireNotifyChanged(new ViewerNotification(notification, - notification.getNotifier(), false, true)); - return; + case DGPackage.SKEW__ANGLE_X: + case DGPackage.SKEW__ANGLE_Y: + fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), false, true)); + return; } super.notifyChanged(notification); } diff --git a/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/src/org/eclipse/papyrus/dd/dg/provider/StyleItemProvider.java b/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/src/org/eclipse/papyrus/dd/dg/provider/StyleItemProvider.java index c63a376dadd..49212e8b3f6 100644 --- a/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/src/org/eclipse/papyrus/dd/dg/provider/StyleItemProvider.java +++ b/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/src/org/eclipse/papyrus/dd/dg/provider/StyleItemProvider.java @@ -41,10 +41,9 @@ import org.eclipse.papyrus.dd.dg.Style; import org.eclipse.papyrus.dd.edit.DDEditPlugin; /** - * This is the item provider adapter for a - * {@link org.eclipse.papyrus.dd.dg.Style} object. <!-- begin-user-doc --> <!-- + * This is the item provider adapter for a {@link org.eclipse.papyrus.dd.dg.Style} object. + * <!-- begin-user-doc --> <!-- * end-user-doc --> - * * @generated */ public class StyleItemProvider extends ItemProviderAdapter implements @@ -88,21 +87,25 @@ public class StyleItemProvider extends ItemProviderAdapter implements } /** - * This adds a property descriptor for the Fill feature. <!-- begin-user-doc + * This adds a property descriptor for the Fill feature. + * <!-- begin-user-doc * --> <!-- end-user-doc --> - * * @generated */ protected void addFillPropertyDescriptor(Object object) { - itemPropertyDescriptors.add(createItemPropertyDescriptor( - ((ComposeableAdapterFactory) adapterFactory) - .getRootAdapterFactory(), - getResourceLocator(), - getString("_UI_Style_fill_feature"), - getString("_UI_PropertyDescriptor_description", - "_UI_Style_fill_feature", "_UI_Style_type"), - DGPackage.Literals.STYLE__FILL, true, false, false, null, null, - null)); + itemPropertyDescriptors.add + (createItemPropertyDescriptor + (((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(), + getResourceLocator(), + getString("_UI_Style_fill_feature"), + getString("_UI_PropertyDescriptor_description", "_UI_Style_fill_feature", "_UI_Style_type"), + DGPackage.Literals.STYLE__FILL, + true, + false, + false, + null, + null, + null)); } /** @@ -112,15 +115,19 @@ public class StyleItemProvider extends ItemProviderAdapter implements * @generated */ protected void addFillOpacityPropertyDescriptor(Object object) { - itemPropertyDescriptors.add(createItemPropertyDescriptor( - ((ComposeableAdapterFactory) adapterFactory) - .getRootAdapterFactory(), - getResourceLocator(), - getString("_UI_Style_fillOpacity_feature"), - getString("_UI_PropertyDescriptor_description", - "_UI_Style_fillOpacity_feature", "_UI_Style_type"), - DGPackage.Literals.STYLE__FILL_OPACITY, true, false, false, - ItemPropertyDescriptor.REAL_VALUE_IMAGE, null, null)); + itemPropertyDescriptors.add + (createItemPropertyDescriptor + (((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(), + getResourceLocator(), + getString("_UI_Style_fillOpacity_feature"), + getString("_UI_PropertyDescriptor_description", "_UI_Style_fillOpacity_feature", "_UI_Style_type"), + DGPackage.Literals.STYLE__FILL_OPACITY, + true, + false, + false, + ItemPropertyDescriptor.REAL_VALUE_IMAGE, + null, + null)); } /** @@ -130,15 +137,19 @@ public class StyleItemProvider extends ItemProviderAdapter implements * @generated */ protected void addStrokePropertyDescriptor(Object object) { - itemPropertyDescriptors.add(createItemPropertyDescriptor( - ((ComposeableAdapterFactory) adapterFactory) - .getRootAdapterFactory(), - getResourceLocator(), - getString("_UI_Style_stroke_feature"), - getString("_UI_PropertyDescriptor_description", - "_UI_Style_stroke_feature", "_UI_Style_type"), - DGPackage.Literals.STYLE__STROKE, true, false, false, null, - null, null)); + itemPropertyDescriptors.add + (createItemPropertyDescriptor + (((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(), + getResourceLocator(), + getString("_UI_Style_stroke_feature"), + getString("_UI_PropertyDescriptor_description", "_UI_Style_stroke_feature", "_UI_Style_type"), + DGPackage.Literals.STYLE__STROKE, + true, + false, + false, + null, + null, + null)); } /** @@ -148,15 +159,19 @@ public class StyleItemProvider extends ItemProviderAdapter implements * @generated */ protected void addStrokeWidthPropertyDescriptor(Object object) { - itemPropertyDescriptors.add(createItemPropertyDescriptor( - ((ComposeableAdapterFactory) adapterFactory) - .getRootAdapterFactory(), - getResourceLocator(), - getString("_UI_Style_strokeWidth_feature"), - getString("_UI_PropertyDescriptor_description", - "_UI_Style_strokeWidth_feature", "_UI_Style_type"), - DGPackage.Literals.STYLE__STROKE_WIDTH, true, false, false, - ItemPropertyDescriptor.REAL_VALUE_IMAGE, null, null)); + itemPropertyDescriptors.add + (createItemPropertyDescriptor + (((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(), + getResourceLocator(), + getString("_UI_Style_strokeWidth_feature"), + getString("_UI_PropertyDescriptor_description", "_UI_Style_strokeWidth_feature", "_UI_Style_type"), + DGPackage.Literals.STYLE__STROKE_WIDTH, + true, + false, + false, + ItemPropertyDescriptor.REAL_VALUE_IMAGE, + null, + null)); } /** @@ -166,15 +181,19 @@ public class StyleItemProvider extends ItemProviderAdapter implements * @generated */ protected void addStrokeOpacityPropertyDescriptor(Object object) { - itemPropertyDescriptors.add(createItemPropertyDescriptor( - ((ComposeableAdapterFactory) adapterFactory) - .getRootAdapterFactory(), - getResourceLocator(), - getString("_UI_Style_strokeOpacity_feature"), - getString("_UI_PropertyDescriptor_description", - "_UI_Style_strokeOpacity_feature", "_UI_Style_type"), - DGPackage.Literals.STYLE__STROKE_OPACITY, true, false, false, - ItemPropertyDescriptor.REAL_VALUE_IMAGE, null, null)); + itemPropertyDescriptors.add + (createItemPropertyDescriptor + (((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(), + getResourceLocator(), + getString("_UI_Style_strokeOpacity_feature"), + getString("_UI_PropertyDescriptor_description", "_UI_Style_strokeOpacity_feature", "_UI_Style_type"), + DGPackage.Literals.STYLE__STROKE_OPACITY, + true, + false, + false, + ItemPropertyDescriptor.REAL_VALUE_IMAGE, + null, + null)); } /** @@ -184,18 +203,19 @@ public class StyleItemProvider extends ItemProviderAdapter implements * @generated */ protected void addStrokeDashLengthPropertyDescriptor(Object object) { - itemPropertyDescriptors - .add(createItemPropertyDescriptor( - ((ComposeableAdapterFactory) adapterFactory) - .getRootAdapterFactory(), - getResourceLocator(), - getString("_UI_Style_strokeDashLength_feature"), - getString("_UI_PropertyDescriptor_description", - "_UI_Style_strokeDashLength_feature", - "_UI_Style_type"), - DGPackage.Literals.STYLE__STROKE_DASH_LENGTH, true, - false, false, ItemPropertyDescriptor.REAL_VALUE_IMAGE, - null, null)); + itemPropertyDescriptors.add + (createItemPropertyDescriptor + (((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(), + getResourceLocator(), + getString("_UI_Style_strokeDashLength_feature"), + getString("_UI_PropertyDescriptor_description", "_UI_Style_strokeDashLength_feature", "_UI_Style_type"), + DGPackage.Literals.STYLE__STROKE_DASH_LENGTH, + true, + false, + false, + ItemPropertyDescriptor.REAL_VALUE_IMAGE, + null, + null)); } /** @@ -205,15 +225,19 @@ public class StyleItemProvider extends ItemProviderAdapter implements * @generated */ protected void addFontSizePropertyDescriptor(Object object) { - itemPropertyDescriptors.add(createItemPropertyDescriptor( - ((ComposeableAdapterFactory) adapterFactory) - .getRootAdapterFactory(), - getResourceLocator(), - getString("_UI_Style_fontSize_feature"), - getString("_UI_PropertyDescriptor_description", - "_UI_Style_fontSize_feature", "_UI_Style_type"), - DGPackage.Literals.STYLE__FONT_SIZE, true, false, false, - ItemPropertyDescriptor.REAL_VALUE_IMAGE, null, null)); + itemPropertyDescriptors.add + (createItemPropertyDescriptor + (((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(), + getResourceLocator(), + getString("_UI_Style_fontSize_feature"), + getString("_UI_PropertyDescriptor_description", "_UI_Style_fontSize_feature", "_UI_Style_type"), + DGPackage.Literals.STYLE__FONT_SIZE, + true, + false, + false, + ItemPropertyDescriptor.REAL_VALUE_IMAGE, + null, + null)); } /** @@ -223,15 +247,19 @@ public class StyleItemProvider extends ItemProviderAdapter implements * @generated */ protected void addFontNamePropertyDescriptor(Object object) { - itemPropertyDescriptors.add(createItemPropertyDescriptor( - ((ComposeableAdapterFactory) adapterFactory) - .getRootAdapterFactory(), - getResourceLocator(), - getString("_UI_Style_fontName_feature"), - getString("_UI_PropertyDescriptor_description", - "_UI_Style_fontName_feature", "_UI_Style_type"), - DGPackage.Literals.STYLE__FONT_NAME, true, false, false, - ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null)); + itemPropertyDescriptors.add + (createItemPropertyDescriptor + (((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(), + getResourceLocator(), + getString("_UI_Style_fontName_feature"), + getString("_UI_PropertyDescriptor_description", "_UI_Style_fontName_feature", "_UI_Style_type"), + DGPackage.Literals.STYLE__FONT_NAME, + true, + false, + false, + ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, + null, + null)); } /** @@ -241,15 +269,19 @@ public class StyleItemProvider extends ItemProviderAdapter implements * @generated */ protected void addFontItalicPropertyDescriptor(Object object) { - itemPropertyDescriptors.add(createItemPropertyDescriptor( - ((ComposeableAdapterFactory) adapterFactory) - .getRootAdapterFactory(), - getResourceLocator(), - getString("_UI_Style_fontItalic_feature"), - getString("_UI_PropertyDescriptor_description", - "_UI_Style_fontItalic_feature", "_UI_Style_type"), - DGPackage.Literals.STYLE__FONT_ITALIC, true, false, false, - ItemPropertyDescriptor.BOOLEAN_VALUE_IMAGE, null, null)); + itemPropertyDescriptors.add + (createItemPropertyDescriptor + (((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(), + getResourceLocator(), + getString("_UI_Style_fontItalic_feature"), + getString("_UI_PropertyDescriptor_description", "_UI_Style_fontItalic_feature", "_UI_Style_type"), + DGPackage.Literals.STYLE__FONT_ITALIC, + true, + false, + false, + ItemPropertyDescriptor.BOOLEAN_VALUE_IMAGE, + null, + null)); } /** @@ -259,15 +291,19 @@ public class StyleItemProvider extends ItemProviderAdapter implements * @generated */ protected void addFontBoldPropertyDescriptor(Object object) { - itemPropertyDescriptors.add(createItemPropertyDescriptor( - ((ComposeableAdapterFactory) adapterFactory) - .getRootAdapterFactory(), - getResourceLocator(), - getString("_UI_Style_fontBold_feature"), - getString("_UI_PropertyDescriptor_description", - "_UI_Style_fontBold_feature", "_UI_Style_type"), - DGPackage.Literals.STYLE__FONT_BOLD, true, false, false, - ItemPropertyDescriptor.BOOLEAN_VALUE_IMAGE, null, null)); + itemPropertyDescriptors.add + (createItemPropertyDescriptor + (((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(), + getResourceLocator(), + getString("_UI_Style_fontBold_feature"), + getString("_UI_PropertyDescriptor_description", "_UI_Style_fontBold_feature", "_UI_Style_type"), + DGPackage.Literals.STYLE__FONT_BOLD, + true, + false, + false, + ItemPropertyDescriptor.BOOLEAN_VALUE_IMAGE, + null, + null)); } /** @@ -277,25 +313,26 @@ public class StyleItemProvider extends ItemProviderAdapter implements * @generated */ protected void addFontDecorationPropertyDescriptor(Object object) { - itemPropertyDescriptors.add(createItemPropertyDescriptor( - ((ComposeableAdapterFactory) adapterFactory) - .getRootAdapterFactory(), - getResourceLocator(), - getString("_UI_Style_fontDecoration_feature"), - getString("_UI_PropertyDescriptor_description", - "_UI_Style_fontDecoration_feature", "_UI_Style_type"), - DGPackage.Literals.STYLE__FONT_DECORATION, true, false, false, - ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null)); + itemPropertyDescriptors.add + (createItemPropertyDescriptor + (((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(), + getResourceLocator(), + getString("_UI_Style_fontDecoration_feature"), + getString("_UI_PropertyDescriptor_description", "_UI_Style_fontDecoration_feature", "_UI_Style_type"), + DGPackage.Literals.STYLE__FONT_DECORATION, + true, + false, + false, + ItemPropertyDescriptor.GENERIC_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}, - * {@link org.eclipse.emf.edit.command.RemoveCommand} or - * {@link org.eclipse.emf.edit.command.MoveCommand} in - * {@link #createCommand}. <!-- begin-user-doc --> <!-- end-user-doc --> - * + * This specifies how to implement {@link #getChildren} and is used to deduce an appropriate feature for an + * {@link org.eclipse.emf.edit.command.AddCommand}, {@link org.eclipse.emf.edit.command.RemoveCommand} or + * {@link org.eclipse.emf.edit.command.MoveCommand} in {@link #createCommand}. + * <!-- begin-user-doc --> <!-- end-user-doc --> * @generated */ @Override @@ -311,48 +348,45 @@ public class StyleItemProvider extends ItemProviderAdapter implements /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ @Override protected EStructuralFeature getChildFeature(Object object, Object child) { - // Check the type of the specified child object and return the proper - // feature to use for + // Check the type of the specified child object and return the proper feature to use for // adding (see {@link AddCommand}) it as a child. return super.getChildFeature(object, child); } /** - * This returns Style.gif. <!-- begin-user-doc --> <!-- end-user-doc --> - * + * This returns Style.gif. + * <!-- begin-user-doc --> <!-- end-user-doc --> * @generated */ @Override public Object getImage(Object object) { - return overlayImage(object, - getResourceLocator().getImage("full/obj16/Style")); + return overlayImage(object, getResourceLocator().getImage("full/obj16/Style")); } /** - * This returns the label text for the adapted class. <!-- begin-user-doc + * This returns the label text for the adapted class. + * <!-- begin-user-doc * --> <!-- end-user-doc --> - * * @generated */ @Override public String getText(Object object) { - String label = ((Style) object).getFontName(); - return label == null || label.length() == 0 ? getString("_UI_Style_type") - : getString("_UI_Style_type") + " " + label; + String label = ((Style)object).getFontName(); + return label == null || label.length() == 0 ? + getString("_UI_Style_type") : + getString("_UI_Style_type") + " " + label; } /** - * 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 --> <!-- + * 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 @@ -360,23 +394,21 @@ public class StyleItemProvider extends ItemProviderAdapter implements updateChildren(notification); switch (notification.getFeatureID(Style.class)) { - case DGPackage.STYLE__FILL_OPACITY: - case DGPackage.STYLE__STROKE_WIDTH: - case DGPackage.STYLE__STROKE_OPACITY: - case DGPackage.STYLE__STROKE_DASH_LENGTH: - case DGPackage.STYLE__FONT_SIZE: - case DGPackage.STYLE__FONT_NAME: - case DGPackage.STYLE__FONT_ITALIC: - case DGPackage.STYLE__FONT_BOLD: - case DGPackage.STYLE__FONT_DECORATION: - fireNotifyChanged(new ViewerNotification(notification, - notification.getNotifier(), false, true)); - return; - case DGPackage.STYLE__FILL: - case DGPackage.STYLE__STROKE: - fireNotifyChanged(new ViewerNotification(notification, - notification.getNotifier(), true, false)); - return; + case DGPackage.STYLE__FILL_OPACITY: + case DGPackage.STYLE__STROKE_WIDTH: + case DGPackage.STYLE__STROKE_OPACITY: + case DGPackage.STYLE__STROKE_DASH_LENGTH: + case DGPackage.STYLE__FONT_SIZE: + case DGPackage.STYLE__FONT_NAME: + case DGPackage.STYLE__FONT_ITALIC: + case DGPackage.STYLE__FONT_BOLD: + case DGPackage.STYLE__FONT_DECORATION: + fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), false, true)); + return; + case DGPackage.STYLE__FILL: + case DGPackage.STYLE__STROKE: + fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), true, false)); + return; } super.notifyChanged(notification); } @@ -393,13 +425,15 @@ public class StyleItemProvider extends ItemProviderAdapter implements Collection<Object> newChildDescriptors, Object object) { super.collectNewChildDescriptors(newChildDescriptors, object); - newChildDescriptors.add(createChildParameter( - DGPackage.Literals.STYLE__FILL, - DGFactory.eINSTANCE.createPaint())); + newChildDescriptors.add + (createChildParameter + (DGPackage.Literals.STYLE__FILL, + DGFactory.eINSTANCE.createPaint())); - newChildDescriptors.add(createChildParameter( - DGPackage.Literals.STYLE__STROKE, - DGFactory.eINSTANCE.createPaint())); + newChildDescriptors.add + (createChildParameter + (DGPackage.Literals.STYLE__STROKE, + DGFactory.eINSTANCE.createPaint())); } /** @@ -415,13 +449,14 @@ public class StyleItemProvider extends ItemProviderAdapter implements Object childFeature = feature; Object childObject = child; - boolean qualify = childFeature == DGPackage.Literals.STYLE__FILL - || childFeature == DGPackage.Literals.STYLE__STROKE; + boolean qualify = + childFeature == DGPackage.Literals.STYLE__FILL || + childFeature == DGPackage.Literals.STYLE__STROKE; if (qualify) { - return getString("_UI_CreateChild_text2", new Object[] { - getTypeText(childObject), getFeatureText(childFeature), - getTypeText(owner) }); + return getString + ("_UI_CreateChild_text2", + new Object[] { getTypeText(childObject), getFeatureText(childFeature), getTypeText(owner) }); } return super.getCreateChildText(owner, feature, child, selection); } diff --git a/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/src/org/eclipse/papyrus/dd/dg/provider/StyleRuleItemProvider.java b/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/src/org/eclipse/papyrus/dd/dg/provider/StyleRuleItemProvider.java index 4c0f04206fb..5cd45d15037 100644 --- a/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/src/org/eclipse/papyrus/dd/dg/provider/StyleRuleItemProvider.java +++ b/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/src/org/eclipse/papyrus/dd/dg/provider/StyleRuleItemProvider.java @@ -39,10 +39,9 @@ import org.eclipse.papyrus.dd.dg.StyleRule; import org.eclipse.papyrus.dd.edit.DDEditPlugin; /** - * This is the item provider adapter for a - * {@link org.eclipse.papyrus.dd.dg.StyleRule} object. <!-- begin-user-doc --> + * This is the item provider adapter for a {@link org.eclipse.papyrus.dd.dg.StyleRule} object. + * <!-- begin-user-doc --> * <!-- end-user-doc --> - * * @generated */ public class StyleRuleItemProvider extends ItemProviderAdapter implements @@ -75,13 +74,10 @@ public class StyleRuleItemProvider extends ItemProviderAdapter implements } /** - * This specifies how to implement {@link #getChildren} and is used to - * deduce an appropriate feature for an - * {@link org.eclipse.emf.edit.command.AddCommand}, - * {@link org.eclipse.emf.edit.command.RemoveCommand} or - * {@link org.eclipse.emf.edit.command.MoveCommand} in - * {@link #createCommand}. <!-- begin-user-doc --> <!-- end-user-doc --> - * + * This specifies how to implement {@link #getChildren} and is used to deduce an appropriate feature for an + * {@link org.eclipse.emf.edit.command.AddCommand}, {@link org.eclipse.emf.edit.command.RemoveCommand} or + * {@link org.eclipse.emf.edit.command.MoveCommand} in {@link #createCommand}. + * <!-- begin-user-doc --> <!-- end-user-doc --> * @generated */ @Override @@ -97,33 +93,30 @@ public class StyleRuleItemProvider extends ItemProviderAdapter implements /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ @Override protected EStructuralFeature getChildFeature(Object object, Object child) { - // Check the type of the specified child object and return the proper - // feature to use for + // Check the type of the specified child object and return the proper feature to use for // adding (see {@link AddCommand}) it as a child. return super.getChildFeature(object, child); } /** - * This returns StyleRule.gif. <!-- begin-user-doc --> <!-- end-user-doc --> - * + * This returns StyleRule.gif. + * <!-- begin-user-doc --> <!-- end-user-doc --> * @generated */ @Override public Object getImage(Object object) { - return overlayImage(object, - getResourceLocator().getImage("full/obj16/StyleRule")); + return overlayImage(object, getResourceLocator().getImage("full/obj16/StyleRule")); } /** - * This returns the label text for the adapted class. <!-- begin-user-doc + * This returns the label text for the adapted class. + * <!-- begin-user-doc * --> <!-- end-user-doc --> - * * @generated */ @Override @@ -132,11 +125,10 @@ public class StyleRuleItemProvider extends ItemProviderAdapter implements } /** - * 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 --> <!-- + * 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 @@ -144,11 +136,10 @@ public class StyleRuleItemProvider extends ItemProviderAdapter implements updateChildren(notification); switch (notification.getFeatureID(StyleRule.class)) { - case DGPackage.STYLE_RULE__SELECTOR: - case DGPackage.STYLE_RULE__STYLE: - fireNotifyChanged(new ViewerNotification(notification, - notification.getNotifier(), true, false)); - return; + case DGPackage.STYLE_RULE__SELECTOR: + case DGPackage.STYLE_RULE__STYLE: + fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), true, false)); + return; } super.notifyChanged(notification); } @@ -165,13 +156,15 @@ public class StyleRuleItemProvider extends ItemProviderAdapter implements Collection<Object> newChildDescriptors, Object object) { super.collectNewChildDescriptors(newChildDescriptors, object); - newChildDescriptors.add(createChildParameter( - DGPackage.Literals.STYLE_RULE__SELECTOR, - DGFactory.eINSTANCE.createStyleSelector())); + newChildDescriptors.add + (createChildParameter + (DGPackage.Literals.STYLE_RULE__SELECTOR, + DGFactory.eINSTANCE.createStyleSelector())); - newChildDescriptors.add(createChildParameter( - DGPackage.Literals.STYLE_RULE__STYLE, - DGFactory.eINSTANCE.createStyle())); + newChildDescriptors.add + (createChildParameter + (DGPackage.Literals.STYLE_RULE__STYLE, + DGFactory.eINSTANCE.createStyle())); } /** diff --git a/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/src/org/eclipse/papyrus/dd/dg/provider/StyleSelectorItemProvider.java b/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/src/org/eclipse/papyrus/dd/dg/provider/StyleSelectorItemProvider.java index 976d223ade2..d0adecda5f2 100644 --- a/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/src/org/eclipse/papyrus/dd/dg/provider/StyleSelectorItemProvider.java +++ b/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/src/org/eclipse/papyrus/dd/dg/provider/StyleSelectorItemProvider.java @@ -33,15 +33,15 @@ import org.eclipse.emf.edit.provider.ItemProviderAdapter; import org.eclipse.emf.edit.provider.ViewerNotification; import org.eclipse.papyrus.dd.dg.DGPackage; +import org.eclipse.papyrus.dd.dg.ElementKind; import org.eclipse.papyrus.dd.dg.StyleSelector; import org.eclipse.papyrus.dd.edit.DDEditPlugin; /** - * This is the item provider adapter for a - * {@link org.eclipse.papyrus.dd.dg.StyleSelector} object. <!-- begin-user-doc + * This is the item provider adapter for a {@link org.eclipse.papyrus.dd.dg.StyleSelector} object. + * <!-- begin-user-doc * --> <!-- end-user-doc --> - * * @generated */ public class StyleSelectorItemProvider extends ItemProviderAdapter implements @@ -69,48 +69,54 @@ public class StyleSelectorItemProvider extends ItemProviderAdapter implements if (itemPropertyDescriptors == null) { super.getPropertyDescriptors(object); - addTypePropertyDescriptor(object); - addKeywordPropertyDescriptor(object); + addKindPropertyDescriptor(object); + addClassPropertyDescriptor(object); } return itemPropertyDescriptors; } /** - * This adds a property descriptor for the Type feature. <!-- begin-user-doc + * This adds a property descriptor for the Kind feature. + * <!-- begin-user-doc * --> <!-- end-user-doc --> - * * @generated */ - protected void addTypePropertyDescriptor(Object object) { - itemPropertyDescriptors.add(createItemPropertyDescriptor( - ((ComposeableAdapterFactory) adapterFactory) - .getRootAdapterFactory(), - getResourceLocator(), - getString("_UI_StyleSelector_type_feature"), - getString("_UI_PropertyDescriptor_description", - "_UI_StyleSelector_type_feature", - "_UI_StyleSelector_type"), - DGPackage.Literals.STYLE_SELECTOR__TYPE, true, false, true, - null, null, null)); + protected void addKindPropertyDescriptor(Object object) { + itemPropertyDescriptors.add + (createItemPropertyDescriptor + (((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(), + getResourceLocator(), + getString("_UI_StyleSelector_kind_feature"), + getString("_UI_PropertyDescriptor_description", "_UI_StyleSelector_kind_feature", "_UI_StyleSelector_type"), + DGPackage.Literals.STYLE_SELECTOR__KIND, + true, + false, + false, + ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, + null, + null)); } /** - * This adds a property descriptor for the Keyword feature. <!-- + * This adds a property descriptor for the Class feature. <!-- * begin-user-doc --> <!-- end-user-doc --> * * @generated */ - protected void addKeywordPropertyDescriptor(Object object) { - itemPropertyDescriptors.add(createItemPropertyDescriptor( - ((ComposeableAdapterFactory) adapterFactory) - .getRootAdapterFactory(), - getResourceLocator(), - getString("_UI_StyleSelector_keyword_feature"), - getString("_UI_PropertyDescriptor_description", - "_UI_StyleSelector_keyword_feature", - "_UI_StyleSelector_type"), - DGPackage.Literals.STYLE_SELECTOR__KEYWORD, true, false, false, - ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null)); + protected void addClassPropertyDescriptor(Object object) { + itemPropertyDescriptors.add + (createItemPropertyDescriptor + (((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(), + getResourceLocator(), + getString("_UI_StyleSelector_class_feature"), + getString("_UI_PropertyDescriptor_description", "_UI_StyleSelector_class_feature", "_UI_StyleSelector_type"), + DGPackage.Literals.STYLE_SELECTOR__CLASS, + true, + false, + false, + ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, + null, + null)); } /** @@ -121,27 +127,29 @@ public class StyleSelectorItemProvider extends ItemProviderAdapter implements */ @Override public Object getImage(Object object) { - return overlayImage(object, - getResourceLocator().getImage("full/obj16/StyleSelector")); + return overlayImage(object, getResourceLocator().getImage("full/obj16/StyleSelector")); } /** - * This returns the label text for the adapted class. <!-- begin-user-doc + * This returns the label text for the adapted class. + * <!-- begin-user-doc * --> <!-- end-user-doc --> - * * @generated */ @Override public String getText(Object object) { - return getString("_UI_StyleSelector_type"); + ElementKind labelValue = ((StyleSelector)object).getKind(); + String label = labelValue == null ? null : labelValue.toString(); + return label == null || label.length() == 0 ? + getString("_UI_StyleSelector_type") : + getString("_UI_StyleSelector_type") + " " + label; } /** - * 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 --> <!-- + * 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 @@ -149,10 +157,10 @@ public class StyleSelectorItemProvider extends ItemProviderAdapter implements updateChildren(notification); switch (notification.getFeatureID(StyleSelector.class)) { - case DGPackage.STYLE_SELECTOR__KEYWORD: - fireNotifyChanged(new ViewerNotification(notification, - notification.getNotifier(), false, true)); - return; + case DGPackage.STYLE_SELECTOR__KIND: + case DGPackage.STYLE_SELECTOR__CLASS: + fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), false, true)); + return; } super.notifyChanged(notification); } diff --git a/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/src/org/eclipse/papyrus/dd/dg/provider/StyleSheetItemProvider.java b/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/src/org/eclipse/papyrus/dd/dg/provider/StyleSheetItemProvider.java index 83e57b3b8a1..de184c6b5eb 100644 --- a/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/src/org/eclipse/papyrus/dd/dg/provider/StyleSheetItemProvider.java +++ b/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/src/org/eclipse/papyrus/dd/dg/provider/StyleSheetItemProvider.java @@ -39,10 +39,9 @@ import org.eclipse.papyrus.dd.dg.StyleSheet; import org.eclipse.papyrus.dd.edit.DDEditPlugin; /** - * This is the item provider adapter for a - * {@link org.eclipse.papyrus.dd.dg.StyleSheet} object. <!-- begin-user-doc --> + * This is the item provider adapter for a {@link org.eclipse.papyrus.dd.dg.StyleSheet} object. + * <!-- begin-user-doc --> * <!-- end-user-doc --> - * * @generated */ public class StyleSheetItemProvider extends ItemProviderAdapter implements @@ -75,13 +74,10 @@ public class StyleSheetItemProvider extends ItemProviderAdapter implements } /** - * This specifies how to implement {@link #getChildren} and is used to - * deduce an appropriate feature for an - * {@link org.eclipse.emf.edit.command.AddCommand}, - * {@link org.eclipse.emf.edit.command.RemoveCommand} or - * {@link org.eclipse.emf.edit.command.MoveCommand} in - * {@link #createCommand}. <!-- begin-user-doc --> <!-- end-user-doc --> - * + * This specifies how to implement {@link #getChildren} and is used to deduce an appropriate feature for an + * {@link org.eclipse.emf.edit.command.AddCommand}, {@link org.eclipse.emf.edit.command.RemoveCommand} or + * {@link org.eclipse.emf.edit.command.MoveCommand} in {@link #createCommand}. + * <!-- begin-user-doc --> <!-- end-user-doc --> * @generated */ @Override @@ -96,13 +92,11 @@ public class StyleSheetItemProvider extends ItemProviderAdapter implements /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ @Override protected EStructuralFeature getChildFeature(Object object, Object child) { - // Check the type of the specified child object and return the proper - // feature to use for + // Check the type of the specified child object and return the proper feature to use for // adding (see {@link AddCommand}) it as a child. return super.getChildFeature(object, child); @@ -116,14 +110,13 @@ public class StyleSheetItemProvider extends ItemProviderAdapter implements */ @Override public Object getImage(Object object) { - return overlayImage(object, - getResourceLocator().getImage("full/obj16/StyleSheet")); + return overlayImage(object, getResourceLocator().getImage("full/obj16/StyleSheet")); } /** - * This returns the label text for the adapted class. <!-- begin-user-doc + * This returns the label text for the adapted class. + * <!-- begin-user-doc * --> <!-- end-user-doc --> - * * @generated */ @Override @@ -132,11 +125,10 @@ public class StyleSheetItemProvider extends ItemProviderAdapter implements } /** - * 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 --> <!-- + * 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 @@ -144,10 +136,9 @@ public class StyleSheetItemProvider extends ItemProviderAdapter implements updateChildren(notification); switch (notification.getFeatureID(StyleSheet.class)) { - case DGPackage.STYLE_SHEET__RULE: - fireNotifyChanged(new ViewerNotification(notification, - notification.getNotifier(), true, false)); - return; + case DGPackage.STYLE_SHEET__RULE: + fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), true, false)); + return; } super.notifyChanged(notification); } @@ -164,9 +155,10 @@ public class StyleSheetItemProvider extends ItemProviderAdapter implements Collection<Object> newChildDescriptors, Object object) { super.collectNewChildDescriptors(newChildDescriptors, object); - newChildDescriptors.add(createChildParameter( - DGPackage.Literals.STYLE_SHEET__RULE, - DGFactory.eINSTANCE.createStyleRule())); + newChildDescriptors.add + (createChildParameter + (DGPackage.Literals.STYLE_SHEET__RULE, + DGFactory.eINSTANCE.createStyleRule())); } /** diff --git a/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/src/org/eclipse/papyrus/dd/dg/provider/TextItemProvider.java b/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/src/org/eclipse/papyrus/dd/dg/provider/TextItemProvider.java index 058976ce239..99c7b0ecc9a 100644 --- a/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/src/org/eclipse/papyrus/dd/dg/provider/TextItemProvider.java +++ b/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/src/org/eclipse/papyrus/dd/dg/provider/TextItemProvider.java @@ -37,10 +37,9 @@ import org.eclipse.papyrus.dd.dg.DGPackage; import org.eclipse.papyrus.dd.dg.Text; /** - * This is the item provider adapter for a - * {@link org.eclipse.papyrus.dd.dg.Text} object. <!-- begin-user-doc --> <!-- + * This is the item provider adapter for a {@link org.eclipse.papyrus.dd.dg.Text} object. + * <!-- begin-user-doc --> <!-- * end-user-doc --> - * * @generated */ public class TextItemProvider extends GraphicalElementItemProvider implements @@ -74,31 +73,32 @@ public class TextItemProvider extends GraphicalElementItemProvider implements } /** - * This adds a property descriptor for the Data feature. <!-- begin-user-doc + * This adds a property descriptor for the Data feature. + * <!-- begin-user-doc * --> <!-- end-user-doc --> - * * @generated */ protected void addDataPropertyDescriptor(Object object) { - itemPropertyDescriptors.add(createItemPropertyDescriptor( - ((ComposeableAdapterFactory) adapterFactory) - .getRootAdapterFactory(), - getResourceLocator(), - getString("_UI_Text_data_feature"), - getString("_UI_PropertyDescriptor_description", - "_UI_Text_data_feature", "_UI_Text_type"), - DGPackage.Literals.TEXT__DATA, true, false, false, - ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null)); + itemPropertyDescriptors.add + (createItemPropertyDescriptor + (((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(), + getResourceLocator(), + getString("_UI_Text_data_feature"), + getString("_UI_PropertyDescriptor_description", "_UI_Text_data_feature", "_UI_Text_type"), + DGPackage.Literals.TEXT__DATA, + true, + false, + false, + ItemPropertyDescriptor.GENERIC_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}, - * {@link org.eclipse.emf.edit.command.RemoveCommand} or - * {@link org.eclipse.emf.edit.command.MoveCommand} in - * {@link #createCommand}. <!-- begin-user-doc --> <!-- end-user-doc --> - * + * This specifies how to implement {@link #getChildren} and is used to deduce an appropriate feature for an + * {@link org.eclipse.emf.edit.command.AddCommand}, {@link org.eclipse.emf.edit.command.RemoveCommand} or + * {@link org.eclipse.emf.edit.command.MoveCommand} in {@link #createCommand}. + * <!-- begin-user-doc --> <!-- end-user-doc --> * @generated */ @Override @@ -113,48 +113,45 @@ public class TextItemProvider extends GraphicalElementItemProvider implements /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ @Override protected EStructuralFeature getChildFeature(Object object, Object child) { - // Check the type of the specified child object and return the proper - // feature to use for + // Check the type of the specified child object and return the proper feature to use for // adding (see {@link AddCommand}) it as a child. return super.getChildFeature(object, child); } /** - * This returns Text.gif. <!-- begin-user-doc --> <!-- end-user-doc --> - * + * This returns Text.gif. + * <!-- begin-user-doc --> <!-- end-user-doc --> * @generated */ @Override public Object getImage(Object object) { - return overlayImage(object, - getResourceLocator().getImage("full/obj16/Text")); + return overlayImage(object, getResourceLocator().getImage("full/obj16/Text")); } /** - * This returns the label text for the adapted class. <!-- begin-user-doc + * This returns the label text for the adapted class. + * <!-- begin-user-doc * --> <!-- end-user-doc --> - * * @generated */ @Override public String getText(Object object) { - String label = ((Text) object).getId(); - return label == null || label.length() == 0 ? getString("_UI_Text_type") - : getString("_UI_Text_type") + " " + label; + String label = ((Text)object).getId(); + return label == null || label.length() == 0 ? + getString("_UI_Text_type") : + getString("_UI_Text_type") + " " + label; } /** - * 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 --> <!-- + * 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 @@ -162,14 +159,12 @@ public class TextItemProvider extends GraphicalElementItemProvider implements updateChildren(notification); switch (notification.getFeatureID(Text.class)) { - case DGPackage.TEXT__DATA: - fireNotifyChanged(new ViewerNotification(notification, - notification.getNotifier(), false, true)); - return; - case DGPackage.TEXT__POSITION: - fireNotifyChanged(new ViewerNotification(notification, - notification.getNotifier(), true, false)); - return; + case DGPackage.TEXT__DATA: + fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), false, true)); + return; + case DGPackage.TEXT__POSITION: + fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), true, false)); + return; } super.notifyChanged(notification); } @@ -186,9 +181,10 @@ public class TextItemProvider extends GraphicalElementItemProvider implements Collection<Object> newChildDescriptors, Object object) { super.collectNewChildDescriptors(newChildDescriptors, object); - newChildDescriptors.add(createChildParameter( - DGPackage.Literals.TEXT__POSITION, - DCFactory.eINSTANCE.createPoint())); + newChildDescriptors.add + (createChildParameter + (DGPackage.Literals.TEXT__POSITION, + DCFactory.eINSTANCE.createPoint())); } } diff --git a/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/src/org/eclipse/papyrus/dd/dg/provider/TransformItemProvider.java b/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/src/org/eclipse/papyrus/dd/dg/provider/TransformItemProvider.java index eb885ba55fb..7fba8fcad7f 100644 --- a/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/src/org/eclipse/papyrus/dd/dg/provider/TransformItemProvider.java +++ b/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/src/org/eclipse/papyrus/dd/dg/provider/TransformItemProvider.java @@ -32,10 +32,9 @@ import org.eclipse.emf.edit.provider.ItemProviderAdapter; import org.eclipse.papyrus.dd.edit.DDEditPlugin; /** - * This is the item provider adapter for a - * {@link org.eclipse.papyrus.dd.dg.Transform} object. <!-- begin-user-doc --> + * This is the item provider adapter for a {@link org.eclipse.papyrus.dd.dg.Transform} object. + * <!-- begin-user-doc --> * <!-- end-user-doc --> - * * @generated */ public class TransformItemProvider extends ItemProviderAdapter implements @@ -68,9 +67,9 @@ public class TransformItemProvider extends ItemProviderAdapter implements } /** - * This returns the label text for the adapted class. <!-- begin-user-doc + * This returns the label text for the adapted class. + * <!-- begin-user-doc * --> <!-- end-user-doc --> - * * @generated */ @Override @@ -79,11 +78,10 @@ public class TransformItemProvider extends ItemProviderAdapter implements } /** - * 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 --> <!-- + * 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 diff --git a/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/src/org/eclipse/papyrus/dd/dg/provider/TranslateItemProvider.java b/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/src/org/eclipse/papyrus/dd/dg/provider/TranslateItemProvider.java index efea66634b4..f1b500a480a 100644 --- a/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/src/org/eclipse/papyrus/dd/dg/provider/TranslateItemProvider.java +++ b/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/src/org/eclipse/papyrus/dd/dg/provider/TranslateItemProvider.java @@ -33,10 +33,9 @@ import org.eclipse.papyrus.dd.dg.DGPackage; import org.eclipse.papyrus.dd.dg.Translate; /** - * This is the item provider adapter for a - * {@link org.eclipse.papyrus.dd.dg.Translate} object. <!-- begin-user-doc --> + * This is the item provider adapter for a {@link org.eclipse.papyrus.dd.dg.Translate} object. + * <!-- begin-user-doc --> * <!-- end-user-doc --> - * * @generated */ public class TranslateItemProvider extends TransformItemProvider implements @@ -77,15 +76,19 @@ public class TranslateItemProvider extends TransformItemProvider implements * @generated */ protected void addDeltaXPropertyDescriptor(Object object) { - itemPropertyDescriptors.add(createItemPropertyDescriptor( - ((ComposeableAdapterFactory) adapterFactory) - .getRootAdapterFactory(), - getResourceLocator(), - getString("_UI_Translate_deltaX_feature"), - getString("_UI_PropertyDescriptor_description", - "_UI_Translate_deltaX_feature", "_UI_Translate_type"), - DGPackage.Literals.TRANSLATE__DELTA_X, true, false, false, - ItemPropertyDescriptor.REAL_VALUE_IMAGE, null, null)); + itemPropertyDescriptors.add + (createItemPropertyDescriptor + (((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(), + getResourceLocator(), + getString("_UI_Translate_deltaX_feature"), + getString("_UI_PropertyDescriptor_description", "_UI_Translate_deltaX_feature", "_UI_Translate_type"), + DGPackage.Literals.TRANSLATE__DELTA_X, + true, + false, + false, + ItemPropertyDescriptor.REAL_VALUE_IMAGE, + null, + null)); } /** @@ -95,46 +98,48 @@ public class TranslateItemProvider extends TransformItemProvider implements * @generated */ protected void addDeltaYPropertyDescriptor(Object object) { - itemPropertyDescriptors.add(createItemPropertyDescriptor( - ((ComposeableAdapterFactory) adapterFactory) - .getRootAdapterFactory(), - getResourceLocator(), - getString("_UI_Translate_deltaY_feature"), - getString("_UI_PropertyDescriptor_description", - "_UI_Translate_deltaY_feature", "_UI_Translate_type"), - DGPackage.Literals.TRANSLATE__DELTA_Y, true, false, false, - ItemPropertyDescriptor.REAL_VALUE_IMAGE, null, null)); + itemPropertyDescriptors.add + (createItemPropertyDescriptor + (((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(), + getResourceLocator(), + getString("_UI_Translate_deltaY_feature"), + getString("_UI_PropertyDescriptor_description", "_UI_Translate_deltaY_feature", "_UI_Translate_type"), + DGPackage.Literals.TRANSLATE__DELTA_Y, + true, + false, + false, + ItemPropertyDescriptor.REAL_VALUE_IMAGE, + null, + null)); } /** - * This returns Translate.gif. <!-- begin-user-doc --> <!-- end-user-doc --> - * + * This returns Translate.gif. + * <!-- begin-user-doc --> <!-- end-user-doc --> * @generated */ @Override public Object getImage(Object object) { - return overlayImage(object, - getResourceLocator().getImage("full/obj16/Translate")); + return overlayImage(object, getResourceLocator().getImage("full/obj16/Translate")); } /** - * This returns the label text for the adapted class. <!-- begin-user-doc + * This returns the label text for the adapted class. + * <!-- begin-user-doc * --> <!-- end-user-doc --> - * * @generated */ @Override public String getText(Object object) { - Translate translate = (Translate) object; + Translate translate = (Translate)object; return getString("_UI_Translate_type") + " " + translate.getDeltaX(); } /** - * 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 --> <!-- + * 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 @@ -142,11 +147,10 @@ public class TranslateItemProvider extends TransformItemProvider implements updateChildren(notification); switch (notification.getFeatureID(Translate.class)) { - case DGPackage.TRANSLATE__DELTA_X: - case DGPackage.TRANSLATE__DELTA_Y: - fireNotifyChanged(new ViewerNotification(notification, - notification.getNotifier(), false, true)); - return; + case DGPackage.TRANSLATE__DELTA_X: + case DGPackage.TRANSLATE__DELTA_Y: + fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), false, true)); + return; } super.notifyChanged(notification); } diff --git a/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/src/org/eclipse/papyrus/dd/dg/provider/UseItemProvider.java b/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/src/org/eclipse/papyrus/dd/dg/provider/UseItemProvider.java index 868207569bf..9a6c2c9acc7 100644 --- a/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/src/org/eclipse/papyrus/dd/dg/provider/UseItemProvider.java +++ b/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/src/org/eclipse/papyrus/dd/dg/provider/UseItemProvider.java @@ -19,6 +19,7 @@ import org.eclipse.emf.common.notify.Notification; import org.eclipse.emf.ecore.EStructuralFeature; +import org.eclipse.emf.edit.provider.ComposeableAdapterFactory; import org.eclipse.emf.edit.provider.IEditingDomainItemProvider; import org.eclipse.emf.edit.provider.IItemColorProvider; import org.eclipse.emf.edit.provider.IItemFontProvider; @@ -35,9 +36,8 @@ import org.eclipse.papyrus.dd.dg.DGPackage; import org.eclipse.papyrus.dd.dg.Use; /** - * This is the item provider adapter for a {@link org.eclipse.papyrus.dd.dg.Use} - * object. <!-- begin-user-doc --> <!-- end-user-doc --> - * + * This is the item provider adapter for a {@link org.eclipse.papyrus.dd.dg.Use} object. + * <!-- begin-user-doc --> <!-- end-user-doc --> * @generated */ public class UseItemProvider extends GraphicalElementItemProvider implements @@ -65,20 +65,40 @@ public class UseItemProvider extends GraphicalElementItemProvider implements if (itemPropertyDescriptors == null) { super.getPropertyDescriptors(object); + addReferencedElementPropertyDescriptor(object); } return itemPropertyDescriptors; } /** - * This specifies how to implement {@link #getChildren} and is used to - * deduce an appropriate feature for an - * {@link org.eclipse.emf.edit.command.AddCommand}, - * {@link org.eclipse.emf.edit.command.RemoveCommand} or - * {@link org.eclipse.emf.edit.command.MoveCommand} in - * {@link #createCommand}. <!-- begin-user-doc --> <!-- end-user-doc --> + * This adds a property descriptor for the Referenced Element feature. <!-- + * begin-user-doc --> <!-- end-user-doc --> * * @generated */ + protected void addReferencedElementPropertyDescriptor(Object object) { + itemPropertyDescriptors.add + (createItemPropertyDescriptor + (((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(), + getResourceLocator(), + getString("_UI_Use_referencedElement_feature"), + getString("_UI_PropertyDescriptor_description", "_UI_Use_referencedElement_feature", "_UI_Use_type"), + DGPackage.Literals.USE__REFERENCED_ELEMENT, + true, + false, + true, + null, + 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}, {@link org.eclipse.emf.edit.command.RemoveCommand} or + * {@link org.eclipse.emf.edit.command.MoveCommand} in {@link #createCommand}. + * <!-- begin-user-doc --> <!-- end-user-doc --> + * @generated + */ @Override public Collection<? extends EStructuralFeature> getChildrenFeatures( Object object) { @@ -91,48 +111,45 @@ public class UseItemProvider extends GraphicalElementItemProvider implements /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ @Override protected EStructuralFeature getChildFeature(Object object, Object child) { - // Check the type of the specified child object and return the proper - // feature to use for + // Check the type of the specified child object and return the proper feature to use for // adding (see {@link AddCommand}) it as a child. return super.getChildFeature(object, child); } /** - * This returns Use.gif. <!-- begin-user-doc --> <!-- end-user-doc --> - * + * This returns Use.gif. + * <!-- begin-user-doc --> <!-- end-user-doc --> * @generated */ @Override public Object getImage(Object object) { - return overlayImage(object, - getResourceLocator().getImage("full/obj16/Use")); + return overlayImage(object, getResourceLocator().getImage("full/obj16/Use")); } /** - * This returns the label text for the adapted class. <!-- begin-user-doc + * This returns the label text for the adapted class. + * <!-- begin-user-doc * --> <!-- end-user-doc --> - * * @generated */ @Override public String getText(Object object) { - String label = ((Use) object).getId(); - return label == null || label.length() == 0 ? getString("_UI_Use_type") - : getString("_UI_Use_type") + " " + label; + String label = ((Use)object).getId(); + return label == null || label.length() == 0 ? + getString("_UI_Use_type") : + getString("_UI_Use_type") + " " + label; } /** - * 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 --> <!-- + * 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 @@ -140,10 +157,9 @@ public class UseItemProvider extends GraphicalElementItemProvider implements updateChildren(notification); switch (notification.getFeatureID(Use.class)) { - case DGPackage.USE__BOUNDS: - fireNotifyChanged(new ViewerNotification(notification, - notification.getNotifier(), true, false)); - return; + case DGPackage.USE__BOUNDS: + fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), true, false)); + return; } super.notifyChanged(notification); } @@ -160,9 +176,10 @@ public class UseItemProvider extends GraphicalElementItemProvider implements Collection<Object> newChildDescriptors, Object object) { super.collectNewChildDescriptors(newChildDescriptors, object); - newChildDescriptors.add(createChildParameter( - DGPackage.Literals.USE__BOUNDS, - DCFactory.eINSTANCE.createBounds())); + newChildDescriptors.add + (createChildParameter + (DGPackage.Literals.USE__BOUNDS, + DCFactory.eINSTANCE.createBounds())); } } diff --git a/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/src/org/eclipse/papyrus/dd/di/provider/DIItemProviderAdapterFactory.java b/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/src/org/eclipse/papyrus/dd/di/provider/DIItemProviderAdapterFactory.java index d16e6e36b22..f3bad6a5d4a 100644 --- a/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/src/org/eclipse/papyrus/dd/di/provider/DIItemProviderAdapterFactory.java +++ b/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/src/org/eclipse/papyrus/dd/di/provider/DIItemProviderAdapterFactory.java @@ -33,22 +33,20 @@ import org.eclipse.emf.edit.provider.ITreeItemContentProvider; import org.eclipse.papyrus.dd.di.util.DIAdapterFactory; /** - * This is the factory that is used to provide the interfaces needed to support - * Viewers. The adapters generated by this factory convert EMF adapter - * notifications into calls to {@link #fireNotifyChanged fireNotifyChanged}. The - * adapters also support Eclipse property sheets. Note that most of the adapters - * are shared among multiple instances. <!-- begin-user-doc --> <!-- + * This is the factory that is used to provide the interfaces needed to support Viewers. + * The adapters generated by this factory convert EMF adapter notifications into calls to {@link #fireNotifyChanged fireNotifyChanged}. + * The adapters also support Eclipse property sheets. + * Note that most of the adapters are shared among multiple instances. + * <!-- begin-user-doc --> <!-- * end-user-doc --> - * * @generated */ public class DIItemProviderAdapterFactory extends DIAdapterFactory implements ComposeableAdapterFactory, IChangeNotifier, IDisposable { /** - * This keeps track of the root adapter factory that delegates to this - * adapter factory. <!-- begin-user-doc --> <!-- end-user-doc --> - * + * This keeps track of the root adapter factory that delegates to this adapter factory. + * <!-- begin-user-doc --> <!-- end-user-doc --> * @generated */ protected ComposedAdapterFactory parentAdapterFactory; @@ -63,10 +61,9 @@ public class DIItemProviderAdapterFactory extends DIAdapterFactory implements protected IChangeNotifier changeNotifier = new ChangeNotifier(); /** - * This keeps track of all the supported types checked by - * {@link #isFactoryForType isFactoryForType}. <!-- begin-user-doc --> <!-- + * This keeps track of all the supported types checked by {@link #isFactoryForType isFactoryForType}. + * <!-- begin-user-doc --> <!-- * end-user-doc --> - * * @generated */ protected Collection<Object> supportedTypes = new ArrayList<Object>(); @@ -92,8 +89,7 @@ public class DIItemProviderAdapterFactory extends DIAdapterFactory implements * @generated */ public ComposeableAdapterFactory getRootAdapterFactory() { - return parentAdapterFactory == null ? this : parentAdapterFactory - .getRootAdapterFactory(); + return parentAdapterFactory == null ? this : parentAdapterFactory.getRootAdapterFactory(); } /** @@ -109,7 +105,6 @@ public class DIItemProviderAdapterFactory extends DIAdapterFactory implements /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ @Override @@ -118,9 +113,8 @@ public class DIItemProviderAdapterFactory extends DIAdapterFactory implements } /** - * This implementation substitutes the factory itself as the key for the - * adapter. <!-- begin-user-doc --> <!-- end-user-doc --> - * + * This implementation substitutes the factory itself as the key for the adapter. + * <!-- begin-user-doc --> <!-- end-user-doc --> * @generated */ @Override @@ -130,15 +124,13 @@ public class DIItemProviderAdapterFactory extends DIAdapterFactory implements /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ @Override public Object adapt(Object object, Object type) { if (isFactoryForType(type)) { Object adapter = super.adapt(object, type); - if (!(type instanceof Class<?>) - || (((Class<?>) type).isInstance(adapter))) { + if (!(type instanceof Class<?>) || (((Class<?>)type).isInstance(adapter))) { return adapter; } } @@ -147,8 +139,8 @@ public class DIItemProviderAdapterFactory extends DIAdapterFactory implements } /** - * This adds a listener. <!-- begin-user-doc --> <!-- end-user-doc --> - * + * This adds a listener. + * <!-- begin-user-doc --> <!-- end-user-doc --> * @generated */ public void addListener(INotifyChangedListener notifyChangedListener) { @@ -156,8 +148,8 @@ public class DIItemProviderAdapterFactory extends DIAdapterFactory implements } /** - * This removes a listener. <!-- begin-user-doc --> <!-- end-user-doc --> - * + * This removes a listener. + * <!-- begin-user-doc --> <!-- end-user-doc --> * @generated */ public void removeListener(INotifyChangedListener notifyChangedListener) { diff --git a/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/src/org/eclipse/papyrus/dd/di/provider/DiagramElementItemProvider.java b/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/src/org/eclipse/papyrus/dd/di/provider/DiagramElementItemProvider.java index 848ba4975ca..b0e45887bd8 100644 --- a/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/src/org/eclipse/papyrus/dd/di/provider/DiagramElementItemProvider.java +++ b/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/src/org/eclipse/papyrus/dd/di/provider/DiagramElementItemProvider.java @@ -37,10 +37,9 @@ import org.eclipse.papyrus.dd.di.DiagramElement; import org.eclipse.papyrus.dd.edit.DDEditPlugin; /** - * This is the item provider adapter for a - * {@link org.eclipse.papyrus.dd.di.DiagramElement} object. <!-- begin-user-doc + * This is the item provider adapter for a {@link org.eclipse.papyrus.dd.di.DiagramElement} object. + * <!-- begin-user-doc * --> <!-- end-user-doc --> - * * @generated */ public class DiagramElementItemProvider extends ItemProviderAdapter implements @@ -83,16 +82,19 @@ public class DiagramElementItemProvider extends ItemProviderAdapter implements * @generated */ protected void addModelElementPropertyDescriptor(Object object) { - itemPropertyDescriptors.add(createItemPropertyDescriptor( - ((ComposeableAdapterFactory) adapterFactory) - .getRootAdapterFactory(), - getResourceLocator(), - getString("_UI_DiagramElement_modelElement_feature"), - getString("_UI_PropertyDescriptor_description", - "_UI_DiagramElement_modelElement_feature", - "_UI_DiagramElement_type"), - DIPackage.Literals.DIAGRAM_ELEMENT__MODEL_ELEMENT, false, - false, false, null, null, null)); + itemPropertyDescriptors.add + (createItemPropertyDescriptor + (((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(), + getResourceLocator(), + getString("_UI_DiagramElement_modelElement_feature"), + getString("_UI_PropertyDescriptor_description", "_UI_DiagramElement_modelElement_feature", "_UI_DiagramElement_type"), + DIPackage.Literals.DIAGRAM_ELEMENT__MODEL_ELEMENT, + false, + false, + false, + null, + null, + null)); } /** @@ -102,16 +104,19 @@ public class DiagramElementItemProvider extends ItemProviderAdapter implements * @generated */ protected void addOwningElementPropertyDescriptor(Object object) { - itemPropertyDescriptors.add(createItemPropertyDescriptor( - ((ComposeableAdapterFactory) adapterFactory) - .getRootAdapterFactory(), - getResourceLocator(), - getString("_UI_DiagramElement_owningElement_feature"), - getString("_UI_PropertyDescriptor_description", - "_UI_DiagramElement_owningElement_feature", - "_UI_DiagramElement_type"), - DIPackage.Literals.DIAGRAM_ELEMENT__OWNING_ELEMENT, false, - false, false, null, null, null)); + itemPropertyDescriptors.add + (createItemPropertyDescriptor + (((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(), + getResourceLocator(), + getString("_UI_DiagramElement_owningElement_feature"), + getString("_UI_PropertyDescriptor_description", "_UI_DiagramElement_owningElement_feature", "_UI_DiagramElement_type"), + DIPackage.Literals.DIAGRAM_ELEMENT__OWNING_ELEMENT, + false, + false, + false, + null, + null, + null)); } /** @@ -121,16 +126,19 @@ public class DiagramElementItemProvider extends ItemProviderAdapter implements * @generated */ protected void addOwnedElementPropertyDescriptor(Object object) { - itemPropertyDescriptors.add(createItemPropertyDescriptor( - ((ComposeableAdapterFactory) adapterFactory) - .getRootAdapterFactory(), - getResourceLocator(), - getString("_UI_DiagramElement_ownedElement_feature"), - getString("_UI_PropertyDescriptor_description", - "_UI_DiagramElement_ownedElement_feature", - "_UI_DiagramElement_type"), - DIPackage.Literals.DIAGRAM_ELEMENT__OWNED_ELEMENT, false, - false, false, null, null, null)); + itemPropertyDescriptors.add + (createItemPropertyDescriptor + (((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(), + getResourceLocator(), + getString("_UI_DiagramElement_ownedElement_feature"), + getString("_UI_PropertyDescriptor_description", "_UI_DiagramElement_ownedElement_feature", "_UI_DiagramElement_type"), + DIPackage.Literals.DIAGRAM_ELEMENT__OWNED_ELEMENT, + false, + false, + false, + null, + null, + null)); } /** @@ -140,26 +148,26 @@ public class DiagramElementItemProvider extends ItemProviderAdapter implements * @generated */ protected void addSharedStylePropertyDescriptor(Object object) { - itemPropertyDescriptors.add(createItemPropertyDescriptor( - ((ComposeableAdapterFactory) adapterFactory) - .getRootAdapterFactory(), - getResourceLocator(), - getString("_UI_DiagramElement_sharedStyle_feature"), - getString("_UI_PropertyDescriptor_description", - "_UI_DiagramElement_sharedStyle_feature", - "_UI_DiagramElement_type"), - DIPackage.Literals.DIAGRAM_ELEMENT__SHARED_STYLE, true, false, - true, null, null, null)); + itemPropertyDescriptors.add + (createItemPropertyDescriptor + (((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(), + getResourceLocator(), + getString("_UI_DiagramElement_sharedStyle_feature"), + getString("_UI_PropertyDescriptor_description", "_UI_DiagramElement_sharedStyle_feature", "_UI_DiagramElement_type"), + DIPackage.Literals.DIAGRAM_ELEMENT__SHARED_STYLE, + true, + false, + true, + null, + 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}, - * {@link org.eclipse.emf.edit.command.RemoveCommand} or - * {@link org.eclipse.emf.edit.command.MoveCommand} in - * {@link #createCommand}. <!-- begin-user-doc --> <!-- end-user-doc --> - * + * This specifies how to implement {@link #getChildren} and is used to deduce an appropriate feature for an + * {@link org.eclipse.emf.edit.command.AddCommand}, {@link org.eclipse.emf.edit.command.RemoveCommand} or + * {@link org.eclipse.emf.edit.command.MoveCommand} in {@link #createCommand}. + * <!-- begin-user-doc --> <!-- end-user-doc --> * @generated */ @Override @@ -167,30 +175,27 @@ public class DiagramElementItemProvider extends ItemProviderAdapter implements Object object) { if (childrenFeatures == null) { super.getChildrenFeatures(object); - childrenFeatures - .add(DIPackage.Literals.DIAGRAM_ELEMENT__LOCAL_STYLE); + childrenFeatures.add(DIPackage.Literals.DIAGRAM_ELEMENT__LOCAL_STYLE); } return childrenFeatures; } /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ @Override protected EStructuralFeature getChildFeature(Object object, Object child) { - // Check the type of the specified child object and return the proper - // feature to use for + // Check the type of the specified child object and return the proper feature to use for // adding (see {@link AddCommand}) it as a child. return super.getChildFeature(object, child); } /** - * This returns the label text for the adapted class. <!-- begin-user-doc + * This returns the label text for the adapted class. + * <!-- begin-user-doc * --> <!-- end-user-doc --> - * * @generated */ @Override @@ -199,11 +204,10 @@ public class DiagramElementItemProvider extends ItemProviderAdapter implements } /** - * 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 --> <!-- + * 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 @@ -211,10 +215,9 @@ public class DiagramElementItemProvider extends ItemProviderAdapter implements updateChildren(notification); switch (notification.getFeatureID(DiagramElement.class)) { - case DIPackage.DIAGRAM_ELEMENT__LOCAL_STYLE: - fireNotifyChanged(new ViewerNotification(notification, - notification.getNotifier(), true, false)); - return; + case DIPackage.DIAGRAM_ELEMENT__LOCAL_STYLE: + fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), true, false)); + return; } super.notifyChanged(notification); } diff --git a/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/src/org/eclipse/papyrus/dd/di/provider/DiagramItemProvider.java b/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/src/org/eclipse/papyrus/dd/di/provider/DiagramItemProvider.java index b93e1dba077..c01f70b3f0b 100644 --- a/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/src/org/eclipse/papyrus/dd/di/provider/DiagramItemProvider.java +++ b/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/src/org/eclipse/papyrus/dd/di/provider/DiagramItemProvider.java @@ -31,10 +31,9 @@ import org.eclipse.papyrus.dd.di.DIPackage; import org.eclipse.papyrus.dd.di.Diagram; /** - * This is the item provider adapter for a - * {@link org.eclipse.papyrus.dd.di.Diagram} object. <!-- begin-user-doc --> + * This is the item provider adapter for a {@link org.eclipse.papyrus.dd.di.Diagram} object. + * <!-- begin-user-doc --> * <!-- end-user-doc --> - * * @generated */ public class DiagramItemProvider extends ShapeItemProvider implements @@ -70,21 +69,25 @@ public class DiagramItemProvider extends ShapeItemProvider implements } /** - * This adds a property descriptor for the Name feature. <!-- begin-user-doc + * This adds a property descriptor for the Name feature. + * <!-- begin-user-doc * --> <!-- end-user-doc --> - * * @generated */ protected void addNamePropertyDescriptor(Object object) { - itemPropertyDescriptors.add(createItemPropertyDescriptor( - ((ComposeableAdapterFactory) adapterFactory) - .getRootAdapterFactory(), - getResourceLocator(), - getString("_UI_Diagram_name_feature"), - getString("_UI_PropertyDescriptor_description", - "_UI_Diagram_name_feature", "_UI_Diagram_type"), - DIPackage.Literals.DIAGRAM__NAME, true, false, false, - ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null)); + itemPropertyDescriptors.add + (createItemPropertyDescriptor + (((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(), + getResourceLocator(), + getString("_UI_Diagram_name_feature"), + getString("_UI_PropertyDescriptor_description", "_UI_Diagram_name_feature", "_UI_Diagram_type"), + DIPackage.Literals.DIAGRAM__NAME, + true, + false, + false, + ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, + null, + null)); } /** @@ -94,18 +97,19 @@ public class DiagramItemProvider extends ShapeItemProvider implements * @generated */ protected void addDocumentationPropertyDescriptor(Object object) { - itemPropertyDescriptors - .add(createItemPropertyDescriptor( - ((ComposeableAdapterFactory) adapterFactory) - .getRootAdapterFactory(), - getResourceLocator(), - getString("_UI_Diagram_documentation_feature"), - getString("_UI_PropertyDescriptor_description", - "_UI_Diagram_documentation_feature", - "_UI_Diagram_type"), - DIPackage.Literals.DIAGRAM__DOCUMENTATION, true, false, - false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, - null, null)); + itemPropertyDescriptors.add + (createItemPropertyDescriptor + (((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(), + getResourceLocator(), + getString("_UI_Diagram_documentation_feature"), + getString("_UI_PropertyDescriptor_description", "_UI_Diagram_documentation_feature", "_UI_Diagram_type"), + DIPackage.Literals.DIAGRAM__DOCUMENTATION, + true, + false, + false, + ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, + null, + null)); } /** @@ -115,36 +119,40 @@ public class DiagramItemProvider extends ShapeItemProvider implements * @generated */ protected void addResolutionPropertyDescriptor(Object object) { - itemPropertyDescriptors.add(createItemPropertyDescriptor( - ((ComposeableAdapterFactory) adapterFactory) - .getRootAdapterFactory(), - getResourceLocator(), - getString("_UI_Diagram_resolution_feature"), - getString("_UI_PropertyDescriptor_description", - "_UI_Diagram_resolution_feature", "_UI_Diagram_type"), - DIPackage.Literals.DIAGRAM__RESOLUTION, true, false, false, - ItemPropertyDescriptor.REAL_VALUE_IMAGE, null, null)); + itemPropertyDescriptors.add + (createItemPropertyDescriptor + (((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(), + getResourceLocator(), + getString("_UI_Diagram_resolution_feature"), + getString("_UI_PropertyDescriptor_description", "_UI_Diagram_resolution_feature", "_UI_Diagram_type"), + DIPackage.Literals.DIAGRAM__RESOLUTION, + true, + false, + false, + ItemPropertyDescriptor.REAL_VALUE_IMAGE, + null, + null)); } /** - * This returns the label text for the adapted class. <!-- begin-user-doc + * This returns the label text for the adapted class. + * <!-- begin-user-doc * --> <!-- end-user-doc --> - * * @generated */ @Override public String getText(Object object) { - String label = ((Diagram) object).getName(); - return label == null || label.length() == 0 ? getString("_UI_Diagram_type") - : getString("_UI_Diagram_type") + " " + label; + String label = ((Diagram)object).getName(); + return label == null || label.length() == 0 ? + getString("_UI_Diagram_type") : + getString("_UI_Diagram_type") + " " + label; } /** - * 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 --> <!-- + * 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 @@ -152,12 +160,11 @@ public class DiagramItemProvider extends ShapeItemProvider implements updateChildren(notification); switch (notification.getFeatureID(Diagram.class)) { - case DIPackage.DIAGRAM__NAME: - case DIPackage.DIAGRAM__DOCUMENTATION: - case DIPackage.DIAGRAM__RESOLUTION: - fireNotifyChanged(new ViewerNotification(notification, - notification.getNotifier(), false, true)); - return; + case DIPackage.DIAGRAM__NAME: + case DIPackage.DIAGRAM__DOCUMENTATION: + case DIPackage.DIAGRAM__RESOLUTION: + fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), false, true)); + return; } super.notifyChanged(notification); } diff --git a/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/src/org/eclipse/papyrus/dd/di/provider/EdgeItemProvider.java b/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/src/org/eclipse/papyrus/dd/di/provider/EdgeItemProvider.java index f56e947ea40..28ffe59d6f0 100644 --- a/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/src/org/eclipse/papyrus/dd/di/provider/EdgeItemProvider.java +++ b/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/src/org/eclipse/papyrus/dd/di/provider/EdgeItemProvider.java @@ -34,10 +34,9 @@ import org.eclipse.papyrus.dd.di.DIPackage; import org.eclipse.papyrus.dd.di.Edge; /** - * This is the item provider adapter for a - * {@link org.eclipse.papyrus.dd.di.Edge} object. <!-- begin-user-doc --> <!-- + * This is the item provider adapter for a {@link org.eclipse.papyrus.dd.di.Edge} object. + * <!-- begin-user-doc --> <!-- * end-user-doc --> - * * @generated */ public class EdgeItemProvider extends DiagramElementItemProvider implements @@ -78,15 +77,19 @@ public class EdgeItemProvider extends DiagramElementItemProvider implements * @generated */ protected void addSourcePropertyDescriptor(Object object) { - itemPropertyDescriptors.add(createItemPropertyDescriptor( - ((ComposeableAdapterFactory) adapterFactory) - .getRootAdapterFactory(), - getResourceLocator(), - getString("_UI_Edge_source_feature"), - getString("_UI_PropertyDescriptor_description", - "_UI_Edge_source_feature", "_UI_Edge_type"), - DIPackage.Literals.EDGE__SOURCE, false, false, false, null, - null, null)); + itemPropertyDescriptors.add + (createItemPropertyDescriptor + (((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(), + getResourceLocator(), + getString("_UI_Edge_source_feature"), + getString("_UI_PropertyDescriptor_description", "_UI_Edge_source_feature", "_UI_Edge_type"), + DIPackage.Literals.EDGE__SOURCE, + false, + false, + false, + null, + null, + null)); } /** @@ -96,25 +99,26 @@ public class EdgeItemProvider extends DiagramElementItemProvider implements * @generated */ protected void addTargetPropertyDescriptor(Object object) { - itemPropertyDescriptors.add(createItemPropertyDescriptor( - ((ComposeableAdapterFactory) adapterFactory) - .getRootAdapterFactory(), - getResourceLocator(), - getString("_UI_Edge_target_feature"), - getString("_UI_PropertyDescriptor_description", - "_UI_Edge_target_feature", "_UI_Edge_type"), - DIPackage.Literals.EDGE__TARGET, false, false, false, null, - null, null)); + itemPropertyDescriptors.add + (createItemPropertyDescriptor + (((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(), + getResourceLocator(), + getString("_UI_Edge_target_feature"), + getString("_UI_PropertyDescriptor_description", "_UI_Edge_target_feature", "_UI_Edge_type"), + DIPackage.Literals.EDGE__TARGET, + false, + false, + false, + null, + 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}, - * {@link org.eclipse.emf.edit.command.RemoveCommand} or - * {@link org.eclipse.emf.edit.command.MoveCommand} in - * {@link #createCommand}. <!-- begin-user-doc --> <!-- end-user-doc --> - * + * This specifies how to implement {@link #getChildren} and is used to deduce an appropriate feature for an + * {@link org.eclipse.emf.edit.command.AddCommand}, {@link org.eclipse.emf.edit.command.RemoveCommand} or + * {@link org.eclipse.emf.edit.command.MoveCommand} in {@link #createCommand}. + * <!-- begin-user-doc --> <!-- end-user-doc --> * @generated */ @Override @@ -129,22 +133,20 @@ public class EdgeItemProvider extends DiagramElementItemProvider implements /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ @Override protected EStructuralFeature getChildFeature(Object object, Object child) { - // Check the type of the specified child object and return the proper - // feature to use for + // Check the type of the specified child object and return the proper feature to use for // adding (see {@link AddCommand}) it as a child. return super.getChildFeature(object, child); } /** - * This returns the label text for the adapted class. <!-- begin-user-doc + * This returns the label text for the adapted class. + * <!-- begin-user-doc * --> <!-- end-user-doc --> - * * @generated */ @Override @@ -153,11 +155,10 @@ public class EdgeItemProvider extends DiagramElementItemProvider implements } /** - * 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 --> <!-- + * 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 @@ -165,10 +166,9 @@ public class EdgeItemProvider extends DiagramElementItemProvider implements updateChildren(notification); switch (notification.getFeatureID(Edge.class)) { - case DIPackage.EDGE__WAYPOINT: - fireNotifyChanged(new ViewerNotification(notification, - notification.getNotifier(), true, false)); - return; + case DIPackage.EDGE__WAYPOINT: + fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), true, false)); + return; } super.notifyChanged(notification); } @@ -185,9 +185,10 @@ public class EdgeItemProvider extends DiagramElementItemProvider implements Collection<Object> newChildDescriptors, Object object) { super.collectNewChildDescriptors(newChildDescriptors, object); - newChildDescriptors.add(createChildParameter( - DIPackage.Literals.EDGE__WAYPOINT, - DCFactory.eINSTANCE.createPoint())); + newChildDescriptors.add + (createChildParameter + (DIPackage.Literals.EDGE__WAYPOINT, + DCFactory.eINSTANCE.createPoint())); } } diff --git a/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/src/org/eclipse/papyrus/dd/di/provider/ShapeItemProvider.java b/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/src/org/eclipse/papyrus/dd/di/provider/ShapeItemProvider.java index 0a0e53637c6..ca1ee4f456c 100644 --- a/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/src/org/eclipse/papyrus/dd/di/provider/ShapeItemProvider.java +++ b/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/src/org/eclipse/papyrus/dd/di/provider/ShapeItemProvider.java @@ -33,10 +33,9 @@ import org.eclipse.papyrus.dd.di.DIPackage; import org.eclipse.papyrus.dd.di.Shape; /** - * This is the item provider adapter for a - * {@link org.eclipse.papyrus.dd.di.Shape} object. <!-- begin-user-doc --> <!-- + * This is the item provider adapter for a {@link org.eclipse.papyrus.dd.di.Shape} object. + * <!-- begin-user-doc --> <!-- * end-user-doc --> - * * @generated */ public class ShapeItemProvider extends DiagramElementItemProvider implements @@ -69,13 +68,10 @@ public class ShapeItemProvider extends DiagramElementItemProvider implements } /** - * This specifies how to implement {@link #getChildren} and is used to - * deduce an appropriate feature for an - * {@link org.eclipse.emf.edit.command.AddCommand}, - * {@link org.eclipse.emf.edit.command.RemoveCommand} or - * {@link org.eclipse.emf.edit.command.MoveCommand} in - * {@link #createCommand}. <!-- begin-user-doc --> <!-- end-user-doc --> - * + * This specifies how to implement {@link #getChildren} and is used to deduce an appropriate feature for an + * {@link org.eclipse.emf.edit.command.AddCommand}, {@link org.eclipse.emf.edit.command.RemoveCommand} or + * {@link org.eclipse.emf.edit.command.MoveCommand} in {@link #createCommand}. + * <!-- begin-user-doc --> <!-- end-user-doc --> * @generated */ @Override @@ -90,22 +86,20 @@ public class ShapeItemProvider extends DiagramElementItemProvider implements /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ @Override protected EStructuralFeature getChildFeature(Object object, Object child) { - // Check the type of the specified child object and return the proper - // feature to use for + // Check the type of the specified child object and return the proper feature to use for // adding (see {@link AddCommand}) it as a child. return super.getChildFeature(object, child); } /** - * This returns the label text for the adapted class. <!-- begin-user-doc + * This returns the label text for the adapted class. + * <!-- begin-user-doc * --> <!-- end-user-doc --> - * * @generated */ @Override @@ -114,11 +108,10 @@ public class ShapeItemProvider extends DiagramElementItemProvider implements } /** - * 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 --> <!-- + * 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 @@ -126,10 +119,9 @@ public class ShapeItemProvider extends DiagramElementItemProvider implements updateChildren(notification); switch (notification.getFeatureID(Shape.class)) { - case DIPackage.SHAPE__BOUNDS: - fireNotifyChanged(new ViewerNotification(notification, - notification.getNotifier(), true, false)); - return; + case DIPackage.SHAPE__BOUNDS: + fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), true, false)); + return; } super.notifyChanged(notification); } @@ -146,9 +138,10 @@ public class ShapeItemProvider extends DiagramElementItemProvider implements Collection<Object> newChildDescriptors, Object object) { super.collectNewChildDescriptors(newChildDescriptors, object); - newChildDescriptors.add(createChildParameter( - DIPackage.Literals.SHAPE__BOUNDS, - DCFactory.eINSTANCE.createBounds())); + newChildDescriptors.add + (createChildParameter + (DIPackage.Literals.SHAPE__BOUNDS, + DCFactory.eINSTANCE.createBounds())); } } diff --git a/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/src/org/eclipse/papyrus/dd/di/provider/StyleItemProvider.java b/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/src/org/eclipse/papyrus/dd/di/provider/StyleItemProvider.java index 56bc0c796e6..72b98c6d3d4 100644 --- a/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/src/org/eclipse/papyrus/dd/di/provider/StyleItemProvider.java +++ b/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/src/org/eclipse/papyrus/dd/di/provider/StyleItemProvider.java @@ -30,10 +30,9 @@ import org.eclipse.emf.edit.provider.ItemProviderAdapter; import org.eclipse.papyrus.dd.edit.DDEditPlugin; /** - * This is the item provider adapter for a - * {@link org.eclipse.papyrus.dd.di.Style} object. <!-- begin-user-doc --> <!-- + * This is the item provider adapter for a {@link org.eclipse.papyrus.dd.di.Style} object. + * <!-- begin-user-doc --> <!-- * end-user-doc --> - * * @generated */ public class StyleItemProvider extends ItemProviderAdapter implements @@ -66,9 +65,9 @@ public class StyleItemProvider extends ItemProviderAdapter implements } /** - * This returns the label text for the adapted class. <!-- begin-user-doc + * This returns the label text for the adapted class. + * <!-- begin-user-doc * --> <!-- end-user-doc --> - * * @generated */ @Override @@ -77,11 +76,10 @@ public class StyleItemProvider extends ItemProviderAdapter implements } /** - * 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 --> <!-- + * 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 diff --git a/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/src/org/eclipse/papyrus/dd/edit/DDEditPlugin.java b/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/src/org/eclipse/papyrus/dd/edit/DDEditPlugin.java index c6a074ecfd4..ca8f65e4b9c 100644 --- a/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/src/org/eclipse/papyrus/dd/edit/DDEditPlugin.java +++ b/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/src/org/eclipse/papyrus/dd/edit/DDEditPlugin.java @@ -17,9 +17,9 @@ import org.eclipse.emf.common.util.ResourceLocator; import org.eclipse.emf.ecore.provider.EcoreEditPlugin; /** - * This is the central singleton for the DI edit plugin. <!-- begin-user-doc --> + * This is the central singleton for the DI edit plugin. + * <!-- begin-user-doc --> * <!-- end-user-doc --> - * * @generated */ public final class DDEditPlugin extends EMFPlugin { @@ -50,9 +50,9 @@ public final class DDEditPlugin extends EMFPlugin { } /** - * Returns the singleton instance of the Eclipse plugin. <!-- begin-user-doc + * Returns the singleton instance of the Eclipse plugin. + * <!-- begin-user-doc * --> <!-- end-user-doc --> - * * @return the singleton instance. * @generated */ @@ -62,9 +62,9 @@ public final class DDEditPlugin extends EMFPlugin { } /** - * Returns the singleton instance of the Eclipse plugin. <!-- begin-user-doc + * Returns the singleton instance of the Eclipse plugin. + * <!-- begin-user-doc * --> <!-- end-user-doc --> - * * @return the singleton instance. * @generated */ @@ -81,8 +81,8 @@ public final class DDEditPlugin extends EMFPlugin { public static class Implementation extends EclipsePlugin { /** - * Creates an instance. <!-- begin-user-doc --> <!-- end-user-doc --> - * + * Creates an instance. + * <!-- begin-user-doc --> <!-- end-user-doc --> * @generated */ public Implementation() { diff --git a/extraplugins/diagram-definition/org.eclipse.papyrus.dd.editor/.classpath b/extraplugins/diagram-definition/org.eclipse.papyrus.dd.editor/.classpath index 9481d159a68..75cac54c4de 100644 --- a/extraplugins/diagram-definition/org.eclipse.papyrus.dd.editor/.classpath +++ b/extraplugins/diagram-definition/org.eclipse.papyrus.dd.editor/.classpath @@ -11,19 +11,19 @@ <classpathentry exported="true" kind="lib" path="batik-1.7/batik.jar"/> <classpathentry exported="true" kind="lib" path="batik-1.7/lib/batik-anim.jar"/> <classpathentry exported="true" kind="lib" path="batik-1.7/lib/batik-awt-util.jar"/> - <classpathentry exported="true" kind="lib" path="batik-1.7/lib/batik-bridge.jar"/> + <classpathentry exported="true" kind="lib" path="batik-1.7/lib/batik-bridge.jar" sourcepath="/Users/magedelaasar/Downloads/batik-1.7/sources"/> <classpathentry exported="true" kind="lib" path="batik-1.7/lib/batik-codec.jar"/> <classpathentry exported="true" kind="lib" path="batik-1.7/lib/batik-css.jar"/> - <classpathentry exported="true" kind="lib" path="batik-1.7/lib/batik-dom.jar"/> + <classpathentry exported="true" kind="lib" path="batik-1.7/lib/batik-dom.jar" sourcepath="/Users/magedelaasar/Downloads/batik-1.7/sources"/> <classpathentry exported="true" kind="lib" path="batik-1.7/lib/batik-ext.jar"/> <classpathentry exported="true" kind="lib" path="batik-1.7/lib/batik-extension.jar"/> <classpathentry exported="true" kind="lib" path="batik-1.7/lib/batik-gui-util.jar"/> <classpathentry exported="true" kind="lib" path="batik-1.7/lib/batik-gvt.jar"/> <classpathentry exported="true" kind="lib" path="batik-1.7/lib/batik-parser.jar"/> <classpathentry exported="true" kind="lib" path="batik-1.7/lib/batik-script.jar"/> - <classpathentry exported="true" kind="lib" path="batik-1.7/lib/batik-svg-dom.jar"/> + <classpathentry exported="true" kind="lib" path="batik-1.7/lib/batik-svg-dom.jar" sourcepath="/Users/magedelaasar/Downloads/batik-1.7/sources"/> <classpathentry exported="true" kind="lib" path="batik-1.7/lib/batik-svggen.jar"/> - <classpathentry exported="true" kind="lib" path="batik-1.7/lib/batik-swing.jar"/> + <classpathentry exported="true" kind="lib" path="batik-1.7/lib/batik-swing.jar" sourcepath="/Users/magedelaasar/Downloads/batik-1.7/sources"/> <classpathentry exported="true" kind="lib" path="batik-1.7/lib/batik-transcoder.jar"/> <classpathentry exported="true" kind="lib" path="batik-1.7/lib/batik-util.jar"/> <classpathentry exported="true" kind="lib" path="batik-1.7/lib/batik-xml.jar"/> diff --git a/extraplugins/diagram-definition/org.eclipse.papyrus.dd.editor/src/org/eclipse/papyrus/dd/dg/editor/DGSVGCanvasPage.java b/extraplugins/diagram-definition/org.eclipse.papyrus.dd.editor/src/org/eclipse/papyrus/dd/dg/editor/DGSVGCanvasPage.java index 36c04860673..3250c011374 100644 --- a/extraplugins/diagram-definition/org.eclipse.papyrus.dd.editor/src/org/eclipse/papyrus/dd/dg/editor/DGSVGCanvasPage.java +++ b/extraplugins/diagram-definition/org.eclipse.papyrus.dd.editor/src/org/eclipse/papyrus/dd/dg/editor/DGSVGCanvasPage.java @@ -15,7 +15,6 @@ import java.awt.Color; import java.awt.EventQueue; import java.awt.Frame; -import org.apache.batik.dom.svg.SVGOMDocument; import org.apache.batik.swing.JSVGCanvas; import org.eclipse.emf.ecore.resource.Resource; import org.eclipse.emf.edit.domain.EditingDomain; @@ -68,7 +67,7 @@ public class DGSVGCanvasPage extends DDEditorPage { .get(0); // (re)generate the SVG document - SVGOMDocument svgDocument = getConverter().convert(resource); + Document svgDocument = getConverter().convert(resource); // update the input of the viewer viewer.setInput(svgDocument); diff --git a/extraplugins/diagram-definition/org.eclipse.papyrus.dd.editor/src/org/eclipse/papyrus/dd/dg/editor/DGSVGSourcePage.java b/extraplugins/diagram-definition/org.eclipse.papyrus.dd.editor/src/org/eclipse/papyrus/dd/dg/editor/DGSVGSourcePage.java index af901db0265..71b381c9e20 100644 --- a/extraplugins/diagram-definition/org.eclipse.papyrus.dd.editor/src/org/eclipse/papyrus/dd/dg/editor/DGSVGSourcePage.java +++ b/extraplugins/diagram-definition/org.eclipse.papyrus.dd.editor/src/org/eclipse/papyrus/dd/dg/editor/DGSVGSourcePage.java @@ -14,7 +14,7 @@ package org.eclipse.papyrus.dd.dg.editor; import java.io.StringReader; import java.io.StringWriter; -import org.apache.batik.dom.svg.SVGOMDocument; +import org.apache.batik.dom.GenericDOMImplementation; import org.apache.batik.dom.util.DOMUtilities; import org.apache.batik.transcoder.svg2svg.PrettyPrinter; import org.eclipse.emf.ecore.resource.Resource; @@ -27,6 +27,7 @@ import org.eclipse.papyrus.dd.editor.DDEditorPage; import org.eclipse.papyrus.dd.editor.DDEditorPlugin; import org.eclipse.swt.SWT; import org.eclipse.swt.widgets.Composite; +import org.w3c.dom.DOMImplementation; /** * This is a page that shows the source of the corresponding SVG for a DG model @@ -68,25 +69,29 @@ public class DGSVGSourcePage extends DDEditorPage { .get(0); // (re)generate the SVG document - SVGOMDocument svgDocument = getConverter().convert(resource); + org.w3c.dom.Document svgDocument = getConverter().convert(resource); - StringWriter out = new StringWriter(); + String contents; try { StringWriter writer = new StringWriter(); DOMUtilities.writeDocument(svgDocument, writer); - writer.close(); + + StringWriter formatted = new StringWriter(); PrettyPrinter printer = new PrettyPrinter(); printer.setTabulationWidth(4); printer.setDocumentWidth(2000); - printer.print(new StringReader(writer.toString()), out); - out.close(); + printer.print(new StringReader(writer.toString()), formatted); + + contents = formatted.toString().substring(1); + writer.close(); } catch (Exception e) { DDEditorPlugin.INSTANCE.log(e); + return; } // update the input of the viewer IDocument document = new Document(); - document.set(out.toString().substring(1)); + document.set(contents); viewer.setDocument(document); } @@ -96,7 +101,12 @@ public class DGSVGSourcePage extends DDEditorPage { * @return DGToSVGConverter */ protected DGToSVGConverter getConverter() { - return new DGToSVGConverter(); + return new DGToSVGConverter() { + @Override + protected DOMImplementation getDOMImplementation() { + return GenericDOMImplementation.getDOMImplementation(); + } + }; } } diff --git a/extraplugins/diagram-definition/org.eclipse.papyrus.dd.editor/src/org/eclipse/papyrus/dd/dg/editor/DGToSVGConverter.java b/extraplugins/diagram-definition/org.eclipse.papyrus.dd.editor/src/org/eclipse/papyrus/dd/dg/editor/DGToSVGConverter.java index b8cb6899711..e5801cb11d8 100644 --- a/extraplugins/diagram-definition/org.eclipse.papyrus.dd.editor/src/org/eclipse/papyrus/dd/dg/editor/DGToSVGConverter.java +++ b/extraplugins/diagram-definition/org.eclipse.papyrus.dd.editor/src/org/eclipse/papyrus/dd/dg/editor/DGToSVGConverter.java @@ -12,16 +12,13 @@ package org.eclipse.papyrus.dd.dg.editor; import java.awt.Color; -import java.net.URL; -import java.text.DecimalFormat; import java.util.HashMap; import java.util.Map; import org.apache.batik.dom.svg.SVGDOMImplementation; -import org.apache.batik.dom.svg.SVGOMDocument; import org.apache.batik.svggen.SVGSyntax; import org.eclipse.emf.common.util.TreeIterator; -import org.eclipse.emf.ecore.EClass; +import org.eclipse.emf.common.util.URI; import org.eclipse.emf.ecore.EObject; import org.eclipse.emf.ecore.resource.Resource; import org.eclipse.emf.ecore.util.EcoreUtil; @@ -38,7 +35,7 @@ import org.eclipse.papyrus.dd.dg.DGPackage; import org.eclipse.papyrus.dd.dg.Definition; import org.eclipse.papyrus.dd.dg.Definitions; import org.eclipse.papyrus.dd.dg.Ellipse; -import org.eclipse.papyrus.dd.dg.EllipticalCurveTo; +import org.eclipse.papyrus.dd.dg.EllipticalArcTo; import org.eclipse.papyrus.dd.dg.FontDecoration; import org.eclipse.papyrus.dd.dg.Gradient; import org.eclipse.papyrus.dd.dg.GradientStop; @@ -75,10 +72,10 @@ import org.eclipse.papyrus.dd.dg.Transform; import org.eclipse.papyrus.dd.dg.Translate; import org.eclipse.papyrus.dd.dg.Use; import org.eclipse.papyrus.dd.dg.util.DGSwitch; -import org.eclipse.papyrus.dd.editor.DDEditorPlugin; import org.w3c.dom.DOMImplementation; +import org.w3c.dom.Document; import org.w3c.dom.Element; -import org.w3c.dom.svg.SVGTextElement; +import org.w3c.dom.ProcessingInstruction; /** * This class converts a DG model resource into a SVG document @@ -111,9 +108,14 @@ public class DGToSVGConverter extends DGSwitch<Object> implements SVGSyntax { public static final String SVG_MARKER_END_ATTRIBUTE = "marker-end"; /** + * This is the DG model resource + */ + private Resource resource; + + /** * This is the created SVG document */ - private SVGOMDocument svgDocument; + private Document svgDocument; /** * This is a cache used in the conversion process @@ -134,19 +136,21 @@ public class DGToSVGConverter extends DGSwitch<Object> implements SVGSyntax { * The DG model resource * @return The SVG document */ - public SVGOMDocument convert(Resource resource) { + public Document convert(Resource resource) { if (resource == null) return null; + // set the DG model resource + this.resource = resource; + // create a new SVG document - final DOMImplementation impl = SVGDOMImplementation - .getDOMImplementation(); - svgDocument = (SVGOMDocument) impl.createDocument(SVG_NAMESPACE_URI, + final DOMImplementation impl = getDOMImplementation(); + svgDocument = (Document) impl.createDocument(SVG_NAMESPACE_URI, SVG_SVG_TAG, null); // establish a base URL for the SVG document to resolve relative links - URL url = DDEditorPlugin.getPlugin().getBundle().getEntry("/svg"); - svgDocument.setURLObject(url); + // URL url = DDEditorPlugin.getPlugin().getBundle().getEntry("/svg"); + svgDocument.setDocumentURI(resource.getURI().toString()); // iterate over all contents and convert them for (TreeIterator<EObject> iterator = EcoreUtil.getAllContents( @@ -157,6 +161,13 @@ public class DGToSVGConverter extends DGSwitch<Object> implements SVGSyntax { } /** + * @return an instance of the DOM Implementation + */ + protected DOMImplementation getDOMImplementation() { + return SVGDOMImplementation.getDOMImplementation(); + } + + /** * Converts a <code>Color</code> to a string * * @param c @@ -175,20 +186,35 @@ public class DGToSVGConverter extends DGSwitch<Object> implements SVGSyntax { * The double value * @return The string encoding of the double */ - protected static String convertDoubleToString(Double d) { - DecimalFormat f = new DecimalFormat("#.00"); - return f.format(d); + protected String convertDoubleToString(Double d) { + return String.valueOf(d); } /** - * Converts a <code>Double</code> to a string + * Converts a <code>Reference</code> to a URI string * - * @param d - * The double value - * @return The string encoding of the double + * @param reference + * The EObject reference + * @return The URI encoding of the reference */ - protected static String convertReferenceToURI(EObject reference) { - return "url(" + EcoreUtil.getURI(reference) + ")"; + protected String convertReferenceToURI(EObject referenced) { + Resource referencedResource = referenced.eResource(); + URI uri = referencedResource.getURI(); + String uriFragment = referencedResource.getURIFragment(referenced); + if (resource.equals(referencedResource)) + return '#' + uriFragment; + return uri.appendFragment(uriFragment).toString(); + } + + /** + * Converts a <code>Reference</code> to a URL string + * + * @param reference + * The EObject reference + * @return The URL encoding of the reference + */ + protected String convertReferenceToURL(EObject reference) { + return "url(" + convertReferenceToURI(reference) + ")"; } /** @@ -287,9 +313,8 @@ public class DGToSVGConverter extends DGSwitch<Object> implements SVGSyntax { convertDoubleToString(center.getY())); } - if (object.eIsSet(DGPackage.Literals.CIRCLE__RADIUS)) - circle.setAttribute(SVG_R_ATTRIBUTE, - convertDoubleToString(object.getRadius())); + circle.setAttribute(SVG_R_ATTRIBUTE, + convertDoubleToString(object.getRadius())); return super.caseCircle(object); } @@ -300,6 +325,9 @@ public class DGToSVGConverter extends DGSwitch<Object> implements SVGSyntax { SVG_NAMESPACE_URI, SVG_CLIP_PATH_TAG)); getParentElement(object).appendChild(clipPath); + clipPath.setAttribute(SVG_CLIP_PATH_UNITS_ATTRIBUTE, + SVG_OBJECT_BOUNDING_BOX_VALUE); + return super.caseClipPath(object); } @@ -321,19 +349,22 @@ public class DGToSVGConverter extends DGSwitch<Object> implements SVGSyntax { Point start = object.getStartControl(); sb.append(convertDoubleToString(start.getX()) + "," + convertDoubleToString(start.getY())); - } + } else + sb.append("0.0,0.0"); sb.append(" "); if (object.getEndControl() != null) { Point end = object.getEndControl(); sb.append(convertDoubleToString(end.getX()) + "," + convertDoubleToString(end.getY())); - } + } else + sb.append("0.0,0.0"); sb.append(" "); if (object.getPoint() != null) { Point point = object.getPoint(); sb.append(convertDoubleToString(point.getX()) + "," + convertDoubleToString(point.getY())); - } + } else + sb.append("0.0,0.0"); return super.caseCubicCurveTo(object); } @@ -371,24 +402,25 @@ public class DGToSVGConverter extends DGSwitch<Object> implements SVGSyntax { convertDoubleToString(center.getX())); if (center.eIsSet(DCPackage.Literals.POINT__Y)) ellipse.setAttribute(SVG_CY_ATTRIBUTE, - convertDoubleToString(center.getX())); + convertDoubleToString(center.getY())); } if (object.getRadii() != null) { Dimension radii = object.getRadii(); - if (radii.eIsSet(DCPackage.Literals.DIMENSION__WIDTH)) - ellipse.setAttribute(SVG_RX_ATTRIBUTE, - convertDoubleToString(radii.getWidth())); - if (radii.eIsSet(DCPackage.Literals.DIMENSION__HEIGHT)) - ellipse.setAttribute(SVG_RY_ATTRIBUTE, - convertDoubleToString(radii.getHeight())); + ellipse.setAttribute(SVG_RX_ATTRIBUTE, + convertDoubleToString(radii.getWidth())); + ellipse.setAttribute(SVG_RY_ATTRIBUTE, + convertDoubleToString(radii.getHeight())); + } else { + ellipse.setAttribute(SVG_RX_ATTRIBUTE, "0.0"); + ellipse.setAttribute(SVG_RY_ATTRIBUTE, "0.0"); } return super.caseEllipse(object); } @Override - public Object caseEllipticalCurveTo(EllipticalCurveTo object) { + public Object caseEllipticalArcTo(EllipticalArcTo object) { StringBuffer sb = map(object, new StringBuffer()); sb.append(object.isRelative() ? "a" : "A"); @@ -396,7 +428,8 @@ public class DGToSVGConverter extends DGSwitch<Object> implements SVGSyntax { Dimension radii = object.getRadii(); sb.append(convertDoubleToString(radii.getWidth()) + "," + convertDoubleToString(radii.getHeight())); - } + } else + sb.append("0.0,0.0"); sb.append(" "); sb.append(convertDoubleToString(object.getRotation())); sb.append(" "); @@ -408,13 +441,28 @@ public class DGToSVGConverter extends DGSwitch<Object> implements SVGSyntax { Point point = object.getPoint(); sb.append(convertDoubleToString(point.getX()) + "," + convertDoubleToString(point.getY())); - } + } else + sb.append("0.0,0.0"); return super.casePathCommand(object); } @Override public Object caseGradient(Gradient object) { + Element gradient = (Element) lookup(object); + + if (gradient != null) { + if (object.getTransforms().size() > 0) { + String transforms = ""; + for (Transform transform : object.getTransforms()) { + transforms += (transforms.length() > 0) ? " " : ""; + transforms += (String) doSwitch(transform); + } + gradient.setAttribute(SVG_GRADIENT_TRANSFORM_ATTRIBUTE, + transforms); + } + } + return super.caseGradient(object); } @@ -426,7 +474,7 @@ public class DGToSVGConverter extends DGSwitch<Object> implements SVGSyntax { if (object.eIsSet(DGPackage.Literals.GRADIENT_STOP__OFFSET)) stop.setAttribute(SVG_OFFSET_ATTRIBUTE, - convertDoubleToString(object.getOpacity())); + convertDoubleToString(object.getOffset()) + "%"); if (object.eIsSet(DGPackage.Literals.GRADIENT_STOP__COLOR)) stop.setAttribute(SVG_STOP_COLOR_ATTRIBUTE, @@ -444,18 +492,33 @@ public class DGToSVGConverter extends DGSwitch<Object> implements SVGSyntax { Element element = (Element) lookup(object); if (element != null) { - String keywords = ""; - for (String keyword : object.getKeyword()) { - keywords += (keywords.length() > 0) ? ", " : ""; - keywords += keyword; + if (object.getClasses().size() > 0) { + String classes = ""; + for (String class_ : object.getClasses()) { + classes += (classes.length() > 0) ? ", " : ""; + classes += class_; + } + element.setAttribute(SVG_CLASS_ATTRIBUTE, classes); } - if (keywords.length() > 0) - element.setAttribute(SVG_CLASS_ATTRIBUTE, keywords); if (object.getStyle() != null) { String value = (String) doSwitch(object.getStyle()); element.setAttribute(SVG_STYLE_ATTRIBUTE, value); } + + if (object.getClipPath() != null) { + element.setAttribute(SVG_CLIP_PATH_ATTRIBUTE, + convertReferenceToURL(object.getClipPath())); + } + + if (object.getTransforms().size() > 0) { + String transforms = ""; + for (Transform transform : object.getTransforms()) { + transforms += (transforms.length() > 0) ? " " : ""; + transforms += (String) doSwitch(transform); + } + element.setAttribute(SVG_TRANSFORM_ATTRIBUTE, transforms); + } } return super.caseGraphicalElement(object); @@ -488,23 +551,25 @@ public class DGToSVGConverter extends DGSwitch<Object> implements SVGSyntax { if (bounds.eIsSet(DCPackage.Literals.BOUNDS__Y)) image.setAttribute(SVG_Y_ATTRIBUTE, convertDoubleToString(bounds.getY())); - if (bounds.eIsSet(DCPackage.Literals.BOUNDS__WIDTH)) - image.setAttribute(SVG_WIDTH_ATTRIBUTE, - convertDoubleToString(bounds.getWidth())); - if (bounds.eIsSet(DCPackage.Literals.BOUNDS__HEIGHT)) - image.setAttribute(SVG_HEIGHT_ATTRIBUTE, - convertDoubleToString(bounds.getHeight())); + image.setAttribute(SVG_WIDTH_ATTRIBUTE, + convertDoubleToString(bounds.getWidth())); + image.setAttribute(SVG_HEIGHT_ATTRIBUTE, + convertDoubleToString(bounds.getHeight())); + } else { + image.setAttribute(SVG_WIDTH_ATTRIBUTE, "0.0"); + image.setAttribute(SVG_HEIGHT_ATTRIBUTE, "0.0"); } - if (object.getSource() != null) { - image.setAttribute(XLINK_HREF_ATTRIBUTE, object.getSource()); - } + if (object.getSource() != null && object.getSource().length() > 0) + image.setAttributeNS(XLINK_NAMESPACE_URI, XLINK_HREF_QNAME, + object.getSource()); + else + image.setAttributeNS(XLINK_NAMESPACE_URI, XLINK_HREF_QNAME, + "http://missing.reference"); - if (object.eIsSet(DGPackage.Literals.IMAGE__IS_ASPECT_RATIO_PRESERVED)) { - String preserve = object.isAspectRatioPreserved() ? "xMidYMid meet" - : "none"; - image.setAttribute(SVG_PRESERVE_ASPECT_RATIO_ATTRIBUTE, preserve); - } + String preserve = object.isAspectRatioPreserved() ? "xMidYMid meet" + : "none"; + image.setAttribute(SVG_PRESERVE_ASPECT_RATIO_ATTRIBUTE, preserve); return super.caseImage(object); } @@ -544,24 +609,27 @@ public class DGToSVGConverter extends DGSwitch<Object> implements SVGSyntax { SVG_NAMESPACE_URI, SVG_LINEAR_GRADIENT_TAG)); getParentElement(object).appendChild(gradient); + gradient.setAttribute(SVG_GRADIENT_UNITS_ATTRIBUTE, + SVG_OBJECT_BOUNDING_BOX_VALUE); + if (object.getStart() != null) { Point start = object.getStart(); if (start.eIsSet(DCPackage.Literals.POINT__X)) gradient.setAttribute(SVG_X1_ATTRIBUTE, - convertDoubleToString(start.getX())); + convertDoubleToString(start.getX()) + "%"); if (start.eIsSet(DCPackage.Literals.POINT__Y)) gradient.setAttribute(SVG_Y1_ATTRIBUTE, - convertDoubleToString(start.getY())); + convertDoubleToString(start.getY()) + "%"); } if (object.getEnd() != null) { Point end = object.getEnd(); if (end.eIsSet(DCPackage.Literals.POINT__X)) gradient.setAttribute(SVG_X2_ATTRIBUTE, - convertDoubleToString(end.getX())); + convertDoubleToString(end.getX()) + "%"); if (end.eIsSet(DCPackage.Literals.POINT__Y)) gradient.setAttribute(SVG_Y2_ATTRIBUTE, - convertDoubleToString(end.getY())); + convertDoubleToString(end.getY()) + "%"); } return super.caseLinearGradient(object); @@ -576,7 +644,8 @@ public class DGToSVGConverter extends DGSwitch<Object> implements SVGSyntax { Point point = object.getPoint(); sb.append(convertDoubleToString(point.getX()) + "," + convertDoubleToString(point.getY())); - } + } else + sb.append("0.0,0.0"); return super.caseLineTo(object); } @@ -588,13 +657,13 @@ public class DGToSVGConverter extends DGSwitch<Object> implements SVGSyntax { if (element != null) { if (object.getStartMarker() != null) element.setAttribute(SVG_MARKER_START_ATTRIBUTE, - convertReferenceToURI(object.getStartMarker())); + convertReferenceToURL(object.getStartMarker())); if (object.getMidMarker() != null) element.setAttribute(SVG_MARKER_MID_ATTRIBUTE, - convertReferenceToURI(object.getMidMarker())); + convertReferenceToURL(object.getMidMarker())); if (object.getEndMarker() != null) element.setAttribute(SVG_MARKER_END_ATTRIBUTE, - convertReferenceToURI(object.getEndMarker())); + convertReferenceToURL(object.getEndMarker())); } return super.caseMarkedElement(object); @@ -606,12 +675,50 @@ public class DGToSVGConverter extends DGSwitch<Object> implements SVGSyntax { svgDocument.createElementNS(SVG_NAMESPACE_URI, SVG_MARKER_TAG)); getParentElement(object).appendChild(marker); + marker.setAttribute(SVG_MARKER_UNITS_ATTRIBUTE, SVG_STROKE_WIDTH_VALUE); + marker.setAttribute(SVG_ORIENT_ATTRIBUTE, SVG_AUTO_VALUE); + + if (object.getSize() != null) { + Dimension size = object.getSize(); + if (size.eIsSet(DCPackage.Literals.DIMENSION__WIDTH)) + marker.setAttribute(SVG_MARKER_WIDTH_ATTRIBUTE, + convertDoubleToString(size.getWidth())); + if (size.eIsSet(DCPackage.Literals.DIMENSION__HEIGHT)) + marker.setAttribute(SVG_MARKER_HEIGHT_ATTRIBUTE, + convertDoubleToString(size.getHeight())); + } + + if (object.getReference() != null) { + Point reference = object.getReference(); + if (reference.eIsSet(DCPackage.Literals.POINT__X)) + marker.setAttribute(SVG_REF_X_ATTRIBUTE, + convertDoubleToString(reference.getX())); + if (reference.eIsSet(DCPackage.Literals.POINT__Y)) + marker.setAttribute(SVG_REF_Y_ATTRIBUTE, + convertDoubleToString(reference.getY())); + } + return super.caseMarker(object); } @Override public Object caseMatrix(Matrix object) { - // TODO Auto-generated method stub + StringBuffer sb = map(object, new StringBuffer()); + + sb.append("matrix("); + sb.append(convertDoubleToString(object.getA())); + sb.append(", "); + sb.append(convertDoubleToString(object.getB())); + sb.append(", "); + sb.append(convertDoubleToString(object.getC())); + sb.append(", "); + sb.append(convertDoubleToString(object.getD())); + sb.append(", "); + sb.append(convertDoubleToString(object.getE())); + sb.append(", "); + sb.append(convertDoubleToString(object.getF())); + sb.append(")"); + return super.caseMatrix(object); } @@ -624,7 +731,8 @@ public class DGToSVGConverter extends DGSwitch<Object> implements SVGSyntax { Point point = object.getPoint(); sb.append(convertDoubleToString(point.getX()) + "," + convertDoubleToString(point.getY())); - } + } else + sb.append("0.0,0.0"); return super.caseMoveTo(object); } @@ -636,14 +744,15 @@ public class DGToSVGConverter extends DGSwitch<Object> implements SVGSyntax { if (object.eIsSet(DGPackage.Literals.PAINT__COLOR)) sb.append(convertColorToString(object.getColor())); else if (object.getPaintServer() != null) - sb.append(convertReferenceToURI(object.getPaintServer())); + sb.append(convertReferenceToURL(object.getPaintServer())); + else + sb.append("none"); return super.casePaint(object); } @Override public Object casePaintServer(PaintServer object) { - // TODO Auto-generated method stub return super.casePaintServer(object); } @@ -653,13 +762,15 @@ public class DGToSVGConverter extends DGSwitch<Object> implements SVGSyntax { svgDocument.createElementNS(SVG_NAMESPACE_URI, SVG_PATH_TAG)); getParentElement(object).appendChild(path); - StringBuffer sb = new StringBuffer(); - for (PathCommand command : object.getCommand()) { - String c = (String) doSwitch(command); - sb.append(sb.length() > 0 ? " " : ""); - sb.append(c); + if (!object.getCommands().isEmpty()) { + StringBuffer sb = new StringBuffer(); + for (PathCommand command : object.getCommands()) { + String c = (String) doSwitch(command); + sb.append(sb.length() > 0 ? " " : ""); + sb.append(c); + } + path.setAttribute(SVG_D_ATTRIBUTE, sb.toString()); } - path.setAttribute(SVG_D_ATTRIBUTE, sb.toString()); return super.casePath(object); } @@ -671,7 +782,38 @@ public class DGToSVGConverter extends DGSwitch<Object> implements SVGSyntax { @Override public Object casePattern(Pattern object) { - // TODO Auto-generated method stub + Element pattern = map(object, + svgDocument.createElementNS(SVG_NAMESPACE_URI, SVG_PATTERN_TAG)); + getParentElement(object).appendChild(pattern); + + pattern.setAttribute(SVG_PATTERN_UNITS_ATTRIBUTE, + SVG_OBJECT_BOUNDING_BOX_VALUE); + + if (object.getBounds() != null) { + Bounds bounds = object.getBounds(); + if (bounds.eIsSet(DCPackage.Literals.BOUNDS__X)) + pattern.setAttribute(SVG_X_ATTRIBUTE, + convertDoubleToString(bounds.getX()) + "%"); + if (bounds.eIsSet(DCPackage.Literals.BOUNDS__Y)) + pattern.setAttribute(SVG_Y_ATTRIBUTE, + convertDoubleToString(bounds.getY()) + "%"); + if (bounds.eIsSet(DCPackage.Literals.BOUNDS__WIDTH)) + pattern.setAttribute(SVG_WIDTH_ATTRIBUTE, + convertDoubleToString(bounds.getWidth()) + "%"); + if (bounds.eIsSet(DCPackage.Literals.BOUNDS__HEIGHT)) + pattern.setAttribute(SVG_HEIGHT_ATTRIBUTE, + convertDoubleToString(bounds.getHeight()) + "%"); + } + + if (object.getTransforms().size() > 0) { + String transforms = ""; + for (Transform transform : object.getTransforms()) { + transforms += (transforms.length() > 0) ? " " : ""; + transforms += (String) doSwitch(transform); + } + pattern.setAttribute(SVG_PATTERN_TRANSFORM_ATTRIBUTE, transforms); + } + return super.casePattern(object); } @@ -681,14 +823,16 @@ public class DGToSVGConverter extends DGSwitch<Object> implements SVGSyntax { svgDocument.createElementNS(SVG_NAMESPACE_URI, SVG_POLYGON_TAG)); getParentElement(object).appendChild(polygon); - StringBuffer sb = new StringBuffer(); - for (Point point : object.getPoint()) { - sb.append(sb.length() > 0 ? " " : ""); - sb.append(convertDoubleToString(point.getX())); - sb.append(","); - sb.append(convertDoubleToString(point.getY())); + if (!object.getPoints().isEmpty()) { + StringBuffer sb = new StringBuffer(); + for (Point point : object.getPoints()) { + sb.append(sb.length() > 0 ? " " : ""); + sb.append(convertDoubleToString(point.getX())); + sb.append(","); + sb.append(convertDoubleToString(point.getY())); + } + polygon.setAttribute(SVG_POINTS_ATTRIBUTE, sb.toString()); } - polygon.setAttribute(SVG_POINTS_ATTRIBUTE, sb.toString()); return super.casePolygon(object); } @@ -699,14 +843,16 @@ public class DGToSVGConverter extends DGSwitch<Object> implements SVGSyntax { SVG_NAMESPACE_URI, SVG_POLYLINE_TAG)); getParentElement(object).appendChild(polyline); - StringBuffer sb = new StringBuffer(); - for (Point point : object.getPoint()) { - sb.append(sb.length() > 0 ? " " : ""); - sb.append(convertDoubleToString(point.getX())); - sb.append(","); - sb.append(convertDoubleToString(point.getY())); + if (!object.getPoints().isEmpty()) { + StringBuffer sb = new StringBuffer(); + for (Point point : object.getPoints()) { + sb.append(sb.length() > 0 ? " " : ""); + sb.append(convertDoubleToString(point.getX())); + sb.append(","); + sb.append(convertDoubleToString(point.getY())); + } + polyline.setAttribute(SVG_POINTS_ATTRIBUTE, sb.toString()); } - polyline.setAttribute(SVG_POINTS_ATTRIBUTE, sb.toString()); return super.casePolyline(object); } @@ -720,13 +866,15 @@ public class DGToSVGConverter extends DGSwitch<Object> implements SVGSyntax { Point end = object.getControl(); sb.append(convertDoubleToString(end.getX()) + "," + convertDoubleToString(end.getY())); - } + } else + sb.append("0.0,0.0"); sb.append(" "); if (object.getPoint() != null) { Point point = object.getPoint(); sb.append(convertDoubleToString(point.getX()) + "," + convertDoubleToString(point.getY())); - } + } else + sb.append("0.0,0.0"); return super.caseQuadraticCurveTo(object); } @@ -737,29 +885,32 @@ public class DGToSVGConverter extends DGSwitch<Object> implements SVGSyntax { SVG_NAMESPACE_URI, SVG_RADIAL_GRADIENT_TAG)); getParentElement(object).appendChild(gradient); + gradient.setAttribute(SVG_GRADIENT_UNITS_ATTRIBUTE, + SVG_OBJECT_BOUNDING_BOX_VALUE); + if (object.eIsSet(DGPackage.Literals.RADIAL_GRADIENT__RADIUS)) { gradient.setAttribute(SVG_R_ATTRIBUTE, - convertDoubleToString(object.getRadius())); + convertDoubleToString(object.getRadius()) + "%"); } if (object.getCenter() != null) { Point center = object.getCenter(); if (center.eIsSet(DCPackage.Literals.POINT__X)) gradient.setAttribute(SVG_CX_ATTRIBUTE, - convertDoubleToString(center.getX())); + convertDoubleToString(center.getX()) + "%"); if (center.eIsSet(DCPackage.Literals.POINT__Y)) gradient.setAttribute(SVG_CY_ATTRIBUTE, - convertDoubleToString(center.getY())); + convertDoubleToString(center.getY()) + "%"); } if (object.getFocus() != null) { Point focus = object.getFocus(); if (focus.eIsSet(DCPackage.Literals.POINT__X)) gradient.setAttribute(SVG_FX_ATTRIBUTE, - convertDoubleToString(focus.getX())); + convertDoubleToString(focus.getX()) + "%"); if (focus.eIsSet(DCPackage.Literals.POINT__Y)) gradient.setAttribute(SVG_FY_ATTRIBUTE, - convertDoubleToString(focus.getY())); + convertDoubleToString(focus.getY()) + "%"); } return super.caseRadialGradient(object); @@ -779,12 +930,13 @@ public class DGToSVGConverter extends DGSwitch<Object> implements SVGSyntax { if (bounds.eIsSet(DCPackage.Literals.BOUNDS__Y)) rect.setAttribute(SVG_Y_ATTRIBUTE, convertDoubleToString(bounds.getY())); - if (bounds.eIsSet(DCPackage.Literals.BOUNDS__WIDTH)) - rect.setAttribute(SVG_WIDTH_ATTRIBUTE, - convertDoubleToString(bounds.getWidth())); - if (bounds.eIsSet(DCPackage.Literals.BOUNDS__HEIGHT)) - rect.setAttribute(SVG_HEIGHT_ATTRIBUTE, - convertDoubleToString(bounds.getHeight())); + rect.setAttribute(SVG_WIDTH_ATTRIBUTE, + convertDoubleToString(bounds.getWidth())); + rect.setAttribute(SVG_HEIGHT_ATTRIBUTE, + convertDoubleToString(bounds.getHeight())); + } else { + rect.setAttribute(SVG_WIDTH_ATTRIBUTE, "0.0"); + rect.setAttribute(SVG_HEIGHT_ATTRIBUTE, "0.0"); } if (object.eIsSet(DGPackage.Literals.RECTANGLE__CORNER_RADIUS)) { @@ -800,10 +952,17 @@ public class DGToSVGConverter extends DGSwitch<Object> implements SVGSyntax { @Override public Object caseRootCanvas(RootCanvas object) { Element svg = map(object, svgDocument.getDocumentElement()); - - // for (StyleSheet externalStyleSheet : object.getStyleSheet()) { - // TODO: handle external style sheets - // } + svg.setAttribute(XMLNS_PREFIX, SVG_NAMESPACE_URI); + svg.setAttribute(XMLNS_PREFIX + ":" + XLINK_PREFIX, XLINK_NAMESPACE_URI); + + for (StyleSheet styleSheet : object.getExternalStyleSheets()) { + String target = "xml-stylesheet"; + String data = "type=\"text/css\" href=\"" + + styleSheet.eResource().getURI() + ".css\" ?>"; + ProcessingInstruction pi = svgDocument.createProcessingInstruction( + target, data); + svgDocument.insertBefore(pi, svgDocument.getDocumentElement()); + } if (object.eIsSet(DGPackage.Literals.ROOT_CANVAS__BACKGROUND_COLOR)) { String background = convertColorToString(object @@ -820,19 +979,53 @@ public class DGToSVGConverter extends DGSwitch<Object> implements SVGSyntax { @Override public Object caseRotate(Rotate object) { - // TODO Auto-generated method stub + StringBuffer sb = map(object, new StringBuffer()); + + sb.append("rotate("); + sb.append(convertDoubleToString(object.getAngle())); + if (object.getCenter() != null) { + Point center = object.getCenter(); + sb.append(", "); + sb.append(convertDoubleToString(center.getX())); + sb.append(", "); + sb.append(convertDoubleToString(center.getY())); + } + sb.append(")"); + return super.caseRotate(object); } @Override public Object caseScale(Scale object) { - // TODO Auto-generated method stub + StringBuffer sb = map(object, new StringBuffer()); + + sb.append("scale("); + sb.append(convertDoubleToString(object.getFactorX())); + sb.append(", "); + sb.append(convertDoubleToString(object.getFactorY())); + sb.append(")"); + return super.caseScale(object); } @Override public Object caseSkew(Skew object) { - // TODO Auto-generated method stub + StringBuffer sb = map(object, new StringBuffer()); + + if (object.eIsSet(DGPackage.Literals.SKEW__ANGLE_X)) { + sb.append("skewX("); + sb.append(convertDoubleToString(object.getAngleX())); + sb.append(")"); + } + + sb.append(sb.length() > 0 ? " " : ""); + + if (object.eIsSet(DGPackage.Literals.SKEW__ANGLE_Y)) { + sb.append("skewY("); + sb.append(convertDoubleToString(object.getAngleY())); + sb.append(")"); + } + return super.caseSkew(object); } @@ -842,7 +1035,7 @@ public class DGToSVGConverter extends DGSwitch<Object> implements SVGSyntax { if (object.eIsSet(DGPackage.Literals.STYLE__FILL)) { String value = (object.getFill() == null) ? "none" - : ((String) doSwitch(object.getFill())); + : (String) doSwitch(object.getFill()); sb.append(SVG_FILL_ATTRIBUTE + ": " + value + "; "); } @@ -869,7 +1062,7 @@ public class DGToSVGConverter extends DGSwitch<Object> implements SVGSyntax { if (object.eIsSet(DGPackage.Literals.STYLE__STROKE_DASH_LENGTH)) { StringBuffer value = new StringBuffer(); - for (double d : object.getStrokeDashLength()) { + for (double d : object.getStrokeDashLengths()) { value.append(value.length() > 0 ? ", " : ""); value.append(convertDoubleToString(d)); } @@ -916,6 +1109,9 @@ public class DGToSVGConverter extends DGSwitch<Object> implements SVGSyntax { sb.append(SVG_TEXT_DECORATION_ATTRIBUTE + ": " + value + "; "); } + if (sb.length() > 0) + sb.deleteCharAt(sb.length() - 1); + return super.caseStyle(object); } @@ -923,14 +1119,16 @@ public class DGToSVGConverter extends DGSwitch<Object> implements SVGSyntax { public Object caseStyleRule(StyleRule object) { StringBuffer sb = map(object, new StringBuffer()); - for (StyleSelector selector : object.getSelector()) { - sb.append(sb.length() > 0 ? ", " : ""); - sb.append((String) doSwitch(selector)); - } + if (!object.getSelectors().isEmpty() && object.getStyle() != null) { + for (StyleSelector selector : object.getSelectors()) { + sb.append(sb.length() > 0 ? ", " : ""); + sb.append((String) doSwitch(selector)); + } - if (object.getStyle() != null) { - String style = (String) doSwitch(object.getStyle()); - sb.append(" { " + style + "}"); + if (object.getStyle() != null) { + String style = (String) doSwitch(object.getStyle()); + sb.append(" { " + style + " }"); + } } return super.caseStyleRule(object); @@ -940,38 +1138,55 @@ public class DGToSVGConverter extends DGSwitch<Object> implements SVGSyntax { public Object caseStyleSelector(StyleSelector object) { StringBuffer sb = map(object, new StringBuffer()); - if (object.getType() != null) { - EClass type = object.getType(); - if (DGPackage.Literals.CANVAS.equals(type)) + if (object.eIsSet(DGPackage.Literals.STYLE_SELECTOR__KIND)) { + switch (object.getKind()) { + case CANVAS: sb.append(SVG_SVG_TAG); - else if (DGPackage.Literals.GROUP.equals(type)) - sb.append(SVG_G_TAG); - else if (DGPackage.Literals.RECTANGLE.equals(type)) - sb.append(SVG_RECT_TAG); - else if (DGPackage.Literals.CIRCLE.equals(type)) + break; + case CIRCLE: sb.append(SVG_CIRCLE_TAG); - else if (DGPackage.Literals.ELLIPSE.equals(type)) - sb.append(SVG_ELLIPSE_TAG); - else if (DGPackage.Literals.TEXT.equals(type)) - sb.append(SVG_TEXT_TAG); - else if (DGPackage.Literals.LINE.equals(type)) - sb.append(SVG_LINE_TAG); - else if (DGPackage.Literals.POLYGON.equals(type)) - sb.append(SVG_POLYGON_TAG); - else if (DGPackage.Literals.POLYLINE.equals(type)) - sb.append(SVG_POLYLINE_TAG); - else if (DGPackage.Literals.CLIP_PATH.equals(type)) + break; + case CLIP_PATH: sb.append(SVG_CLIP_PATH_TAG); - else if (DGPackage.Literals.IMAGE.equals(type)) + break; + case ELLIPSE: + sb.append(SVG_ELLIPSE_TAG); + break; + case GROUP: + sb.append(SVG_G_TAG); + break; + case IMAGE: sb.append(SVG_IMAGE_TAG); - else if (DGPackage.Literals.MARKER.equals(type)) + break; + case LINE: + sb.append(SVG_LINE_TAG); + break; + case MARKER: sb.append(SVG_MARKER_TAG); - else if (DGPackage.Literals.PATH.equals(type)) + break; + case PATH: sb.append(SVG_PATH_TAG); + break; + case POLYGON: + sb.append(SVG_POLYGON_TAG); + break; + case POLYLINE: + sb.append(SVG_POLYLINE_TAG); + break; + case RECTANGLE: + sb.append(SVG_RECT_TAG); + break; + case TEXT: + sb.append(SVG_TEXT_TAG); + break; + case USE: + sb.append(SVG_USE_TAG); + break; + } } - for (String keyword : object.getKeyword()) - sb.append("." + keyword); + for (String class_ : object.getClasses()) + sb.append("." + class_); if (sb.length() == 0) { sb.append("*"); @@ -987,7 +1202,7 @@ public class DGToSVGConverter extends DGSwitch<Object> implements SVGSyntax { getParentElement(object).appendChild(styleSheet); StringBuffer sb = new StringBuffer(); - for (StyleRule rule : object.getRule()) { + for (StyleRule rule : object.getRules()) { sb.append("\n\t\t\t" + (String) doSwitch(rule)); } styleSheet.setAttribute(SVG_TYPE_ATTRIBUTE, "text/css"); @@ -999,7 +1214,7 @@ public class DGToSVGConverter extends DGSwitch<Object> implements SVGSyntax { @Override public Object caseText(Text object) { - SVGTextElement text = (SVGTextElement) map(object, + Element text = (Element) map(object, svgDocument.createElementNS(SVG_NAMESPACE_URI, SVG_TEXT_TAG)); getParentElement(object).appendChild(text); @@ -1022,19 +1237,49 @@ public class DGToSVGConverter extends DGSwitch<Object> implements SVGSyntax { @Override public Object caseTransform(Transform object) { - // TODO Auto-generated method stub return super.caseTransform(object); } @Override public Object caseTranslate(Translate object) { - // TODO Auto-generated method stub + StringBuffer sb = map(object, new StringBuffer()); + + sb.append("translate("); + sb.append(convertDoubleToString(object.getDeltaX())); + sb.append(", "); + sb.append(convertDoubleToString(object.getDeltaY())); + sb.append(")"); + return super.caseTranslate(object); } @Override public Object caseUse(Use object) { - // TODO Auto-generated method stub + Element use = map(object, + svgDocument.createElementNS(SVG_NAMESPACE_URI, SVG_USE_TAG)); + getParentElement(object).appendChild(use); + + if (object.getReferencedElement() != null) { + use.setAttributeNS(XLINK_NAMESPACE_URI, XLINK_HREF_QNAME, + convertReferenceToURI(object.getReferencedElement())); + } + + if (object.getBounds() != null) { + Bounds bounds = object.getBounds(); + if (bounds.eIsSet(DCPackage.Literals.BOUNDS__X)) + use.setAttribute(SVG_X_ATTRIBUTE, + convertDoubleToString(bounds.getX())); + if (bounds.eIsSet(DCPackage.Literals.BOUNDS__Y)) + use.setAttribute(SVG_Y_ATTRIBUTE, + convertDoubleToString(bounds.getY())); + if (bounds.eIsSet(DCPackage.Literals.BOUNDS__WIDTH)) + use.setAttribute(SVG_WIDTH_ATTRIBUTE, + convertDoubleToString(bounds.getWidth())); + if (bounds.eIsSet(DCPackage.Literals.BOUNDS__HEIGHT)) + use.setAttribute(SVG_HEIGHT_ATTRIBUTE, + convertDoubleToString(bounds.getHeight())); + } + return super.caseUse(object); } diff --git a/extraplugins/diagram-definition/org.eclipse.papyrus.dd/model/DC.cmof b/extraplugins/diagram-definition/org.eclipse.papyrus.dd/model/DC.cmof index 8fd27a49d06..1d3674c0875 100644 --- a/extraplugins/diagram-definition/org.eclipse.papyrus.dd/model/DC.cmof +++ b/extraplugins/diagram-definition/org.eclipse.papyrus.dd/model/DC.cmof @@ -119,36 +119,16 @@ </ownedComment>
</ownedLiteral>
</ownedMember>
- <ownedMember xmi:type="cmof:Enumeration" xmi:id="AlignmentKind" name="AlignmentKind">
- <ownedComment xmi:type="cmof:Comment" xmi:id="AlignmentKind-_ownedComment.0" annotatedElement="AlignmentKind">
- <body>AlignmentKind enumerates the possible options for alignment for layout purposes.</body>
- </ownedComment>
- <ownedLiteral xmi:type="cmof:EnumerationLiteral" xmi:id="AlignmentKind-start" name="start" classifier="#AlignmentKind" enumeration="AlignmentKind">
- <ownedComment xmi:type="cmof:Comment" xmi:id="AlignmentKind-start-_ownedComment.0" annotatedElement="AlignmentKind-start">
- <body>an alignment to the start of a given length.</body>
- </ownedComment>
- </ownedLiteral>
- <ownedLiteral xmi:type="cmof:EnumerationLiteral" xmi:id="AlignmentKind-end" name="end" classifier="#AlignmentKind" enumeration="AlignmentKind">
- <ownedComment xmi:type="cmof:Comment" xmi:id="AlignmentKind-end-_ownedComment.0" annotatedElement="AlignmentKind-end">
- <body>an alignment to the end of a given length</body>
- </ownedComment>
- </ownedLiteral>
- <ownedLiteral xmi:type="cmof:EnumerationLiteral" xmi:id="AlignmentKind-center" name="center" classifier="#AlignmentKind" enumeration="AlignmentKind">
- <ownedComment xmi:type="cmof:Comment" xmi:id="AlignmentKind-center-_ownedComment.0" annotatedElement="AlignmentKind-center">
- <body>an alignment to the center of a given length</body>
- </ownedComment>
- </ownedLiteral>
- </ownedMember>
<ownedMember xmi:type="cmof:DataType" xmi:id="Point" name="Point">
<ownedComment xmi:type="cmof:Comment" xmi:id="Point-_ownedComment.0" annotatedElement="Point">
<body>A Point specifies an location in some x-y coordinate system.</body>
</ownedComment>
- <ownedAttribute xmi:type="cmof:Property" xmi:id="Point-x" name="x" visibility="public" type="Real" datatype="Point" default="0">
+ <ownedAttribute xmi:type="cmof:Property" xmi:id="Point-x" name="x" visibility="public" type="Real" lower="0" datatype="Point" default="0">
<ownedComment xmi:type="cmof:Comment" xmi:id="Point-x-_ownedComment.0" annotatedElement="Point-x">
<body>a real number (<= 0 or >= 0) that represents the x-coordinate of the point.</body>
</ownedComment>
</ownedAttribute>
- <ownedAttribute xmi:type="cmof:Property" xmi:id="Point-y" name="y" visibility="public" type="Real" datatype="Point" default="0">
+ <ownedAttribute xmi:type="cmof:Property" xmi:id="Point-y" name="y" visibility="public" type="Real" lower="0" datatype="Point" default="0">
<ownedComment xmi:type="cmof:Comment" xmi:id="Point-y-_ownedComment.0" annotatedElement="Point-y">
<body>a real number (<= 0 or >= 0) that represents the y-coordinate of the point.</body>
</ownedComment>
@@ -158,21 +138,30 @@ <ownedComment xmi:type="cmof:Comment" xmi:id="Dimension-_ownedComment.0" annotatedElement="Dimension">
<body>Dimension specifies two lengths (width and height) along the x and y axes in some x-y coordinate system.</body>
</ownedComment>
- <ownedRule xmi:type="cmof:Constraint" xmi:id="Dimension-non_negative_dimension" name="non_negative_dimension" constrainedElement="Bounds" namespace="Dimension">
+ <ownedRule xmi:type="cmof:Constraint" xmi:id="Dimension-non_negative_dimension" name="non_negative_width" constrainedElement="Bounds" namespace="Dimension">
<ownedComment xmi:type="cmof:Comment" xmi:id="Dimension-non_negative_dimension-_ownedComment.0" annotatedElement="Dimension-non_negative_dimension">
- <body>the width and height of a dimension cannot be negative</body>
+ <body>the width of a dimension cannot be negative</body>
</ownedComment>
<specification xmi:type="cmof:OpaqueExpression" xmi:id="Dimension-non_negative_dimension-_specification">
<language>OCL</language>
- <body>width >= 0 and height >=0</body>
+ <body>width >=0</body>
+ </specification>
+ </ownedRule>
+ <ownedRule xmi:type="cmof:Constraint" xmi:id="_uRqWUOhyEeO6TvQHODg78w" name="non_negative_height" constrainedElement="Bounds" namespace="Dimension">
+ <ownedComment xmi:type="cmof:Comment" xmi:id="_uRqWUehyEeO6TvQHODg78w" annotatedElement="_uRqWUOhyEeO6TvQHODg78w">
+ <body>the height of a dimension cannot be negative</body>
+ </ownedComment>
+ <specification xmi:type="cmof:OpaqueExpression" xmi:id="_uRqWUuhyEeO6TvQHODg78w">
+ <language>OCL</language>
+ <body>height >=0</body>
</specification>
</ownedRule>
- <ownedAttribute xmi:type="cmof:Property" xmi:id="Dimension-width" name="width" visibility="public" type="Real" datatype="Dimension">
+ <ownedAttribute xmi:type="cmof:Property" xmi:id="Dimension-width" name="width" visibility="public" type="Real" lower="0" datatype="Dimension" default="0">
<ownedComment xmi:type="cmof:Comment" xmi:id="Dimension-width-_ownedComment.0" annotatedElement="Dimension-width">
<body>a real number (>=0) that represents a length along the x-axis.</body>
</ownedComment>
</ownedAttribute>
- <ownedAttribute xmi:type="cmof:Property" xmi:id="Dimension-height" name="height" visibility="public" type="Real" datatype="Dimension">
+ <ownedAttribute xmi:type="cmof:Property" xmi:id="Dimension-height" name="height" visibility="public" type="Real" lower="0" datatype="Dimension" default="0">
<ownedComment xmi:type="cmof:Comment" xmi:id="Dimension-height-_ownedComment.0" annotatedElement="Dimension-height">
<body>a real number (>=0) that represents a length along the y-axis.</body>
</ownedComment>
@@ -182,31 +171,40 @@ <ownedComment xmi:type="cmof:Comment" xmi:id="Bounds-_ownedComment.0" annotatedElement="Bounds">
<body>Bounds specifies a rectangular area in some x-y coordinate system that is defined by a location (x and y) and a size (width and height).</body>
</ownedComment>
- <ownedRule xmi:type="cmof:Constraint" xmi:id="Bounds-non_negative_size" name="non_negative_size" constrainedElement="Bounds" namespace="Bounds">
+ <ownedRule xmi:type="cmof:Constraint" xmi:id="Bounds-non_negative_size" name="non_negative_width" constrainedElement="Bounds" namespace="Bounds">
<ownedComment xmi:type="cmof:Comment" xmi:id="Bounds-non_negative_size-_ownedComment.0" annotatedElement="Bounds-non_negative_size">
- <body>the width and height of bounds cannot be negative</body>
+ <body>the width of bounds cannot be negative</body>
</ownedComment>
<specification xmi:type="cmof:OpaqueExpression" xmi:id="Bounds-non_negative_size-_specification">
<language>OCL</language>
- <body>width >= 0 and height >=0</body>
+ <body>width >= 0</body>
</specification>
</ownedRule>
- <ownedAttribute xmi:type="cmof:Property" xmi:id="Bounds-x" name="x" visibility="public" type="Real" datatype="Bounds" default="0">
+ <ownedRule xmi:type="cmof:Constraint" xmi:id="_fdKnQOhyEeO6TvQHODg78w" name="non_negative_height" constrainedElement="Bounds" namespace="Bounds">
+ <ownedComment xmi:type="cmof:Comment" xmi:id="_fdKnQehyEeO6TvQHODg78w" annotatedElement="_fdKnQOhyEeO6TvQHODg78w">
+ <body>the height of bounds cannot be negative</body>
+ </ownedComment>
+ <specification xmi:type="cmof:OpaqueExpression" xmi:id="_fdKnQuhyEeO6TvQHODg78w">
+ <language>OCL</language>
+ <body>height >=0</body>
+ </specification>
+ </ownedRule>
+ <ownedAttribute xmi:type="cmof:Property" xmi:id="Bounds-x" name="x" visibility="public" type="Real" lower="0" datatype="Bounds" default="0">
<ownedComment xmi:type="cmof:Comment" xmi:id="Bounds-x-_ownedComment.0" annotatedElement="Bounds-x">
<body>a real number (>=0 or <=0) that represents the x-coordinate of the bounds</body>
</ownedComment>
</ownedAttribute>
- <ownedAttribute xmi:type="cmof:Property" xmi:id="Bounds-y" name="y" visibility="public" type="Real" datatype="Bounds" default="0">
+ <ownedAttribute xmi:type="cmof:Property" xmi:id="Bounds-y" name="y" visibility="public" type="Real" lower="0" datatype="Bounds" default="0">
<ownedComment xmi:type="cmof:Comment" xmi:id="Bounds-y-_ownedComment.0" annotatedElement="Bounds-y">
<body>a real number (>=0 or <=0) that represents the y-coordinate of the bounds</body>
</ownedComment>
</ownedAttribute>
- <ownedAttribute xmi:type="cmof:Property" xmi:id="Bounds-width" name="width" visibility="public" type="Real" datatype="Bounds">
+ <ownedAttribute xmi:type="cmof:Property" xmi:id="Bounds-width" name="width" visibility="public" type="Real" lower="0" datatype="Bounds" default="0">
<ownedComment xmi:type="cmof:Comment" xmi:id="Bounds-width-_ownedComment.0" annotatedElement="Bounds-width">
<body>a real number (>=0) that represents the width of the bounds</body>
</ownedComment>
</ownedAttribute>
- <ownedAttribute xmi:type="cmof:Property" xmi:id="Bounds-height" name="height" visibility="public" type="Real" datatype="Bounds">
+ <ownedAttribute xmi:type="cmof:Property" xmi:id="Bounds-height" name="height" visibility="public" type="Real" lower="0" datatype="Bounds" default="0">
<ownedComment xmi:type="cmof:Comment" xmi:id="Bounds-height-_ownedComment.0" annotatedElement="Bounds-height">
<body>a real number (>=0) that represents the height of the bounds</body>
</ownedComment>
@@ -328,9 +326,57 @@ <xmi:Extension extender="http://www.eclipse.org/uml2/4.0.0/UML">
<Ecore:EPackage xmi:id="_gItq8NpWEeOltvy1wTDHDA" base_Package="_0" nsPrefix="dc"/>
</xmi:Extension>
- <cmof:Tag xmi:id="_36" name="org.omg.xmi.nsPrefix" value="dc" element="_0"/>
- <cmof:Tag xmi:id="_37" name="org.omg.xmi.nsURI" value="http://www.omg.org/spec/DD/20110901/DC" element="_0"/>
- <cmof:Tag xmi:id="_38" name="org.omg.xmi.schemaType" value="http://www.w3.org/2001/XMLSchema#boolean" element="Boolean"/>
- <cmof:Tag xmi:id="_39" name="org.omg.xmi.schemaType" value="http://www.w3.org/2001/XMLSchema#integer" element="Integer"/>
- <cmof:Tag xmi:id="_40" name="org.omg.xmi.schemaType" value="http://www.w3.org/2001/XMLSchema#double" element="Real"/>
+ <xmi:Extension extender="http://www.eclipse.org/uml2/4.0.0/UML">
+ <Ecore:EPackage xmi:id="_ptXHoOHCEeO71tdCkM4EDw" base_Package="_0" nsPrefix="dc"/>
+ </xmi:Extension>
+ <xmi:Extension extender="http://www.eclipse.org/uml2/4.0.0/UML">
+ <Ecore:EPackage xmi:id="_3Y3MsOIiEeO71tdCkM4EDw" base_Package="_0" nsPrefix="dc"/>
+ </xmi:Extension>
+ <xmi:Extension extender="http://www.eclipse.org/uml2/4.0.0/UML">
+ <Ecore:EPackage xmi:id="_qBWzoOgCEeOCQP_PQv7dlg" base_Package="_0" nsPrefix="dc"/>
+ </xmi:Extension>
+ <xmi:Extension extender="http://www.eclipse.org/uml2/4.0.0/UML">
+ <Ecore:EAttribute xmi:id="_wr5HEOgEEeOCQP_PQv7dlg" isUnsettable="true" base_Property="Point-x"/>
+ </xmi:Extension>
+ <xmi:Extension extender="http://www.eclipse.org/uml2/4.0.0/UML">
+ <Ecore:EAttribute xmi:id="_ykau8OgEEeOCQP_PQv7dlg" isUnsettable="true" base_Property="Point-y"/>
+ </xmi:Extension>
+ <xmi:Extension extender="http://www.eclipse.org/uml2/4.0.0/UML">
+ <Ecore:EAttribute xmi:id="_08dkYOgEEeOCQP_PQv7dlg" isUnsettable="true" base_Property="Dimension-width"/>
+ </xmi:Extension>
+ <xmi:Extension extender="http://www.eclipse.org/uml2/4.0.0/UML">
+ <Ecore:EAttribute xmi:id="_3Ga6gOgEEeOCQP_PQv7dlg" isUnsettable="true" base_Property="Dimension-height"/>
+ </xmi:Extension>
+ <xmi:Extension extender="http://www.eclipse.org/uml2/4.0.0/UML">
+ <Ecore:EAttribute xmi:id="_5Iff8OgEEeOCQP_PQv7dlg" isUnsettable="true" base_Property="Bounds-x"/>
+ </xmi:Extension>
+ <xmi:Extension extender="http://www.eclipse.org/uml2/4.0.0/UML">
+ <Ecore:EAttribute xmi:id="_72q9cOgEEeOCQP_PQv7dlg" isUnsettable="true" base_Property="Bounds-y"/>
+ </xmi:Extension>
+ <xmi:Extension extender="http://www.eclipse.org/uml2/4.0.0/UML">
+ <Ecore:EAttribute xmi:id="_-skzkOgEEeOCQP_PQv7dlg" isUnsettable="true" base_Property="Bounds-width"/>
+ </xmi:Extension>
+ <xmi:Extension extender="http://www.eclipse.org/uml2/4.0.0/UML">
+ <Ecore:EAttribute xmi:id="_AiAEIOgFEeOCQP_PQv7dlg" isUnsettable="true" base_Property="Bounds-height"/>
+ </xmi:Extension>
+ <xmi:Extension extender="http://www.eclipse.org/uml2/4.0.0/UML">
+ <Ecore:EPackage xmi:id="_Yo9QgOgaEeO6TvQHODg78w" base_Package="_0" nsPrefix="dc"/>
+ </xmi:Extension>
+ <xmi:Extension extender="http://www.eclipse.org/uml2/4.0.0/UML">
+ <Ecore:EPackage xmi:id="_4tITcOghEeO6TvQHODg78w" base_Package="_0" nsPrefix="dc"/>
+ </xmi:Extension>
+ <xmi:Extension extender="http://www.eclipse.org/uml2/4.0.0/UML">
+ <Ecore:EPackage xmi:id="_ZLSagOhnEeO6TvQHODg78w" base_Package="_0" nsPrefix="dc"/>
+ </xmi:Extension>
+ <xmi:Extension extender="http://www.eclipse.org/uml2/4.0.0/UML">
+ <Ecore:EPackage xmi:id="_9syAgOhyEeO6TvQHODg78w" base_Package="_0" nsPrefix="dc"/>
+ </xmi:Extension>
+ <xmi:Extension extender="http://www.eclipse.org/uml2/4.0.0/UML">
+ <Ecore:EPackage xmi:id="_MSBV8O0xEeOCPtJ2AfZp5A" base_Package="_0" nsPrefix="dc"/>
+ </xmi:Extension>
+ <cmof:Tag xmi:id="_52" name="org.omg.xmi.nsPrefix" value="dc" element="_0"/>
+ <cmof:Tag xmi:id="_53" name="org.omg.xmi.nsURI" value="http://www.omg.org/spec/DD/20110901/DC" element="_0"/>
+ <cmof:Tag xmi:id="_54" name="org.omg.xmi.schemaType" value="http://www.w3.org/2001/XMLSchema#boolean" element="Boolean"/>
+ <cmof:Tag xmi:id="_55" name="org.omg.xmi.schemaType" value="http://www.w3.org/2001/XMLSchema#integer" element="Integer"/>
+ <cmof:Tag xmi:id="_56" name="org.omg.xmi.schemaType" value="http://www.w3.org/2001/XMLSchema#double" element="Real"/>
</xmi:XMI>
diff --git a/extraplugins/diagram-definition/org.eclipse.papyrus.dd/model/DC.ecore b/extraplugins/diagram-definition/org.eclipse.papyrus.dd/model/DC.ecore index 5193a7d1dae..f3c6b0ba544 100644 --- a/extraplugins/diagram-definition/org.eclipse.papyrus.dd/model/DC.ecore +++ b/extraplugins/diagram-definition/org.eclipse.papyrus.dd/model/DC.ecore @@ -122,38 +122,18 @@ </eAnnotations> </eLiterals> </eClassifiers> - <eClassifiers xsi:type="ecore:EEnum" name="AlignmentKind"> - <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel"> - <details key="documentation" value="AlignmentKind enumerates the possible options for alignment for layout purposes."/> - </eAnnotations> - <eLiterals name="start"> - <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel"> - <details key="documentation" value="an alignment to the start of a given length."/> - </eAnnotations> - </eLiterals> - <eLiterals name="end" value="1"> - <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel"> - <details key="documentation" value="an alignment to the end of a given length"/> - </eAnnotations> - </eLiterals> - <eLiterals name="center" value="2"> - <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel"> - <details key="documentation" value="an alignment to the center of a given length"/> - </eAnnotations> - </eLiterals> - </eClassifiers> <eClassifiers xsi:type="ecore:EClass" name="Point"> <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel"> <details key="documentation" value="A Point specifies an location in some x-y coordinate system."/> </eAnnotations> - <eStructuralFeatures xsi:type="ecore:EAttribute" name="x" ordered="false" lowerBound="1" - eType="#//Real" defaultValueLiteral="0"> + <eStructuralFeatures xsi:type="ecore:EAttribute" name="x" ordered="false" eType="#//Real" + defaultValueLiteral="0" unsettable="true"> <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel"> <details key="documentation" value="a real number (<= 0 or >= 0) that represents the x-coordinate of the point."/> </eAnnotations> </eStructuralFeatures> - <eStructuralFeatures xsi:type="ecore:EAttribute" name="y" ordered="false" lowerBound="1" - eType="#//Real" defaultValueLiteral="0"> + <eStructuralFeatures xsi:type="ecore:EAttribute" name="y" ordered="false" eType="#//Real" + defaultValueLiteral="0" unsettable="true"> <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel"> <details key="documentation" value="a real number (<= 0 or >= 0) that represents the y-coordinate of the point."/> </eAnnotations> @@ -163,12 +143,34 @@ <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel"> <details key="documentation" value="Dimension specifies two lengths (width and height) along the x and y axes in some x-y coordinate system."/> </eAnnotations> - <eOperations name="nonNegativeDimension" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean"> + <eOperations name="nonNegativeWidth" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean"> + <eAnnotations source="http://www.eclipse.org/emf/2002/Ecore/OCL"> + <details key="body" value="width >=0"/> + </eAnnotations> + <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel"> + <details key="documentation" value="the width of a dimension cannot be negative"/> + </eAnnotations> + <eParameters name="diagnostics" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EDiagnosticChain"> + <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel"> + <details key="documentation" value="The chain of diagnostics to which problems are to be appended."/> + </eAnnotations> + </eParameters> + <eParameters name="context"> + <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel"> + <details key="documentation" value="The cache of context-specific information."/> + </eAnnotations> + <eGenericType eClassifier="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EMap"> + <eTypeArguments eClassifier="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/> + <eTypeArguments eClassifier="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/> + </eGenericType> + </eParameters> + </eOperations> + <eOperations name="nonNegativeHeight" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean"> <eAnnotations source="http://www.eclipse.org/emf/2002/Ecore/OCL"> - <details key="body" value="width >= 0 and height >=0"/> + <details key="body" value="height >=0"/> </eAnnotations> <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel"> - <details key="documentation" value="the width and height of a dimension cannot be negative"/> + <details key="documentation" value="the height of a dimension cannot be negative"/> </eAnnotations> <eParameters name="diagnostics" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EDiagnosticChain"> <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel"> @@ -186,13 +188,13 @@ </eParameters> </eOperations> <eStructuralFeatures xsi:type="ecore:EAttribute" name="width" ordered="false" - lowerBound="1" eType="#//Real"> + eType="#//Real" defaultValueLiteral="0" unsettable="true"> <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel"> <details key="documentation" value="a real number (>=0) that represents a length along the x-axis."/> </eAnnotations> </eStructuralFeatures> <eStructuralFeatures xsi:type="ecore:EAttribute" name="height" ordered="false" - lowerBound="1" eType="#//Real"> + eType="#//Real" defaultValueLiteral="0" unsettable="true"> <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel"> <details key="documentation" value="a real number (>=0) that represents a length along the y-axis."/> </eAnnotations> @@ -202,12 +204,34 @@ <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel"> <details key="documentation" value="Bounds specifies a rectangular area in some x-y coordinate system that is defined by a location (x and y) and a size (width and height)."/> </eAnnotations> - <eOperations name="nonNegativeSize" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean"> + <eOperations name="nonNegativeWidth" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean"> + <eAnnotations source="http://www.eclipse.org/emf/2002/Ecore/OCL"> + <details key="body" value="width >= 0"/> + </eAnnotations> + <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel"> + <details key="documentation" value="the width of bounds cannot be negative"/> + </eAnnotations> + <eParameters name="diagnostics" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EDiagnosticChain"> + <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel"> + <details key="documentation" value="The chain of diagnostics to which problems are to be appended."/> + </eAnnotations> + </eParameters> + <eParameters name="context"> + <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel"> + <details key="documentation" value="The cache of context-specific information."/> + </eAnnotations> + <eGenericType eClassifier="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EMap"> + <eTypeArguments eClassifier="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/> + <eTypeArguments eClassifier="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/> + </eGenericType> + </eParameters> + </eOperations> + <eOperations name="nonNegativeHeight" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean"> <eAnnotations source="http://www.eclipse.org/emf/2002/Ecore/OCL"> - <details key="body" value="width >= 0 and height >=0"/> + <details key="body" value="height >=0"/> </eAnnotations> <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel"> - <details key="documentation" value="the width and height of bounds cannot be negative"/> + <details key="documentation" value="the height of bounds cannot be negative"/> </eAnnotations> <eParameters name="diagnostics" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EDiagnosticChain"> <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel"> @@ -224,26 +248,26 @@ </eGenericType> </eParameters> </eOperations> - <eStructuralFeatures xsi:type="ecore:EAttribute" name="x" ordered="false" lowerBound="1" - eType="#//Real" defaultValueLiteral="0"> + <eStructuralFeatures xsi:type="ecore:EAttribute" name="x" ordered="false" eType="#//Real" + defaultValueLiteral="0" unsettable="true"> <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel"> <details key="documentation" value="a real number (>=0 or <=0) that represents the x-coordinate of the bounds"/> </eAnnotations> </eStructuralFeatures> - <eStructuralFeatures xsi:type="ecore:EAttribute" name="y" ordered="false" lowerBound="1" - eType="#//Real" defaultValueLiteral="0"> + <eStructuralFeatures xsi:type="ecore:EAttribute" name="y" ordered="false" eType="#//Real" + defaultValueLiteral="0" unsettable="true"> <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel"> <details key="documentation" value="a real number (>=0 or <=0) that represents the y-coordinate of the bounds"/> </eAnnotations> </eStructuralFeatures> <eStructuralFeatures xsi:type="ecore:EAttribute" name="width" ordered="false" - lowerBound="1" eType="#//Real"> + eType="#//Real" defaultValueLiteral="0" unsettable="true"> <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel"> <details key="documentation" value="a real number (>=0) that represents the width of the bounds"/> </eAnnotations> </eStructuralFeatures> <eStructuralFeatures xsi:type="ecore:EAttribute" name="height" ordered="false" - lowerBound="1" eType="#//Real"> + eType="#//Real" defaultValueLiteral="0" unsettable="true"> <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel"> <details key="documentation" value="a real number (>=0) that represents the height of the bounds"/> </eAnnotations> diff --git a/extraplugins/diagram-definition/org.eclipse.papyrus.dd/model/DC.genmodel b/extraplugins/diagram-definition/org.eclipse.papyrus.dd/model/DC.genmodel index e8fe0ffa005..32a09b06e08 100644 --- a/extraplugins/diagram-definition/org.eclipse.papyrus.dd/model/DC.genmodel +++ b/extraplugins/diagram-definition/org.eclipse.papyrus.dd/model/DC.genmodel @@ -48,11 +48,6 @@ <genEnumLiterals xsi:type="genmodel:GenEnumLiteral" ecoreEnumLiteral="DC.ecore#//KnownColor/silver"/> <genEnumLiterals xsi:type="genmodel:GenEnumLiteral" ecoreEnumLiteral="DC.ecore#//KnownColor/gray"/> </genEnums> - <genEnums xsi:type="genmodel:GenEnum" typeSafeEnumCompatible="false" ecoreEnum="DC.ecore#//AlignmentKind"> - <genEnumLiterals xsi:type="genmodel:GenEnumLiteral" ecoreEnumLiteral="DC.ecore#//AlignmentKind/start"/> - <genEnumLiterals xsi:type="genmodel:GenEnumLiteral" ecoreEnumLiteral="DC.ecore#//AlignmentKind/end"/> - <genEnumLiterals xsi:type="genmodel:GenEnumLiteral" ecoreEnumLiteral="DC.ecore#//AlignmentKind/center"/> - </genEnums> <genDataTypes xsi:type="genmodel:GenDataType" ecoreDataType="DC.ecore#//Boolean"/> <genDataTypes xsi:type="genmodel:GenDataType" ecoreDataType="DC.ecore#//Integer"/> <genDataTypes xsi:type="genmodel:GenDataType" ecoreDataType="DC.ecore#//Real"/> @@ -65,9 +60,13 @@ <genClasses xsi:type="genmodel:GenClass" ecoreClass="DC.ecore#//Dimension"> <genFeatures xsi:type="genmodel:GenFeature" createChild="false" ecoreFeature="ecore:EAttribute DC.ecore#//Dimension/width"/> <genFeatures xsi:type="genmodel:GenFeature" createChild="false" ecoreFeature="ecore:EAttribute DC.ecore#//Dimension/height"/> - <genOperations xsi:type="genmodel:GenOperation" ecoreOperation="DC.ecore#//Dimension/nonNegativeDimension"> - <genParameters xsi:type="genmodel:GenParameter" ecoreParameter="DC.ecore#//Dimension/nonNegativeDimension/diagnostics"/> - <genParameters xsi:type="genmodel:GenParameter" ecoreParameter="DC.ecore#//Dimension/nonNegativeDimension/context"/> + <genOperations xsi:type="genmodel:GenOperation" ecoreOperation="DC.ecore#//Dimension/nonNegativeWidth"> + <genParameters xsi:type="genmodel:GenParameter" ecoreParameter="DC.ecore#//Dimension/nonNegativeWidth/diagnostics"/> + <genParameters xsi:type="genmodel:GenParameter" ecoreParameter="DC.ecore#//Dimension/nonNegativeWidth/context"/> + </genOperations> + <genOperations xsi:type="genmodel:GenOperation" ecoreOperation="DC.ecore#//Dimension/nonNegativeHeight"> + <genParameters xsi:type="genmodel:GenParameter" ecoreParameter="DC.ecore#//Dimension/nonNegativeHeight/diagnostics"/> + <genParameters xsi:type="genmodel:GenParameter" ecoreParameter="DC.ecore#//Dimension/nonNegativeHeight/context"/> </genOperations> </genClasses> <genClasses xsi:type="genmodel:GenClass" ecoreClass="DC.ecore#//Bounds"> @@ -75,9 +74,13 @@ <genFeatures xsi:type="genmodel:GenFeature" createChild="false" ecoreFeature="ecore:EAttribute DC.ecore#//Bounds/y"/> <genFeatures xsi:type="genmodel:GenFeature" createChild="false" ecoreFeature="ecore:EAttribute DC.ecore#//Bounds/width"/> <genFeatures xsi:type="genmodel:GenFeature" createChild="false" ecoreFeature="ecore:EAttribute DC.ecore#//Bounds/height"/> - <genOperations xsi:type="genmodel:GenOperation" ecoreOperation="DC.ecore#//Bounds/nonNegativeSize"> - <genParameters xsi:type="genmodel:GenParameter" ecoreParameter="DC.ecore#//Bounds/nonNegativeSize/diagnostics"/> - <genParameters xsi:type="genmodel:GenParameter" ecoreParameter="DC.ecore#//Bounds/nonNegativeSize/context"/> + <genOperations xsi:type="genmodel:GenOperation" ecoreOperation="DC.ecore#//Bounds/nonNegativeWidth"> + <genParameters xsi:type="genmodel:GenParameter" ecoreParameter="DC.ecore#//Bounds/nonNegativeWidth/diagnostics"/> + <genParameters xsi:type="genmodel:GenParameter" ecoreParameter="DC.ecore#//Bounds/nonNegativeWidth/context"/> + </genOperations> + <genOperations xsi:type="genmodel:GenOperation" ecoreOperation="DC.ecore#//Bounds/nonNegativeHeight"> + <genParameters xsi:type="genmodel:GenParameter" ecoreParameter="DC.ecore#//Bounds/nonNegativeHeight/diagnostics"/> + <genParameters xsi:type="genmodel:GenParameter" ecoreParameter="DC.ecore#//Bounds/nonNegativeHeight/context"/> </genOperations> </genClasses> </genPackages> diff --git a/extraplugins/diagram-definition/org.eclipse.papyrus.dd/model/DG.cmof b/extraplugins/diagram-definition/org.eclipse.papyrus.dd/model/DG.cmof index 192a154deac..98434347879 100644 --- a/extraplugins/diagram-definition/org.eclipse.papyrus.dd/model/DG.cmof +++ b/extraplugins/diagram-definition/org.eclipse.papyrus.dd/model/DG.cmof @@ -11,7 +11,13 @@ <ownedComment xmi:type="cmof:Comment" xmi:id="Canvas-_ownedComment.0" annotatedElement="Canvas">
<body>Canvas is a kind of group that has bounds.</body>
</ownedComment>
- <ownedAttribute xmi:type="cmof:Property" xmi:id="_loGuQNTkEeO3TMM_EGdzeA" name="bounds" visibility="public">
+ <ownedRule xmi:type="cmof:Constraint" xmi:id="_roVmMOjLEeO6TvQHODg78w" name="canvas_cannot_have_transforms" constrainedElement="Canvas" namespace="Canvas">
+ <specification xmi:type="cmof:OpaqueExpression" xmi:id="_roVmMejLEeO6TvQHODg78w">
+ <language>OCL</language>
+ <body>transform->isEmpty()</body>
+ </specification>
+ </ownedRule>
+ <ownedAttribute xmi:type="cmof:Property" xmi:id="_loGuQNTkEeO3TMM_EGdzeA" name="bounds" visibility="public" lower="0">
<ownedComment xmi:type="cmof:Comment" xmi:id="_loGuQdTkEeO3TMM_EGdzeA" annotatedElement="_loGuQNTkEeO3TMM_EGdzeA">
<body>the bounds of the canvas in the x-y coordinate system.</body>
</ownedComment>
@@ -24,7 +30,7 @@ </ownedComment>
<ownedRule xmi:type="cmof:Constraint" xmi:id="Circle-non_negative_radius" name="non_negative_radius" constrainedElement="Circle" namespace="Circle">
<ownedComment xmi:type="cmof:Comment" xmi:id="Circle-non_negative_radius-_ownedComment.0" annotatedElement="Circle-non_negative_radius">
- <body>the radius cannot be negative</body>
+ <body>The radius of a circle cannot be negative</body>
</ownedComment>
<specification xmi:type="cmof:OpaqueExpression" xmi:id="Circle-non_negative_radius-_specification">
<language>OCL</language>
@@ -37,7 +43,7 @@ </ownedComment>
<type xmi:type="cmof:DataType" href="DC.cmof#Point"/>
</ownedAttribute>
- <ownedAttribute xmi:type="cmof:Property" xmi:id="Circle-radius" name="radius" visibility="public">
+ <ownedAttribute xmi:type="cmof:Property" xmi:id="Circle-radius" name="radius" visibility="public" default="0">
<ownedComment xmi:type="cmof:Comment" xmi:id="Circle-radius-_ownedComment.0" annotatedElement="Circle-radius">
<body>a real number (>=0) that represents the radius of the circle.</body>
</ownedComment>
@@ -58,12 +64,6 @@ <ownedComment xmi:type="cmof:Comment" xmi:id="CubicCurveTo-_ownedComment.0" annotatedElement="CubicCurveTo">
<body>CubicCurveTo is a kind of path command that draws a cubic bézier curve from the current point to a new point using a start and an end control points.</body>
</ownedComment>
- <ownedAttribute xmi:type="cmof:Property" xmi:id="CubicCurveTo-point" name="point" visibility="public">
- <ownedComment xmi:type="cmof:Comment" xmi:id="CubicCurveTo-point-_ownedComment.0" annotatedElement="CubicCurveTo-point">
- <body>a point to draw a cubic bézier curve to from the current point in the coordinate system.</body>
- </ownedComment>
- <type xmi:type="cmof:DataType" href="DC.cmof#Point"/>
- </ownedAttribute>
<ownedAttribute xmi:type="cmof:Property" xmi:id="CubicCurveTo-startControl" name="startControl" visibility="public">
<ownedComment xmi:type="cmof:Comment" xmi:id="CubicCurveTo-startControl-_ownedComment.0" annotatedElement="CubicCurveTo-startControl">
<body>the start control point of the cubic bézier curve.</body>
@@ -76,12 +76,24 @@ </ownedComment>
<type xmi:type="cmof:DataType" href="DC.cmof#Point"/>
</ownedAttribute>
+ <ownedAttribute xmi:type="cmof:Property" xmi:id="CubicCurveTo-point" name="point" visibility="public">
+ <ownedComment xmi:type="cmof:Comment" xmi:id="CubicCurveTo-point-_ownedComment.0" annotatedElement="CubicCurveTo-point">
+ <body>a point to draw a cubic bézier curve to from the current point in the coordinate system.</body>
+ </ownedComment>
+ <type xmi:type="cmof:DataType" href="DC.cmof#Point"/>
+ </ownedAttribute>
</ownedMember>
<ownedMember xmi:type="cmof:Class" xmi:id="_CwockM6jEeOqlr8E3pzO9g" name="Definition" isAbstract="true">
<ownedComment xmi:type="cmof:Comment" xmi:id="_k77BMM6jEeOqlr8E3pzO9g" annotatedElement="MoveTo">
<body>Definition is an object with an id that can be nested under Definitions.</body>
</ownedComment>
- <ownedAttribute xmi:type="cmof:Property" xmi:id="_3JUlwM6jEeOqlr8E3pzO9g" name="id" visibility="public" isID="true">
+ <ownedRule xmi:type="cmof:Constraint" xmi:id="_0yDOEO08EeOCPtJ2AfZp5A" name="id_cannot_be_empty" constrainedElement="_CwockM6jEeOqlr8E3pzO9g" namespace="_CwockM6jEeOqlr8E3pzO9g">
+ <specification xmi:type="cmof:OpaqueExpression" xmi:id="_0yDOEe08EeOCPtJ2AfZp5A">
+ <language>OCL</language>
+ <body>id->notEmpty() implies id.size() > 0</body>
+ </specification>
+ </ownedRule>
+ <ownedAttribute xmi:type="cmof:Property" xmi:id="_3JUlwM6jEeOqlr8E3pzO9g" name="id" visibility="public" lower="0" isID="true">
<ownedComment xmi:type="cmof:Comment" xmi:id="_3JUlwc6jEeOqlr8E3pzO9g" annotatedElement="_3JUlwM6jEeOqlr8E3pzO9g">
<body>a point to move to in the coordinate system</body>
</ownedComment>
@@ -120,16 +132,10 @@ <type xmi:type="cmof:DataType" href="DC.cmof#Dimension"/>
</ownedAttribute>
</ownedMember>
- <ownedMember xmi:type="cmof:Class" xmi:id="EllipticalArcTo" name="EllipticalCurveTo" superClass="PathCommand">
+ <ownedMember xmi:type="cmof:Class" xmi:id="EllipticalArcTo" name="EllipticalArcTo" superClass="PathCommand">
<ownedComment xmi:type="cmof:Comment" xmi:id="EllipticalArcTo-_ownedComment.0" annotatedElement="CubicCurveTo QuadraticCurveTo">
<body>EllipticalArcTo is a kind of path command that draws an elliptical arc from the current point to a new point in the coordinate system.</body>
</ownedComment>
- <ownedAttribute xmi:type="cmof:Property" xmi:id="EllipticalArcTo-point" name="point" visibility="public">
- <ownedComment xmi:type="cmof:Comment" xmi:id="EllipticalArcTo-point-_ownedComment.0" annotatedElement="EllipticalArcTo-point">
- <body>a point to draw an elliptical arc to from the current point in the coordinate system.</body>
- </ownedComment>
- <type xmi:type="cmof:DataType" href="DC.cmof#Point"/>
- </ownedAttribute>
<ownedAttribute xmi:type="cmof:Property" xmi:id="EllipticalArcTo-radii" name="radii" visibility="public">
<ownedComment xmi:type="cmof:Comment" xmi:id="EllipticalArcTo-radii-_ownedComment.0" annotatedElement="EllipticalArcTo-radii">
<body>the two radii of the ellipse from which the arc is created.</body>
@@ -154,6 +160,12 @@ </ownedComment>
<type xmi:type="cmof:PrimitiveType" href="DC.cmof#Boolean"/>
</ownedAttribute>
+ <ownedAttribute xmi:type="cmof:Property" xmi:id="EllipticalArcTo-point" name="point" visibility="public">
+ <ownedComment xmi:type="cmof:Comment" xmi:id="EllipticalArcTo-point-_ownedComment.0" annotatedElement="EllipticalArcTo-point">
+ <body>a point to draw an elliptical arc to from the current point in the coordinate system.</body>
+ </ownedComment>
+ <type xmi:type="cmof:DataType" href="DC.cmof#Point"/>
+ </ownedAttribute>
</ownedMember>
<ownedMember xmi:type="cmof:Class" xmi:id="Gradient" name="Gradient" isAbstract="true" superClass="Fill">
<ownedComment xmi:type="cmof:Comment" xmi:id="Gradient-_ownedComment.0" annotatedElement="Gradient">
@@ -187,19 +199,19 @@ <body>opacity>=0 and opacity<=1</body>
</specification>
</ownedRule>
- <ownedAttribute xmi:type="cmof:Property" xmi:id="GradientStop-color" name="color" visibility="public">
+ <ownedAttribute xmi:type="cmof:Property" xmi:id="GradientStop-color" name="color" visibility="public" lower="0">
<ownedComment xmi:type="cmof:Comment" xmi:id="GradientStop-color-_ownedComment.0" annotatedElement="GradientStop-color">
<body>the color to use at this gradient stop.</body>
</ownedComment>
<type xmi:type="cmof:PrimitiveType" href="DC.cmof#Color"/>
</ownedAttribute>
- <ownedAttribute xmi:type="cmof:Property" xmi:id="GradientStop-offset" name="offset" visibility="public">
+ <ownedAttribute xmi:type="cmof:Property" xmi:id="GradientStop-offset" name="offset" visibility="public" lower="0">
<ownedComment xmi:type="cmof:Comment" xmi:id="GradientStop-offset-_ownedComment.0" annotatedElement="GradientStop-offset">
<body>an offset of this gradient stop represented as a percentage of the distance between the start and end positions of the gradient along the x and y axes.</body>
</ownedComment>
<type xmi:type="cmof:PrimitiveType" href="DC.cmof#Real"/>
</ownedAttribute>
- <ownedAttribute xmi:type="cmof:Property" xmi:id="GradientStop-opacity" name="opacity" visibility="public" default="1">
+ <ownedAttribute xmi:type="cmof:Property" xmi:id="GradientStop-opacity" name="opacity" visibility="public" lower="0">
<ownedComment xmi:type="cmof:Comment" xmi:id="GradientStop-opacity-_ownedComment.0" annotatedElement="GradientStop-opacity">
<body>a real number (>=0 and<=1) representing the opacity of the color at the stop. A value of 0 means totally transparent, while a value of 1 means totally opaque.</body>
</ownedComment>
@@ -210,6 +222,12 @@ <ownedComment xmi:type="cmof:Comment" xmi:id="GraphicalElement-_ownedComment.0" annotatedElement="GraphicalElement">
<body>GraphicalElement is the abstract superclass of all graphical elements that can be nested in a canvas.</body>
</ownedComment>
+ <ownedRule xmi:type="cmof:Constraint" xmi:id="_-a2yAOhzEeO6TvQHODg78w" name="referenced_clippath_has_id" constrainedElement="GraphicalElement" namespace="GraphicalElement">
+ <specification xmi:type="cmof:OpaqueExpression" xmi:id="_I9m_EOh0EeO6TvQHODg78w">
+ <language>OCL</language>
+ <body>clipPath->notEmpty() implies clipPath.id->notEmpty()</body>
+ </specification>
+ </ownedRule>
<ownedAttribute xmi:type="cmof:Property" xmi:id="GraphicalElement-clipPath" name="clipPath" visibility="public" type="ClipPath" lower="0" association="A_clipPath_clippedElement">
<ownedComment xmi:type="cmof:Comment" xmi:id="GraphicalElement-clipPath-_ownedComment.0" annotatedElement="GraphicalElement-clipPath">
<body>A clip path that masks the painting of this graphical element.</body>
@@ -220,9 +238,9 @@ <body>The group that owns this graphical element.</body>
</ownedComment>
</ownedAttribute>
- <ownedAttribute xmi:type="cmof:Property" xmi:id="_yyXeMM2TEeOtK5GsJlm5Mw" name="keyword" visibility="public" isOrdered="true" lower="0" upper="*">
+ <ownedAttribute xmi:type="cmof:Property" xmi:id="_yyXeMM2TEeOtK5GsJlm5Mw" name="class" visibility="public" isOrdered="true" lower="0" upper="*">
<ownedComment xmi:type="cmof:Comment" xmi:id="_yyXeMc2TEeOtK5GsJlm5Mw" annotatedElement="_yyXeMM2TEeOtK5GsJlm5Mw">
- <body>A list of strings representing keywords of the graphical element.</body>
+ <body>A list of strings representing classes of the graphical element.</body>
</ownedComment>
<type xmi:type="cmof:PrimitiveType" href="DC.cmof#String"/>
</ownedAttribute>
@@ -251,6 +269,12 @@ <ownedComment xmi:type="cmof:Comment" xmi:id="Image-_ownedComment.0" annotatedElement="Image">
<body>Image is a graphical element that defines a shape that paints an image with a given URL within given bounds.</body>
</ownedComment>
+ <ownedRule xmi:type="cmof:Constraint" xmi:id="_6903kOjNEeO6TvQHODg78w" name="source_cannot_be_empty" constrainedElement="Image" namespace="Image">
+ <specification xmi:type="cmof:OpaqueExpression" xmi:id="_6903kejNEeO6TvQHODg78w">
+ <language>OCL</language>
+ <body>source->notEmpty() implies source.size() > 0</body>
+ </specification>
+ </ownedRule>
<ownedAttribute xmi:type="cmof:Property" xmi:id="Image-source" name="source" visibility="public">
<ownedComment xmi:type="cmof:Comment" xmi:id="Image-source-_ownedComment.0" annotatedElement="Image-source">
<body>the URL of a referenced image file.</body>
@@ -263,7 +287,7 @@ </ownedComment>
<type xmi:type="cmof:DataType" href="DC.cmof#Bounds"/>
</ownedAttribute>
- <ownedAttribute xmi:type="cmof:Property" xmi:id="Image-isAspectRatioPreserved" name="isAspectRatioPreserved" visibility="public">
+ <ownedAttribute xmi:type="cmof:Property" xmi:id="Image-isAspectRatioPreserved" name="isAspectRatioPreserved" visibility="public" default="false">
<ownedComment xmi:type="cmof:Comment" xmi:id="Image-isAspectRatioPreserved-_ownedComment.0" annotatedElement="Image-isAspectRatioPreserved">
<body>wether to preserve the aspect ratio of the image upon scaling, i.e. the same scale factor for width and height.</body>
</ownedComment>
@@ -328,6 +352,24 @@ <ownedComment xmi:type="cmof:Comment" xmi:id="MarkedElement-_ownedComment.0" annotatedElement="MarkedElement">
<body>MarkedElement is a graphic element that can be decorated at its vertices with markers (e.g. arrowheads).</body>
</ownedComment>
+ <ownedRule xmi:type="cmof:Constraint" xmi:id="_wycJoOh1EeO6TvQHODg78w" name="referenced_start_marker_has_id" constrainedElement="MarkedElement" namespace="MarkedElement">
+ <specification xmi:type="cmof:OpaqueExpression" xmi:id="_wycJoeh1EeO6TvQHODg78w">
+ <language>OCL</language>
+ <body>startMarker->notEmpty() implies startMarker.id->notEmpty()</body>
+ </specification>
+ </ownedRule>
+ <ownedRule xmi:type="cmof:Constraint" xmi:id="_8rYGgOh1EeO6TvQHODg78w" name="referenced_mid_marker_has_id" constrainedElement="MarkedElement" namespace="MarkedElement">
+ <specification xmi:type="cmof:OpaqueExpression" xmi:id="_8rYGgeh1EeO6TvQHODg78w">
+ <language>OCL</language>
+ <body>midMarker->notEmpty() implies midMarker.id->notEmpty()</body>
+ </specification>
+ </ownedRule>
+ <ownedRule xmi:type="cmof:Constraint" xmi:id="_B10LEOh2EeO6TvQHODg78w" name="referenced_end_marker_has_id" constrainedElement="MarkedElement" namespace="MarkedElement">
+ <specification xmi:type="cmof:OpaqueExpression" xmi:id="_B10LEeh2EeO6TvQHODg78w">
+ <language>OCL</language>
+ <body>endMarker->notEmpty() implies endMarker.id->notEmpty()</body>
+ </specification>
+ </ownedRule>
<ownedAttribute xmi:type="cmof:Property" xmi:id="MarkedElement-endMarker" name="endMarker" visibility="public" type="Marker" lower="0" association="A_endMarker_markedElement">
<ownedComment xmi:type="cmof:Comment" xmi:id="MarkedElement-endMarker-_ownedComment.0" annotatedElement="MarkedElement-endMarker">
<body>an optional end marker that aligns with the last vertex of the marked element.</body>
@@ -417,6 +459,12 @@ <ownedComment xmi:type="cmof:Comment" xmi:id="_C_Q0gM2dEeOtK5GsJlm5Mw">
<body>Paint is used to fill or stroke a graphical element.</body>
</ownedComment>
+ <ownedRule xmi:type="cmof:Constraint" xmi:id="_R3fe8Oh2EeO6TvQHODg78w" name="referenced_paint_server_has_id" constrainedElement="_wz9hsM2cEeOtK5GsJlm5Mw" namespace="_wz9hsM2cEeOtK5GsJlm5Mw">
+ <specification xmi:type="cmof:OpaqueExpression" xmi:id="_R3fe8eh2EeO6TvQHODg78w">
+ <language>OCL</language>
+ <body>paintServer->notEmpty() implies paintServer.id->notEmpty()</body>
+ </specification>
+ </ownedRule>
<ownedAttribute xmi:type="cmof:Property" xmi:id="_Mg5i0M2dEeOtK5GsJlm5Mw" name="color" visibility="public" lower="0">
<ownedComment xmi:type="cmof:Comment" xmi:id="_Mg5i0c2dEeOtK5GsJlm5Mw" annotatedElement="_Mg5i0M2dEeOtK5GsJlm5Mw">
<body>A solid color to use in painting.</body>
@@ -443,7 +491,13 @@ <ownedComment xmi:type="cmof:Comment" xmi:id="Path-_ownedComment.0" annotatedElement="Path">
<body>Path is a marked element that defines a custom shape whose geometry is specified with a sequence of path commands.</body>
</ownedComment>
- <ownedAttribute xmi:type="cmof:Property" xmi:id="Path-command" name="command" visibility="public" type="PathCommand" isOrdered="true" lower="0" upper="*" isComposite="true" association="_-INckM55EeOqlr8E3pzO9g">
+ <ownedRule xmi:type="cmof:Constraint" xmi:id="_uJDzUOjHEeO6TvQHODg78w" name="first_command_must_be_move" constrainedElement="Path" namespace="Path">
+ <specification xmi:type="cmof:OpaqueExpression" xmi:id="_Omo48OjIEeO6TvQHODg78w">
+ <language>OCL</language>
+ <body>command->first().oclIsKindOf(MoveTo)</body>
+ </specification>
+ </ownedRule>
+ <ownedAttribute xmi:type="cmof:Property" xmi:id="Path-command" name="command" visibility="public" type="PathCommand" isOrdered="true" upper="*" isComposite="true" association="_-INckM55EeOqlr8E3pzO9g">
<ownedComment xmi:type="cmof:Comment" xmi:id="Path-command-_ownedComment.0" annotatedElement="Path-command">
<body>a list of path commands that define the geometry of the custom shape.</body>
</ownedComment>
@@ -502,18 +556,18 @@ <ownedComment xmi:type="cmof:Comment" xmi:id="QuadraticCurveTo-_ownedComment.0" annotatedElement="CubicCurveTo QuadraticCurveTo">
<body>QuadraticCurveTo is a kind of path command that draws a quadratic bézier curve from the current point to a new point using a single control point.</body>
</ownedComment>
- <ownedAttribute xmi:type="cmof:Property" xmi:id="QuadraticCurveTo-point" name="point" visibility="public">
- <ownedComment xmi:type="cmof:Comment" xmi:id="QuadraticCurveTo-point-_ownedComment.0" annotatedElement="QuadraticCurveTo-point">
- <body>a point to draw a quadratic bézier curve to from the current point in the coordinate system.</body>
- </ownedComment>
- <type xmi:type="cmof:DataType" href="DC.cmof#Point"/>
- </ownedAttribute>
<ownedAttribute xmi:type="cmof:Property" xmi:id="QuadraticCurveTo-control" name="control" visibility="public">
<ownedComment xmi:type="cmof:Comment" xmi:id="QuadraticCurveTo-control-_ownedComment.0" annotatedElement="QuadraticCurveTo-control">
<body>the control point of the quadratic bézier curve.</body>
</ownedComment>
<type xmi:type="cmof:DataType" href="DC.cmof#Point"/>
</ownedAttribute>
+ <ownedAttribute xmi:type="cmof:Property" xmi:id="QuadraticCurveTo-point" name="point" visibility="public">
+ <ownedComment xmi:type="cmof:Comment" xmi:id="QuadraticCurveTo-point-_ownedComment.0" annotatedElement="QuadraticCurveTo-point">
+ <body>a point to draw a quadratic bézier curve to from the current point in the coordinate system.</body>
+ </ownedComment>
+ <type xmi:type="cmof:DataType" href="DC.cmof#Point"/>
+ </ownedAttribute>
</ownedMember>
<ownedMember xmi:type="cmof:Class" xmi:id="RadialGradient" name="RadialGradient" superClass="Gradient">
<ownedComment xmi:type="cmof:Comment" xmi:id="RadialGradient-_ownedComment.0" annotatedElement="RadialGradient">
@@ -569,13 +623,19 @@ <ownedComment xmi:type="cmof:Comment" xmi:id="Rectangle-_ownedComment.0" annotatedElement="Rectangle">
<body>Rectangle is a graphical element that defines a rectangular shape with given bounds. A rectangle may be given rounded corners by setting its corner radius.</body>
</ownedComment>
+ <ownedRule xmi:type="cmof:Constraint" xmi:id="_qFi4AOhuEeO6TvQHODg78w" name="non_negative_corner_radius" constrainedElement="Rectangle" namespace="Rectangle">
+ <specification xmi:type="cmof:OpaqueExpression" xmi:id="_qFi4AehuEeO6TvQHODg78w">
+ <language>OCL</language>
+ <body>cornerRadius >= 0</body>
+ </specification>
+ </ownedRule>
<ownedAttribute xmi:type="cmof:Property" xmi:id="Rectangle-bounds" name="bounds" visibility="public">
<ownedComment xmi:type="cmof:Comment" xmi:id="Rectangle-bounds-_ownedComment.0" annotatedElement="Rectangle-bounds">
<body>the bounds of the rectangle in the x-y coordinate system.</body>
</ownedComment>
<type xmi:type="cmof:DataType" href="DC.cmof#Bounds"/>
</ownedAttribute>
- <ownedAttribute xmi:type="cmof:Property" xmi:id="Rectangle-cornerRadius" name="cornerRadius" visibility="public" default="0">
+ <ownedAttribute xmi:type="cmof:Property" xmi:id="Rectangle-cornerRadius" name="cornerRadius" visibility="public" lower="0" default="0">
<ownedComment xmi:type="cmof:Comment" xmi:id="Rectangle-cornerRadius-_ownedComment.0" annotatedElement="Rectangle-cornerRadius">
<body>a radius for the rectangle's rounded corners. When the radius is 0, the rectangle is drawn with sharp corners.</body>
</ownedComment>
@@ -597,7 +657,7 @@ <body>An optional definitions element to hold objects commonly referenced by the canvas.</body>
</ownedComment>
</ownedAttribute>
- <ownedAttribute xmi:type="cmof:Property" xmi:id="_jfIkGdesEeOsUY1jE2-lpg" name="styleSheet" visibility="public" type="_4ytfwM2CEeOX1ohrWoozJQ" isOrdered="true" lower="0" upper="*" association="_VJB6MM41EeOqlr8E3pzO9g">
+ <ownedAttribute xmi:type="cmof:Property" xmi:id="_jfIkGdesEeOsUY1jE2-lpg" name="externalStyleSheet" visibility="public" type="_4ytfwM2CEeOX1ohrWoozJQ" isOrdered="true" lower="0" upper="*" association="_VJB6MM41EeOqlr8E3pzO9g">
<ownedComment xmi:type="cmof:Comment" xmi:id="_jfIkGtesEeOsUY1jE2-lpg" annotatedElement="_jfIkGdesEeOsUY1jE2-lpg">
<body>A list of external style sheets that are imported by the canvas.</body>
</ownedComment>
@@ -795,15 +855,14 @@ <ownedComment xmi:type="cmof:Comment" xmi:id="_FfB5AM2REeOtK5GsJlm5Mw">
<body>StyleSelector defines criteria that matches a set of graphical elements.</body>
</ownedComment>
- <ownedAttribute xmi:type="cmof:Property" xmi:id="_OsgrUM2IEeOX1ohrWoozJQ" name="type" visibility="public" lower="0" association="_KQ3bAM57EeOqlr8E3pzO9g">
+ <ownedAttribute xmi:type="cmof:Property" xmi:id="_OsgrUM2IEeOX1ohrWoozJQ" name="kind" visibility="public" type="_6aYm0OgeEeO6TvQHODg78w" lower="0">
<ownedComment xmi:type="cmof:Comment" xmi:id="_OsgrUc2IEeOX1ohrWoozJQ" annotatedElement="_OsgrUM2IEeOX1ohrWoozJQ">
- <body>A non-abstract type that is a subtype of GraphicalElement. Elements having this type are selected.</body>
+ <body>The kind of graphical element to select.</body>
</ownedComment>
- <type xmi:type="cmof:Class" href="pathmap://UML_METAMODELS/Ecore.metamodel.uml#EClass"/>
</ownedAttribute>
- <ownedAttribute xmi:type="cmof:Property" xmi:id="_Y03bYM2IEeOX1ohrWoozJQ" name="keyword" visibility="public" isOrdered="true" lower="0" upper="*">
+ <ownedAttribute xmi:type="cmof:Property" xmi:id="_Y03bYM2IEeOX1ohrWoozJQ" name="class" visibility="public" isOrdered="true" lower="0" upper="*">
<ownedComment xmi:type="cmof:Comment" xmi:id="_Y03bYc2IEeOX1ohrWoozJQ" annotatedElement="_Y03bYM2IEeOX1ohrWoozJQ">
- <body>A list of strings representing keywords of graphical elements. Elements having these keywords are selected.</body>
+ <body>A set of strings representing classes of graphical elements to select. Selected elements must have all those classes.</body>
</ownedComment>
<type xmi:type="cmof:PrimitiveType" href="DC.cmof#String"/>
</ownedAttribute>
@@ -822,6 +881,12 @@ <ownedComment xmi:type="cmof:Comment" xmi:id="Text-_ownedComment.0" annotatedElement="Text">
<body>Text is a graphical element that defines a shape that renders a character string at a given position.</body>
</ownedComment>
+ <ownedRule xmi:type="cmof:Constraint" xmi:id="_dPn0oO0zEeOCPtJ2AfZp5A" name="data_cannot_be_empty" constrainedElement="Text" namespace="Text">
+ <specification xmi:type="cmof:OpaqueExpression" xmi:id="_dPn0oe0zEeOCPtJ2AfZp5A">
+ <language>OCL</language>
+ <body>data->notEmpty() implies data.size() > 0</body>
+ </specification>
+ </ownedRule>
<ownedAttribute xmi:type="cmof:Property" xmi:id="Text-data" name="data" visibility="public">
<ownedComment xmi:type="cmof:Comment" xmi:id="Text-data-_ownedComment.0" annotatedElement="Text-data">
<body>the text as a string of characters.</body>
@@ -861,12 +926,23 @@ <ownedComment xmi:type="cmof:Comment" xmi:id="_wGwIsdeoEeOgmPOh7kSfHA" annotatedElement="_wGwIsNeoEeOgmPOh7kSfHA">
<body>Rectangle is a graphical element that defines a rectangular shape with given bounds. A rectangle may be given rounded corners by setting its corner radius.</body>
</ownedComment>
- <ownedAttribute xmi:type="cmof:Property" xmi:id="_wGwIs9eoEeOgmPOh7kSfHA" name="bounds" visibility="public">
+ <ownedRule xmi:type="cmof:Constraint" xmi:id="_oxx7UOh0EeO6TvQHODg78w" name="referenced_element_has_id" constrainedElement="_wGwIsNeoEeOgmPOh7kSfHA" namespace="_wGwIsNeoEeOgmPOh7kSfHA">
+ <specification xmi:type="cmof:OpaqueExpression" xmi:id="_oxx7Ueh0EeO6TvQHODg78w">
+ <language>OCL</language>
+ <body>referencedElement->notEmpty() implies referencedElement.id->notEmpty()</body>
+ </specification>
+ </ownedRule>
+ <ownedAttribute xmi:type="cmof:Property" xmi:id="_wGwIs9eoEeOgmPOh7kSfHA" name="bounds" visibility="public" lower="0">
<ownedComment xmi:type="cmof:Comment" xmi:id="_wGwItNeoEeOgmPOh7kSfHA" annotatedElement="_wGwIs9eoEeOgmPOh7kSfHA">
<body>the bounds of the rectangle in the x-y coordinate system.</body>
</ownedComment>
<type xmi:type="cmof:DataType" href="DC.cmof#Bounds"/>
</ownedAttribute>
+ <ownedAttribute xmi:type="cmof:Property" xmi:id="_im5DIOHhEeO71tdCkM4EDw" name="referencedElement" visibility="public" type="GraphicalElement" isOrdered="true" association="_zbtccOHnEeO71tdCkM4EDw">
+ <ownedComment xmi:type="cmof:Comment" xmi:id="_im5DIeHhEeO71tdCkM4EDw" annotatedElement="_im5DIOHhEeO71tdCkM4EDw">
+ <body>A list of graphical elements that are members of this group.</body>
+ </ownedComment>
+ </ownedAttribute>
</ownedMember>
<ownedMember xmi:type="cmof:Enumeration" xmi:id="_wgzj4M2WEeOtK5GsJlm5Mw" name="FontDecoration">
<ownedComment xmi:type="cmof:Comment" xmi:id="_2Xj74M2WEeOtK5GsJlm5Mw">
@@ -888,10 +964,85 @@ </ownedComment>
</ownedLiteral>
</ownedMember>
+ <ownedMember xmi:type="cmof:Enumeration" xmi:id="_6aYm0OgeEeO6TvQHODg78w" name="ElementKind">
+ <ownedComment xmi:type="cmof:Comment" xmi:id="_6aYm0egeEeO6TvQHODg78w">
+ <body>The kind of graphical element.</body>
+ </ownedComment>
+ <ownedLiteral xmi:type="cmof:EnumerationLiteral" xmi:id="_6aYm0ugeEeO6TvQHODg78w" name="canvas" classifier="#_6aYm0OgeEeO6TvQHODg78w" enumeration="_6aYm0OgeEeO6TvQHODg78w">
+ <ownedComment xmi:type="cmof:Comment" xmi:id="_6aYm0-geEeO6TvQHODg78w">
+ <body>The Canvas element kind</body>
+ </ownedComment>
+ </ownedLiteral>
+ <ownedLiteral xmi:type="cmof:EnumerationLiteral" xmi:id="_TObvQOgfEeO6TvQHODg78w" name="circle" classifier="#_6aYm0OgeEeO6TvQHODg78w" enumeration="_6aYm0OgeEeO6TvQHODg78w">
+ <ownedComment xmi:type="cmof:Comment" xmi:id="_TObvQegfEeO6TvQHODg78w">
+ <body>The Circle element kind</body>
+ </ownedComment>
+ </ownedLiteral>
+ <ownedLiteral xmi:type="cmof:EnumerationLiteral" xmi:id="_XmBakOgfEeO6TvQHODg78w" name="clipPath" classifier="#_6aYm0OgeEeO6TvQHODg78w" enumeration="_6aYm0OgeEeO6TvQHODg78w">
+ <ownedComment xmi:type="cmof:Comment" xmi:id="_XmBakegfEeO6TvQHODg78w">
+ <body>The ClipPath element kind</body>
+ </ownedComment>
+ </ownedLiteral>
+ <ownedLiteral xmi:type="cmof:EnumerationLiteral" xmi:id="_iEuOEOgfEeO6TvQHODg78w" name="ellipse" classifier="#_6aYm0OgeEeO6TvQHODg78w" enumeration="_6aYm0OgeEeO6TvQHODg78w">
+ <ownedComment xmi:type="cmof:Comment" xmi:id="_iEuOEegfEeO6TvQHODg78w">
+ <body>The Ellipse element kind</body>
+ </ownedComment>
+ </ownedLiteral>
+ <ownedLiteral xmi:type="cmof:EnumerationLiteral" xmi:id="_nqm4gOgfEeO6TvQHODg78w" name="group" classifier="#_6aYm0OgeEeO6TvQHODg78w" enumeration="_6aYm0OgeEeO6TvQHODg78w">
+ <ownedComment xmi:type="cmof:Comment" xmi:id="_nqm4gegfEeO6TvQHODg78w">
+ <body>The Group element kind</body>
+ </ownedComment>
+ </ownedLiteral>
+ <ownedLiteral xmi:type="cmof:EnumerationLiteral" xmi:id="_n3HqgOgfEeO6TvQHODg78w" name="image" classifier="#_6aYm0OgeEeO6TvQHODg78w" enumeration="_6aYm0OgeEeO6TvQHODg78w">
+ <ownedComment xmi:type="cmof:Comment" xmi:id="_n3IRkOgfEeO6TvQHODg78w">
+ <body>The Image element kind</body>
+ </ownedComment>
+ </ownedLiteral>
+ <ownedLiteral xmi:type="cmof:EnumerationLiteral" xmi:id="_n9h0gOgfEeO6TvQHODg78w" name="line" classifier="#_6aYm0OgeEeO6TvQHODg78w" enumeration="_6aYm0OgeEeO6TvQHODg78w">
+ <ownedComment xmi:type="cmof:Comment" xmi:id="_n9h0gegfEeO6TvQHODg78w">
+ <body>The Line element kind</body>
+ </ownedComment>
+ </ownedLiteral>
+ <ownedLiteral xmi:type="cmof:EnumerationLiteral" xmi:id="_oEA3AOgfEeO6TvQHODg78w" name="marker" classifier="#_6aYm0OgeEeO6TvQHODg78w" enumeration="_6aYm0OgeEeO6TvQHODg78w">
+ <ownedComment xmi:type="cmof:Comment" xmi:id="_oEA3AegfEeO6TvQHODg78w">
+ <body>The Marker element kind</body>
+ </ownedComment>
+ </ownedLiteral>
+ <ownedLiteral xmi:type="cmof:EnumerationLiteral" xmi:id="_oJbigOgfEeO6TvQHODg78w" name="path" classifier="#_6aYm0OgeEeO6TvQHODg78w" enumeration="_6aYm0OgeEeO6TvQHODg78w">
+ <ownedComment xmi:type="cmof:Comment" xmi:id="_oJbigegfEeO6TvQHODg78w">
+ <body>The Path element kind</body>
+ </ownedComment>
+ </ownedLiteral>
+ <ownedLiteral xmi:type="cmof:EnumerationLiteral" xmi:id="_oO2OAOgfEeO6TvQHODg78w" name="polygon" classifier="#_6aYm0OgeEeO6TvQHODg78w" enumeration="_6aYm0OgeEeO6TvQHODg78w">
+ <ownedComment xmi:type="cmof:Comment" xmi:id="_oO2OAegfEeO6TvQHODg78w">
+ <body>The Polygon element kind</body>
+ </ownedComment>
+ </ownedLiteral>
+ <ownedLiteral xmi:type="cmof:EnumerationLiteral" xmi:id="_oXUNgOgfEeO6TvQHODg78w" name="polyline" classifier="#_6aYm0OgeEeO6TvQHODg78w" enumeration="_6aYm0OgeEeO6TvQHODg78w">
+ <ownedComment xmi:type="cmof:Comment" xmi:id="_oXUNgegfEeO6TvQHODg78w">
+ <body>The Polyline element kind</body>
+ </ownedComment>
+ </ownedLiteral>
+ <ownedLiteral xmi:type="cmof:EnumerationLiteral" xmi:id="_ofLJAOgfEeO6TvQHODg78w" name="rectangle" classifier="#_6aYm0OgeEeO6TvQHODg78w" enumeration="_6aYm0OgeEeO6TvQHODg78w">
+ <ownedComment xmi:type="cmof:Comment" xmi:id="_ofLJAegfEeO6TvQHODg78w">
+ <body>The Rectangle element kind</body>
+ </ownedComment>
+ </ownedLiteral>
+ <ownedLiteral xmi:type="cmof:EnumerationLiteral" xmi:id="_oluc8OgfEeO6TvQHODg78w" name="text" classifier="#_6aYm0OgeEeO6TvQHODg78w" enumeration="_6aYm0OgeEeO6TvQHODg78w">
+ <ownedComment xmi:type="cmof:Comment" xmi:id="_oluc8egfEeO6TvQHODg78w">
+ <body>The Text element kind</body>
+ </ownedComment>
+ </ownedLiteral>
+ <ownedLiteral xmi:type="cmof:EnumerationLiteral" xmi:id="_oz2_kOgfEeO6TvQHODg78w" name="use" classifier="#_6aYm0OgeEeO6TvQHODg78w" enumeration="_6aYm0OgeEeO6TvQHODg78w">
+ <ownedComment xmi:type="cmof:Comment" xmi:id="_oz2_kegfEeO6TvQHODg78w">
+ <body>The Use element kind</body>
+ </ownedComment>
+ </ownedLiteral>
+ </ownedMember>
<ownedMember xmi:type="cmof:Association" xmi:id="_qUuAwM51EeOqlr8E3pzO9g" name="A_definitions_canvas" memberEnd="_jfIkFtesEeOsUY1jE2-lpg _qUuAwc51EeOqlr8E3pzO9g">
<ownedEnd xmi:type="cmof:Property" xmi:id="_qUuAwc51EeOqlr8E3pzO9g" name="canvas" visibility="public" type="_jfIkENesEeOsUY1jE2-lpg" owningAssociation="_qUuAwM51EeOqlr8E3pzO9g" association="_qUuAwM51EeOqlr8E3pzO9g"/>
</ownedMember>
- <ownedMember xmi:type="cmof:Association" xmi:id="_VJB6MM41EeOqlr8E3pzO9g" name="A_styleSheet_canvas" memberEnd="_jfIkGdesEeOsUY1jE2-lpg _VJB6Mc41EeOqlr8E3pzO9g">
+ <ownedMember xmi:type="cmof:Association" xmi:id="_VJB6MM41EeOqlr8E3pzO9g" name="A_externalStyleSheet_canvas" memberEnd="_jfIkGdesEeOsUY1jE2-lpg _VJB6Mc41EeOqlr8E3pzO9g">
<ownedEnd xmi:type="cmof:Property" xmi:id="_VJB6Mc41EeOqlr8E3pzO9g" name="canvas" visibility="public" type="_jfIkENesEeOsUY1jE2-lpg" lower="0" upper="*" owningAssociation="_VJB6MM41EeOqlr8E3pzO9g" association="_VJB6MM41EeOqlr8E3pzO9g"/>
</ownedMember>
<ownedMember xmi:type="cmof:Association" xmi:id="_Nti6EM53EeOqlr8E3pzO9g" name="A_definition_definitions" memberEnd="_zSdxIM5wEeOqlr8E3pzO9g _Nti6Ec53EeOqlr8E3pzO9g">
@@ -946,12 +1097,12 @@ <ownedMember xmi:type="cmof:Association" xmi:id="_vnz5oM2GEeOX1ohrWoozJQ" name="A_style_styleRule" memberEnd="_DFi6IM2GEeOX1ohrWoozJQ _vnz5oc2GEeOX1ohrWoozJQ">
<ownedEnd xmi:type="cmof:Property" xmi:id="_vnz5oc2GEeOX1ohrWoozJQ" name="styleRule" visibility="public" type="_9z_BQM2CEeOX1ohrWoozJQ" lower="0" owningAssociation="_vnz5oM2GEeOX1ohrWoozJQ" association="_vnz5oM2GEeOX1ohrWoozJQ"/>
</ownedMember>
- <ownedMember xmi:type="cmof:Association" xmi:id="_KQ3bAM57EeOqlr8E3pzO9g" name="A_type_styleSelector" memberEnd="_OsgrUM2IEeOX1ohrWoozJQ _KQ3bAc57EeOqlr8E3pzO9g">
- <ownedEnd xmi:type="cmof:Property" xmi:id="_KQ3bAc57EeOqlr8E3pzO9g" name="styleSelector" visibility="public" type="_ClirwM2DEeOX1ohrWoozJQ" lower="0" upper="*" owningAssociation="_KQ3bAM57EeOqlr8E3pzO9g" association="_KQ3bAM57EeOqlr8E3pzO9g"/>
- </ownedMember>
<ownedMember xmi:type="cmof:Association" xmi:id="_QZkcUM2DEeOX1ohrWoozJQ" name="A_rule_styleSheet" memberEnd="_TqPtcM2EEeOX1ohrWoozJQ _ZfKSYM2EEeOX1ohrWoozJQ">
<ownedEnd xmi:type="cmof:Property" xmi:id="_ZfKSYM2EEeOX1ohrWoozJQ" name="styleSheet" visibility="public" type="_4ytfwM2CEeOX1ohrWoozJQ" owningAssociation="_QZkcUM2DEeOX1ohrWoozJQ" association="_QZkcUM2DEeOX1ohrWoozJQ"/>
</ownedMember>
+ <ownedMember xmi:type="cmof:Association" xmi:id="_zbtccOHnEeO71tdCkM4EDw" name="A_referencedElement_use" memberEnd="_im5DIOHhEeO71tdCkM4EDw _zbtcceHnEeO71tdCkM4EDw">
+ <ownedEnd xmi:type="cmof:Property" xmi:id="_zbtcceHnEeO71tdCkM4EDw" name="use" visibility="public" type="_wGwIsNeoEeOgmPOh7kSfHA" lower="0" upper="*" owningAssociation="_zbtccOHnEeO71tdCkM4EDw" association="_zbtccOHnEeO71tdCkM4EDw"/>
+ </ownedMember>
<xmi:Extension extender="http://www.eclipse.org/uml2/4.0.0/UML">
<profileApplication xmi:type="cmof:ProfileApplication" xmi:id="_mgdyEM1vEeOX1ohrWoozJQ" applyingPackage="_0">
<xmi:Extension extender="http://www.eclipse.org/uml2/4.0.0/UML">
@@ -1014,6 +1165,21 @@ <xmi:Extension extender="http://www.eclipse.org/uml2/4.0.0/UML">
<Ecore:EAttribute xmi:id="_huN4sNevEeOsUY1jE2-lpg" isUnsettable="true" base_Property="_jfIkE9esEeOsUY1jE2-lpg"/>
</xmi:Extension>
- <cmof:Tag xmi:id="_18" name="org.omg.xmi.nsPrefix" value="dg" element="_0"/>
- <cmof:Tag xmi:id="_19" name="org.omg.xmi.nsURI" value="http://www.omg.org/spec/DD/20110901/DG" element="_0"/>
+ <xmi:Extension extender="http://www.eclipse.org/uml2/4.0.0/UML">
+ <Ecore:EAttribute xmi:id="_4NBHoOgvEeO6TvQHODg78w" isUnsettable="true" base_Property="_OsgrUM2IEeOX1ohrWoozJQ"/>
+ </xmi:Extension>
+ <xmi:Extension extender="http://www.eclipse.org/uml2/4.0.0/UML">
+ <Ecore:EAttribute xmi:id="_Vs_CQOhUEeO6TvQHODg78w" isUnsettable="true" base_Property="GradientStop-offset"/>
+ </xmi:Extension>
+ <xmi:Extension extender="http://www.eclipse.org/uml2/4.0.0/UML">
+ <Ecore:EAttribute xmi:id="_jGzjEOhUEeO6TvQHODg78w" isUnsettable="true" base_Property="GradientStop-opacity"/>
+ </xmi:Extension>
+ <xmi:Extension extender="http://www.eclipse.org/uml2/4.0.0/UML">
+ <Ecore:EAttribute xmi:id="__K6HAOhUEeO6TvQHODg78w" isUnsettable="true" base_Property="GradientStop-color"/>
+ </xmi:Extension>
+ <xmi:Extension extender="http://www.eclipse.org/uml2/4.0.0/UML">
+ <Ecore:EAttribute xmi:id="_dpXEIOhuEeO6TvQHODg78w" isUnsettable="true" base_Property="Rectangle-cornerRadius"/>
+ </xmi:Extension>
+ <cmof:Tag xmi:id="_23" name="org.omg.xmi.nsPrefix" value="dg" element="_0"/>
+ <cmof:Tag xmi:id="_24" name="org.omg.xmi.nsURI" value="http://www.omg.org/spec/DD/20110901/DG" element="_0"/>
</xmi:XMI>
diff --git a/extraplugins/diagram-definition/org.eclipse.papyrus.dd/model/DG.ecore b/extraplugins/diagram-definition/org.eclipse.papyrus.dd/model/DG.ecore index c07d387f1f0..c509a728bdf 100644 --- a/extraplugins/diagram-definition/org.eclipse.papyrus.dd/model/DG.ecore +++ b/extraplugins/diagram-definition/org.eclipse.papyrus.dd/model/DG.ecore @@ -11,8 +11,27 @@ <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel"> <details key="documentation" value="Canvas is a kind of group that has bounds."/> </eAnnotations> + <eOperations name="canvasCannotHaveTransforms" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean"> + <eAnnotations source="http://www.eclipse.org/emf/2002/Ecore/OCL"> + <details key="body" value="transform->isEmpty()"/> + </eAnnotations> + <eParameters name="diagnostics" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EDiagnosticChain"> + <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel"> + <details key="documentation" value="The chain of diagnostics to which problems are to be appended."/> + </eAnnotations> + </eParameters> + <eParameters name="context"> + <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel"> + <details key="documentation" value="The cache of context-specific information."/> + </eAnnotations> + <eGenericType eClassifier="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EMap"> + <eTypeArguments eClassifier="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/> + <eTypeArguments eClassifier="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/> + </eGenericType> + </eParameters> + </eOperations> <eStructuralFeatures xsi:type="ecore:EReference" name="bounds" ordered="false" - lowerBound="1" eType="ecore:EClass DC.ecore#//Bounds" containment="true"> + eType="ecore:EClass DC.ecore#//Bounds" containment="true"> <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel"> <details key="documentation" value="the bounds of the canvas in the x-y coordinate system."/> </eAnnotations> @@ -33,6 +52,25 @@ <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel"> <details key="documentation" value="GraphicalElement is the abstract superclass of all graphical elements that can be nested in a canvas."/> </eAnnotations> + <eOperations name="referencedClippathHasId" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean"> + <eAnnotations source="http://www.eclipse.org/emf/2002/Ecore/OCL"> + <details key="body" value="clipPath->notEmpty() implies clipPath.id->notEmpty()"/> + </eAnnotations> + <eParameters name="diagnostics" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EDiagnosticChain"> + <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel"> + <details key="documentation" value="The chain of diagnostics to which problems are to be appended."/> + </eAnnotations> + </eParameters> + <eParameters name="context"> + <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel"> + <details key="documentation" value="The cache of context-specific information."/> + </eAnnotations> + <eGenericType eClassifier="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EMap"> + <eTypeArguments eClassifier="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/> + <eTypeArguments eClassifier="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/> + </eGenericType> + </eParameters> + </eOperations> <eStructuralFeatures xsi:type="ecore:EReference" name="clipPath" ordered="false" eType="#//ClipPath"> <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel"> @@ -45,10 +83,10 @@ <details key="documentation" value="The group that owns this graphical element."/> </eAnnotations> </eStructuralFeatures> - <eStructuralFeatures xsi:type="ecore:EAttribute" name="keyword" upperBound="-1" + <eStructuralFeatures xsi:type="ecore:EAttribute" name="class" upperBound="-1" eType="ecore:EDataType DC.ecore#//String"> <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel"> - <details key="documentation" value="A list of strings representing keywords of the graphical element."/> + <details key="documentation" value="A list of strings representing classes of the graphical element."/> </eAnnotations> </eStructuralFeatures> <eStructuralFeatures xsi:type="ecore:EReference" name="style" eType="#//Style" @@ -65,8 +103,27 @@ </eStructuralFeatures> </eClassifiers> <eClassifiers xsi:type="ecore:EClass" name="Definition" abstract="true"> - <eStructuralFeatures xsi:type="ecore:EAttribute" name="id" ordered="false" lowerBound="1" - eType="ecore:EDataType DC.ecore#//String" iD="true"> + <eOperations name="idCannotBeEmpty" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean"> + <eAnnotations source="http://www.eclipse.org/emf/2002/Ecore/OCL"> + <details key="body" value="id->notEmpty() implies id.size() > 0"/> + </eAnnotations> + <eParameters name="diagnostics" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EDiagnosticChain"> + <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel"> + <details key="documentation" value="The chain of diagnostics to which problems are to be appended."/> + </eAnnotations> + </eParameters> + <eParameters name="context"> + <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel"> + <details key="documentation" value="The cache of context-specific information."/> + </eAnnotations> + <eGenericType eClassifier="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EMap"> + <eTypeArguments eClassifier="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/> + <eTypeArguments eClassifier="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/> + </eGenericType> + </eParameters> + </eOperations> + <eStructuralFeatures xsi:type="ecore:EAttribute" name="id" ordered="false" eType="ecore:EDataType DC.ecore#//String" + iD="true"> <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel"> <details key="documentation" value="a point to move to in the coordinate system"/> </eAnnotations> @@ -281,6 +338,25 @@ </eStructuralFeatures> </eClassifiers> <eClassifiers xsi:type="ecore:EClass" name="Paint"> + <eOperations name="referencedPaintServerHasId" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean"> + <eAnnotations source="http://www.eclipse.org/emf/2002/Ecore/OCL"> + <details key="body" value="paintServer->notEmpty() implies paintServer.id->notEmpty()"/> + </eAnnotations> + <eParameters name="diagnostics" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EDiagnosticChain"> + <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel"> + <details key="documentation" value="The chain of diagnostics to which problems are to be appended."/> + </eAnnotations> + </eParameters> + <eParameters name="context"> + <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel"> + <details key="documentation" value="The cache of context-specific information."/> + </eAnnotations> + <eGenericType eClassifier="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EMap"> + <eTypeArguments eClassifier="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/> + <eTypeArguments eClassifier="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/> + </eGenericType> + </eParameters> + </eOperations> <eStructuralFeatures xsi:type="ecore:EAttribute" name="color" ordered="false" eType="ecore:EDataType DC.ecore#//Color"> <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel"> @@ -324,7 +400,7 @@ <details key="body" value="radius >= 0"/> </eAnnotations> <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel"> - <details key="documentation" value="the radius cannot be negative"/> + <details key="documentation" value="The radius of a circle cannot be negative"/> </eAnnotations> <eParameters name="diagnostics" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EDiagnosticChain"> <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel"> @@ -348,7 +424,7 @@ </eAnnotations> </eStructuralFeatures> <eStructuralFeatures xsi:type="ecore:EAttribute" name="radius" ordered="false" - lowerBound="1" eType="ecore:EDataType DC.ecore#//Real"> + lowerBound="1" eType="ecore:EDataType DC.ecore#//Real" defaultValueLiteral="0"> <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel"> <details key="documentation" value="a real number (>=0) that represents the radius of the circle."/> </eAnnotations> @@ -363,12 +439,6 @@ <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel"> <details key="documentation" value="CubicCurveTo is a kind of path command that draws a cubic bézier curve from the current point to a new point using a start and an end control points.
Definitions nests definitions that are commonly referenced in the containing canvas. It can also nest an embedded stylesheet.
EllipticalArcTo is a kind of path command that draws an elliptical arc from the current point to a new point in the coordinate system.
QuadraticCurveTo is a kind of path command that draws a quadratic bézier curve from the current point to a new point using a single control point."/> </eAnnotations> - <eStructuralFeatures xsi:type="ecore:EReference" name="point" ordered="false" - lowerBound="1" eType="ecore:EClass DC.ecore#//Point" containment="true"> - <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel"> - <details key="documentation" value="a point to draw a cubic bézier curve to from the current point in the coordinate system."/> - </eAnnotations> - </eStructuralFeatures> <eStructuralFeatures xsi:type="ecore:EReference" name="startControl" ordered="false" lowerBound="1" eType="ecore:EClass DC.ecore#//Point" containment="true"> <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel"> @@ -381,6 +451,12 @@ <details key="documentation" value="the end control point of the cubic bézier curve."/> </eAnnotations> </eStructuralFeatures> + <eStructuralFeatures xsi:type="ecore:EReference" name="point" ordered="false" + lowerBound="1" eType="ecore:EClass DC.ecore#//Point" containment="true"> + <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel"> + <details key="documentation" value="a point to draw a cubic bézier curve to from the current point in the coordinate system."/> + </eAnnotations> + </eStructuralFeatures> </eClassifiers> <eClassifiers xsi:type="ecore:EClass" name="Definitions"> <eStructuralFeatures xsi:type="ecore:EReference" name="defnition" upperBound="-1" @@ -419,18 +495,35 @@ </eStructuralFeatures> </eClassifiers> <eClassifiers xsi:type="ecore:EClass" name="StyleSelector"> - <eStructuralFeatures xsi:type="ecore:EReference" name="type" ordered="false" eType="ecore:EClass ../../org.eclipse.emf.ecore/model/Ecore.ecore#//EClass"> + <eStructuralFeatures xsi:type="ecore:EAttribute" name="kind" ordered="false" eType="#//ElementKind" + unsettable="true"> <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel"> - <details key="documentation" value="A non-abstract type that is a subtype of GraphicalElement. Elements having this type are selected."/> + <details key="documentation" value="The kind of graphical element to select."/> </eAnnotations> </eStructuralFeatures> - <eStructuralFeatures xsi:type="ecore:EAttribute" name="keyword" upperBound="-1" + <eStructuralFeatures xsi:type="ecore:EAttribute" name="class" upperBound="-1" eType="ecore:EDataType DC.ecore#//String"> <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel"> - <details key="documentation" value="A list of strings representing keywords of graphical elements. Elements having these keywords are selected."/> + <details key="documentation" value="A set of strings representing classes of graphical elements to select. Selected elements must have all those classes."/> </eAnnotations> </eStructuralFeatures> </eClassifiers> + <eClassifiers xsi:type="ecore:EEnum" name="ElementKind"> + <eLiterals name="canvas"/> + <eLiterals name="circle" value="1"/> + <eLiterals name="clipPath" value="2"/> + <eLiterals name="ellipse" value="3"/> + <eLiterals name="group" value="4"/> + <eLiterals name="image" value="5"/> + <eLiterals name="line" value="6"/> + <eLiterals name="marker" value="7"/> + <eLiterals name="path" value="8"/> + <eLiterals name="polygon" value="9"/> + <eLiterals name="polyline" value="10"/> + <eLiterals name="rectangle" value="11"/> + <eLiterals name="text" value="12"/> + <eLiterals name="use" value="13"/> + </eClassifiers> <eClassifiers xsi:type="ecore:EClass" name="Ellipse" eSuperTypes="#//GraphicalElement"> <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel"> <details key="documentation" value="Ellipse is a graphical element that defines an elliptical shape with a given center point and two radii on the x and y axes."/> @@ -448,13 +541,7 @@ </eAnnotations> </eStructuralFeatures> </eClassifiers> - <eClassifiers xsi:type="ecore:EClass" name="EllipticalCurveTo" eSuperTypes="#//PathCommand"> - <eStructuralFeatures xsi:type="ecore:EReference" name="point" ordered="false" - lowerBound="1" eType="ecore:EClass DC.ecore#//Point" containment="true"> - <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel"> - <details key="documentation" value="a point to draw an elliptical arc to from the current point in the coordinate system."/> - </eAnnotations> - </eStructuralFeatures> + <eClassifiers xsi:type="ecore:EClass" name="EllipticalArcTo" eSuperTypes="#//PathCommand"> <eStructuralFeatures xsi:type="ecore:EReference" name="radii" ordered="false" lowerBound="1" eType="ecore:EClass DC.ecore#//Dimension" containment="true"> <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel"> @@ -479,21 +566,27 @@ <details key="documentation" value="whether the arc is drawn in a positive-angle direction"/> </eAnnotations> </eStructuralFeatures> + <eStructuralFeatures xsi:type="ecore:EReference" name="point" ordered="false" + lowerBound="1" eType="ecore:EClass DC.ecore#//Point" containment="true"> + <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel"> + <details key="documentation" value="a point to draw an elliptical arc to from the current point in the coordinate system."/> + </eAnnotations> + </eStructuralFeatures> </eClassifiers> <eClassifiers xsi:type="ecore:EClass" name="QuadraticCurveTo" eSuperTypes="#//PathCommand"> <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel"> <details key="documentation" value="QuadraticCurveTo is a kind of path command that draws a quadratic bézier curve from the current point to a new point using a single control point.
EllipticalArcTo is a kind of path command that draws an elliptical arc from the current point to a new point in the coordinate system."/> </eAnnotations> - <eStructuralFeatures xsi:type="ecore:EReference" name="point" ordered="false" + <eStructuralFeatures xsi:type="ecore:EReference" name="control" ordered="false" lowerBound="1" eType="ecore:EClass DC.ecore#//Point" containment="true"> <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel"> - <details key="documentation" value="a point to draw a quadratic bézier curve to from the current point in the coordinate system."/> + <details key="documentation" value="the control point of the quadratic bézier curve."/> </eAnnotations> </eStructuralFeatures> - <eStructuralFeatures xsi:type="ecore:EReference" name="control" ordered="false" + <eStructuralFeatures xsi:type="ecore:EReference" name="point" ordered="false" lowerBound="1" eType="ecore:EClass DC.ecore#//Point" containment="true"> <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel"> - <details key="documentation" value="the control point of the quadratic bézier curve."/> + <details key="documentation" value="a point to draw a quadratic bézier curve to from the current point in the coordinate system."/> </eAnnotations> </eStructuralFeatures> </eClassifiers> @@ -557,19 +650,19 @@ </eParameters> </eOperations> <eStructuralFeatures xsi:type="ecore:EAttribute" name="color" ordered="false" - lowerBound="1" eType="ecore:EDataType DC.ecore#//Color"> + eType="ecore:EDataType DC.ecore#//Color" unsettable="true"> <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel"> <details key="documentation" value="the color to use at this gradient stop."/> </eAnnotations> </eStructuralFeatures> <eStructuralFeatures xsi:type="ecore:EAttribute" name="offset" ordered="false" - lowerBound="1" eType="ecore:EDataType DC.ecore#//Real"> + eType="ecore:EDataType DC.ecore#//Real" unsettable="true"> <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel"> <details key="documentation" value="an offset of this gradient stop represented as a percentage of the distance between the start and end positions of the gradient along the x and y axes."/> </eAnnotations> </eStructuralFeatures> <eStructuralFeatures xsi:type="ecore:EAttribute" name="opacity" ordered="false" - lowerBound="1" eType="ecore:EDataType DC.ecore#//Real" defaultValueLiteral="1"> + eType="ecore:EDataType DC.ecore#//Real" unsettable="true"> <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel"> <details key="documentation" value="a real number (>=0 and<=1) representing the opacity of the color at the stop. A value of 0 means totally transparent, while a value of 1 means totally opaque."/> </eAnnotations> @@ -579,6 +672,25 @@ <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel"> <details key="documentation" value="Image is a graphical element that defines a shape that paints an image with a given URL within given bounds."/> </eAnnotations> + <eOperations name="sourceCannotBeEmpty" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean"> + <eAnnotations source="http://www.eclipse.org/emf/2002/Ecore/OCL"> + <details key="body" value="source->notEmpty() implies source.size() > 0"/> + </eAnnotations> + <eParameters name="diagnostics" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EDiagnosticChain"> + <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel"> + <details key="documentation" value="The chain of diagnostics to which problems are to be appended."/> + </eAnnotations> + </eParameters> + <eParameters name="context"> + <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel"> + <details key="documentation" value="The cache of context-specific information."/> + </eAnnotations> + <eGenericType eClassifier="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EMap"> + <eTypeArguments eClassifier="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/> + <eTypeArguments eClassifier="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/> + </eGenericType> + </eParameters> + </eOperations> <eStructuralFeatures xsi:type="ecore:EAttribute" name="source" ordered="false" lowerBound="1" eType="ecore:EDataType DC.ecore#//String"> <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel"> @@ -592,7 +704,8 @@ </eAnnotations> </eStructuralFeatures> <eStructuralFeatures xsi:type="ecore:EAttribute" name="isAspectRatioPreserved" - ordered="false" lowerBound="1" eType="ecore:EDataType DC.ecore#//Boolean"> + ordered="false" lowerBound="1" eType="ecore:EDataType DC.ecore#//Boolean" + defaultValueLiteral="false"> <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel"> <details key="documentation" value="wether to preserve the aspect ratio of the image upon scaling, i.e. the same scale factor for width and height."/> </eAnnotations> @@ -619,6 +732,63 @@ <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel"> <details key="documentation" value="MarkedElement is a graphic element that can be decorated at its vertices with markers (e.g. arrowheads)."/> </eAnnotations> + <eOperations name="referencedStartMarkerHasId" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean"> + <eAnnotations source="http://www.eclipse.org/emf/2002/Ecore/OCL"> + <details key="body" value="startMarker->notEmpty() implies startMarker.id->notEmpty()"/> + </eAnnotations> + <eParameters name="diagnostics" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EDiagnosticChain"> + <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel"> + <details key="documentation" value="The chain of diagnostics to which problems are to be appended."/> + </eAnnotations> + </eParameters> + <eParameters name="context"> + <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel"> + <details key="documentation" value="The cache of context-specific information."/> + </eAnnotations> + <eGenericType eClassifier="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EMap"> + <eTypeArguments eClassifier="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/> + <eTypeArguments eClassifier="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/> + </eGenericType> + </eParameters> + </eOperations> + <eOperations name="referencedMidMarkerHasId" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean"> + <eAnnotations source="http://www.eclipse.org/emf/2002/Ecore/OCL"> + <details key="body" value="midMarker->notEmpty() implies midMarker.id->notEmpty()"/> + </eAnnotations> + <eParameters name="diagnostics" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EDiagnosticChain"> + <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel"> + <details key="documentation" value="The chain of diagnostics to which problems are to be appended."/> + </eAnnotations> + </eParameters> + <eParameters name="context"> + <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel"> + <details key="documentation" value="The cache of context-specific information."/> + </eAnnotations> + <eGenericType eClassifier="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EMap"> + <eTypeArguments eClassifier="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/> + <eTypeArguments eClassifier="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/> + </eGenericType> + </eParameters> + </eOperations> + <eOperations name="referencedEndMarkerHasId" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean"> + <eAnnotations source="http://www.eclipse.org/emf/2002/Ecore/OCL"> + <details key="body" value="endMarker->notEmpty() implies endMarker.id->notEmpty()"/> + </eAnnotations> + <eParameters name="diagnostics" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EDiagnosticChain"> + <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel"> + <details key="documentation" value="The chain of diagnostics to which problems are to be appended."/> + </eAnnotations> + </eParameters> + <eParameters name="context"> + <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel"> + <details key="documentation" value="The cache of context-specific information."/> + </eAnnotations> + <eGenericType eClassifier="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EMap"> + <eTypeArguments eClassifier="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/> + <eTypeArguments eClassifier="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/> + </eGenericType> + </eParameters> + </eOperations> <eStructuralFeatures xsi:type="ecore:EReference" name="endMarker" ordered="false" eType="#//Marker"> <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel"> @@ -750,8 +920,27 @@ <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel"> <details key="documentation" value="Path is a marked element that defines a custom shape whose geometry is specified with a sequence of path commands."/> </eAnnotations> - <eStructuralFeatures xsi:type="ecore:EReference" name="command" upperBound="-1" - eType="#//PathCommand" containment="true"> + <eOperations name="firstCommandMustBeMove" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean"> + <eAnnotations source="http://www.eclipse.org/emf/2002/Ecore/OCL"> + <details key="body" value="command->first().oclIsKindOf(MoveTo)"/> + </eAnnotations> + <eParameters name="diagnostics" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EDiagnosticChain"> + <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel"> + <details key="documentation" value="The chain of diagnostics to which problems are to be appended."/> + </eAnnotations> + </eParameters> + <eParameters name="context"> + <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel"> + <details key="documentation" value="The cache of context-specific information."/> + </eAnnotations> + <eGenericType eClassifier="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EMap"> + <eTypeArguments eClassifier="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/> + <eTypeArguments eClassifier="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/> + </eGenericType> + </eParameters> + </eOperations> + <eStructuralFeatures xsi:type="ecore:EReference" name="command" lowerBound="1" + upperBound="-1" eType="#//PathCommand" containment="true"> <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel"> <details key="documentation" value="a list of path commands that define the geometry of the custom shape."/> </eAnnotations> @@ -889,6 +1078,25 @@ <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel"> <details key="documentation" value="Rectangle is a graphical element that defines a rectangular shape with given bounds. A rectangle may be given rounded corners by setting its corner radius."/> </eAnnotations> + <eOperations name="nonNegativeCornerRadius" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean"> + <eAnnotations source="http://www.eclipse.org/emf/2002/Ecore/OCL"> + <details key="body" value="cornerRadius >= 0"/> + </eAnnotations> + <eParameters name="diagnostics" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EDiagnosticChain"> + <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel"> + <details key="documentation" value="The chain of diagnostics to which problems are to be appended."/> + </eAnnotations> + </eParameters> + <eParameters name="context"> + <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel"> + <details key="documentation" value="The cache of context-specific information."/> + </eAnnotations> + <eGenericType eClassifier="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EMap"> + <eTypeArguments eClassifier="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/> + <eTypeArguments eClassifier="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/> + </eGenericType> + </eParameters> + </eOperations> <eStructuralFeatures xsi:type="ecore:EReference" name="bounds" ordered="false" lowerBound="1" eType="ecore:EClass DC.ecore#//Bounds" containment="true"> <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel"> @@ -896,7 +1104,7 @@ </eAnnotations> </eStructuralFeatures> <eStructuralFeatures xsi:type="ecore:EAttribute" name="cornerRadius" ordered="false" - lowerBound="1" eType="ecore:EDataType DC.ecore#//Real" defaultValueLiteral="0"> + eType="ecore:EDataType DC.ecore#//Real" defaultValueLiteral="0" unsettable="true"> <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel"> <details key="documentation" value="a radius for the rectangle's rounded corners. When the radius is 0, the rectangle is drawn with sharp corners."/> </eAnnotations> @@ -918,7 +1126,7 @@ <details key="documentation" value="An optional definitions element to hold objects commonly referenced by the canvas."/> </eAnnotations> </eStructuralFeatures> - <eStructuralFeatures xsi:type="ecore:EReference" name="styleSheet" upperBound="-1" + <eStructuralFeatures xsi:type="ecore:EReference" name="externalStyleSheet" upperBound="-1" eType="#//StyleSheet"> <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel"> <details key="documentation" value="A list of external style sheets that are imported by the canvas."/> @@ -1002,6 +1210,25 @@ <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel"> <details key="documentation" value="Text is a graphical element that defines a shape that renders a character string at a given position."/> </eAnnotations> + <eOperations name="dataCannotBeEmpty" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean"> + <eAnnotations source="http://www.eclipse.org/emf/2002/Ecore/OCL"> + <details key="body" value="data->notEmpty() implies data.size() > 0"/> + </eAnnotations> + <eParameters name="diagnostics" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EDiagnosticChain"> + <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel"> + <details key="documentation" value="The chain of diagnostics to which problems are to be appended."/> + </eAnnotations> + </eParameters> + <eParameters name="context"> + <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel"> + <details key="documentation" value="The cache of context-specific information."/> + </eAnnotations> + <eGenericType eClassifier="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EMap"> + <eTypeArguments eClassifier="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/> + <eTypeArguments eClassifier="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/> + </eGenericType> + </eParameters> + </eOperations> <eStructuralFeatures xsi:type="ecore:EAttribute" name="data" ordered="false" lowerBound="1" eType="ecore:EDataType DC.ecore#//String"> <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel"> @@ -1036,11 +1263,36 @@ <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel"> <details key="documentation" value="Rectangle is a graphical element that defines a rectangular shape with given bounds. A rectangle may be given rounded corners by setting its corner radius."/> </eAnnotations> + <eOperations name="referencedElementHasId" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean"> + <eAnnotations source="http://www.eclipse.org/emf/2002/Ecore/OCL"> + <details key="body" value="referencedElement->notEmpty() implies referencedElement.id->notEmpty()"/> + </eAnnotations> + <eParameters name="diagnostics" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EDiagnosticChain"> + <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel"> + <details key="documentation" value="The chain of diagnostics to which problems are to be appended."/> + </eAnnotations> + </eParameters> + <eParameters name="context"> + <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel"> + <details key="documentation" value="The cache of context-specific information."/> + </eAnnotations> + <eGenericType eClassifier="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EMap"> + <eTypeArguments eClassifier="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/> + <eTypeArguments eClassifier="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/> + </eGenericType> + </eParameters> + </eOperations> <eStructuralFeatures xsi:type="ecore:EReference" name="bounds" ordered="false" - lowerBound="1" eType="ecore:EClass DC.ecore#//Bounds" containment="true"> + eType="ecore:EClass DC.ecore#//Bounds" containment="true"> <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel"> <details key="documentation" value="the bounds of the rectangle in the x-y coordinate system."/> </eAnnotations> </eStructuralFeatures> + <eStructuralFeatures xsi:type="ecore:EReference" name="referencedElement" lowerBound="1" + eType="#//GraphicalElement"> + <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel"> + <details key="documentation" value="A list of graphical elements that are members of this group."/> + </eAnnotations> + </eStructuralFeatures> </eClassifiers> </ecore:EPackage> diff --git a/extraplugins/diagram-definition/org.eclipse.papyrus.dd/model/DG.genmodel b/extraplugins/diagram-definition/org.eclipse.papyrus.dd/model/DG.genmodel index e39f6d71605..666d22f4621 100644 --- a/extraplugins/diagram-definition/org.eclipse.papyrus.dd/model/DG.genmodel +++ b/extraplugins/diagram-definition/org.eclipse.papyrus.dd/model/DG.genmodel @@ -6,8 +6,8 @@ modelName="DG" editPluginClass="org.eclipse.papyrus.dd.edit.DDEditPlugin" editorPluginClass="org.eclipse.papyrus.dd.editor.DDEditorPlugin" rootExtendsClass="org.eclipse.emf.ecore.impl.MinimalEObjectImpl$Container" importerID="org.eclipse.uml2.uml.ecore.importer" complianceLevel="7.0" copyrightFields="false" colorProviders="true" fontProviders="true" - usedGenPackages="DC.genmodel#//dc ../../org.eclipse.emf.ecore/model/Ecore.genmodel#//ecore" - operationReflection="true" importOrganizing="true"> + usedGenPackages="DC.genmodel#//dc" operationReflection="true" importOrganizing="true" + pluralizedGetters="true"> <genAnnotations source="http://www.eclipse.org/emf/2002/GenModel/importer/org.eclipse.uml2.uml.ecore.importer"> <details key="ECORE_TAGGED_VALUES" value="PROCESS"/> <details key="UNION_PROPERTIES" value="PROCESS"/> @@ -36,9 +36,29 @@ <genEnumLiterals xsi:type="genmodel:GenEnumLiteral" ecoreEnumLiteral="DG.ecore#//FontDecoration/overline"/> <genEnumLiterals xsi:type="genmodel:GenEnumLiteral" ecoreEnumLiteral="DG.ecore#//FontDecoration/lineThrough"/> </genEnums> + <genEnums xsi:type="genmodel:GenEnum" typeSafeEnumCompatible="false" ecoreEnum="DG.ecore#//ElementKind"> + <genEnumLiterals xsi:type="genmodel:GenEnumLiteral" ecoreEnumLiteral="DG.ecore#//ElementKind/canvas"/> + <genEnumLiterals xsi:type="genmodel:GenEnumLiteral" ecoreEnumLiteral="DG.ecore#//ElementKind/circle"/> + <genEnumLiterals xsi:type="genmodel:GenEnumLiteral" ecoreEnumLiteral="DG.ecore#//ElementKind/clipPath"/> + <genEnumLiterals xsi:type="genmodel:GenEnumLiteral" ecoreEnumLiteral="DG.ecore#//ElementKind/ellipse"/> + <genEnumLiterals xsi:type="genmodel:GenEnumLiteral" ecoreEnumLiteral="DG.ecore#//ElementKind/group"/> + <genEnumLiterals xsi:type="genmodel:GenEnumLiteral" ecoreEnumLiteral="DG.ecore#//ElementKind/image"/> + <genEnumLiterals xsi:type="genmodel:GenEnumLiteral" ecoreEnumLiteral="DG.ecore#//ElementKind/line"/> + <genEnumLiterals xsi:type="genmodel:GenEnumLiteral" ecoreEnumLiteral="DG.ecore#//ElementKind/marker"/> + <genEnumLiterals xsi:type="genmodel:GenEnumLiteral" ecoreEnumLiteral="DG.ecore#//ElementKind/path"/> + <genEnumLiterals xsi:type="genmodel:GenEnumLiteral" ecoreEnumLiteral="DG.ecore#//ElementKind/polygon"/> + <genEnumLiterals xsi:type="genmodel:GenEnumLiteral" ecoreEnumLiteral="DG.ecore#//ElementKind/polyline"/> + <genEnumLiterals xsi:type="genmodel:GenEnumLiteral" ecoreEnumLiteral="DG.ecore#//ElementKind/rectangle"/> + <genEnumLiterals xsi:type="genmodel:GenEnumLiteral" ecoreEnumLiteral="DG.ecore#//ElementKind/text"/> + <genEnumLiterals xsi:type="genmodel:GenEnumLiteral" ecoreEnumLiteral="DG.ecore#//ElementKind/use"/> + </genEnums> <genClasses xsi:type="genmodel:GenClass" ecoreClass="DG.ecore#//Canvas"> <genFeatures xsi:type="genmodel:GenFeature" property="None" children="true" createChild="true" ecoreFeature="ecore:EReference DG.ecore#//Canvas/bounds"/> + <genOperations xsi:type="genmodel:GenOperation" ecoreOperation="DG.ecore#//Canvas/canvasCannotHaveTransforms"> + <genParameters xsi:type="genmodel:GenParameter" ecoreParameter="DG.ecore#//Canvas/canvasCannotHaveTransforms/diagnostics"/> + <genParameters xsi:type="genmodel:GenParameter" ecoreParameter="DG.ecore#//Canvas/canvasCannotHaveTransforms/context"/> + </genOperations> </genClasses> <genClasses xsi:type="genmodel:GenClass" ecoreClass="DG.ecore#//Group"> <genFeatures xsi:type="genmodel:GenFeature" property="None" children="true" @@ -49,14 +69,22 @@ propertySortChoices="true" ecoreFeature="ecore:EReference DG.ecore#//GraphicalElement/clipPath"/> <genFeatures xsi:type="genmodel:GenFeature" property="None" notify="false" createChild="false" ecoreFeature="ecore:EReference DG.ecore#//GraphicalElement/group"/> - <genFeatures xsi:type="genmodel:GenFeature" createChild="false" ecoreFeature="ecore:EAttribute DG.ecore#//GraphicalElement/keyword"/> + <genFeatures xsi:type="genmodel:GenFeature" createChild="false" ecoreFeature="ecore:EAttribute DG.ecore#//GraphicalElement/class"/> <genFeatures xsi:type="genmodel:GenFeature" property="None" children="true" createChild="true" ecoreFeature="ecore:EReference DG.ecore#//GraphicalElement/style"/> <genFeatures xsi:type="genmodel:GenFeature" property="None" children="true" createChild="true" ecoreFeature="ecore:EReference DG.ecore#//GraphicalElement/transform"/> + <genOperations xsi:type="genmodel:GenOperation" ecoreOperation="DG.ecore#//GraphicalElement/referencedClippathHasId"> + <genParameters xsi:type="genmodel:GenParameter" ecoreParameter="DG.ecore#//GraphicalElement/referencedClippathHasId/diagnostics"/> + <genParameters xsi:type="genmodel:GenParameter" ecoreParameter="DG.ecore#//GraphicalElement/referencedClippathHasId/context"/> + </genOperations> </genClasses> <genClasses xsi:type="genmodel:GenClass" image="false" ecoreClass="DG.ecore#//Definition"> <genFeatures xsi:type="genmodel:GenFeature" createChild="false" ecoreFeature="ecore:EAttribute DG.ecore#//Definition/id"/> + <genOperations xsi:type="genmodel:GenOperation" ecoreOperation="DG.ecore#//Definition/idCannotBeEmpty"> + <genParameters xsi:type="genmodel:GenParameter" ecoreParameter="DG.ecore#//Definition/idCannotBeEmpty/diagnostics"/> + <genParameters xsi:type="genmodel:GenParameter" ecoreParameter="DG.ecore#//Definition/idCannotBeEmpty/context"/> + </genOperations> </genClasses> <genClasses xsi:type="genmodel:GenClass" ecoreClass="DG.ecore#//MoveTo"> <genFeatures xsi:type="genmodel:GenFeature" property="None" children="true" @@ -105,6 +133,10 @@ <genFeatures xsi:type="genmodel:GenFeature" createChild="false" ecoreFeature="ecore:EAttribute DG.ecore#//Paint/color"/> <genFeatures xsi:type="genmodel:GenFeature" notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference DG.ecore#//Paint/paintServer"/> + <genOperations xsi:type="genmodel:GenOperation" ecoreOperation="DG.ecore#//Paint/referencedPaintServerHasId"> + <genParameters xsi:type="genmodel:GenParameter" ecoreParameter="DG.ecore#//Paint/referencedPaintServerHasId/diagnostics"/> + <genParameters xsi:type="genmodel:GenParameter" ecoreParameter="DG.ecore#//Paint/referencedPaintServerHasId/context"/> + </genOperations> </genClasses> <genClasses xsi:type="genmodel:GenClass" image="false" ecoreClass="DG.ecore#//PaintServer"> <genFeatures xsi:type="genmodel:GenFeature" property="None" children="true" @@ -123,11 +155,11 @@ <genClasses xsi:type="genmodel:GenClass" ecoreClass="DG.ecore#//ClosePath"/> <genClasses xsi:type="genmodel:GenClass" ecoreClass="DG.ecore#//CubicCurveTo"> <genFeatures xsi:type="genmodel:GenFeature" property="None" children="true" - createChild="true" ecoreFeature="ecore:EReference DG.ecore#//CubicCurveTo/point"/> - <genFeatures xsi:type="genmodel:GenFeature" property="None" children="true" createChild="true" ecoreFeature="ecore:EReference DG.ecore#//CubicCurveTo/startControl"/> <genFeatures xsi:type="genmodel:GenFeature" property="None" children="true" createChild="true" ecoreFeature="ecore:EReference DG.ecore#//CubicCurveTo/endControl"/> + <genFeatures xsi:type="genmodel:GenFeature" property="None" children="true" + createChild="true" ecoreFeature="ecore:EReference DG.ecore#//CubicCurveTo/point"/> </genClasses> <genClasses xsi:type="genmodel:GenClass" ecoreClass="DG.ecore#//Definitions"> <genFeatures xsi:type="genmodel:GenFeature" property="None" children="true" @@ -146,9 +178,8 @@ createChild="true" ecoreFeature="ecore:EReference DG.ecore#//StyleRule/style"/> </genClasses> <genClasses xsi:type="genmodel:GenClass" ecoreClass="DG.ecore#//StyleSelector"> - <genFeatures xsi:type="genmodel:GenFeature" notify="false" createChild="false" - propertySortChoices="true" ecoreFeature="ecore:EReference DG.ecore#//StyleSelector/type"/> - <genFeatures xsi:type="genmodel:GenFeature" createChild="false" ecoreFeature="ecore:EAttribute DG.ecore#//StyleSelector/keyword"/> + <genFeatures xsi:type="genmodel:GenFeature" createChild="false" ecoreFeature="ecore:EAttribute DG.ecore#//StyleSelector/kind"/> + <genFeatures xsi:type="genmodel:GenFeature" createChild="false" ecoreFeature="ecore:EAttribute DG.ecore#//StyleSelector/class"/> </genClasses> <genClasses xsi:type="genmodel:GenClass" ecoreClass="DG.ecore#//Ellipse"> <genFeatures xsi:type="genmodel:GenFeature" property="None" children="true" @@ -156,20 +187,20 @@ <genFeatures xsi:type="genmodel:GenFeature" property="None" children="true" createChild="true" ecoreFeature="ecore:EReference DG.ecore#//Ellipse/radii"/> </genClasses> - <genClasses xsi:type="genmodel:GenClass" ecoreClass="DG.ecore#//EllipticalCurveTo"> + <genClasses xsi:type="genmodel:GenClass" ecoreClass="DG.ecore#//EllipticalArcTo"> <genFeatures xsi:type="genmodel:GenFeature" property="None" children="true" - createChild="true" ecoreFeature="ecore:EReference DG.ecore#//EllipticalCurveTo/point"/> + createChild="true" ecoreFeature="ecore:EReference DG.ecore#//EllipticalArcTo/radii"/> + <genFeatures xsi:type="genmodel:GenFeature" createChild="false" ecoreFeature="ecore:EAttribute DG.ecore#//EllipticalArcTo/rotation"/> + <genFeatures xsi:type="genmodel:GenFeature" createChild="false" ecoreFeature="ecore:EAttribute DG.ecore#//EllipticalArcTo/isLargeArc"/> + <genFeatures xsi:type="genmodel:GenFeature" createChild="false" ecoreFeature="ecore:EAttribute DG.ecore#//EllipticalArcTo/isSweep"/> <genFeatures xsi:type="genmodel:GenFeature" property="None" children="true" - createChild="true" ecoreFeature="ecore:EReference DG.ecore#//EllipticalCurveTo/radii"/> - <genFeatures xsi:type="genmodel:GenFeature" createChild="false" ecoreFeature="ecore:EAttribute DG.ecore#//EllipticalCurveTo/rotation"/> - <genFeatures xsi:type="genmodel:GenFeature" createChild="false" ecoreFeature="ecore:EAttribute DG.ecore#//EllipticalCurveTo/isLargeArc"/> - <genFeatures xsi:type="genmodel:GenFeature" createChild="false" ecoreFeature="ecore:EAttribute DG.ecore#//EllipticalCurveTo/isSweep"/> + createChild="true" ecoreFeature="ecore:EReference DG.ecore#//EllipticalArcTo/point"/> </genClasses> <genClasses xsi:type="genmodel:GenClass" ecoreClass="DG.ecore#//QuadraticCurveTo"> <genFeatures xsi:type="genmodel:GenFeature" property="None" children="true" - createChild="true" ecoreFeature="ecore:EReference DG.ecore#//QuadraticCurveTo/point"/> - <genFeatures xsi:type="genmodel:GenFeature" property="None" children="true" createChild="true" ecoreFeature="ecore:EReference DG.ecore#//QuadraticCurveTo/control"/> + <genFeatures xsi:type="genmodel:GenFeature" property="None" children="true" + createChild="true" ecoreFeature="ecore:EReference DG.ecore#//QuadraticCurveTo/point"/> </genClasses> <genClasses xsi:type="genmodel:GenClass" image="false" ecoreClass="DG.ecore#//Gradient"> <genFeatures xsi:type="genmodel:GenFeature" property="None" children="true" @@ -193,6 +224,10 @@ <genFeatures xsi:type="genmodel:GenFeature" property="None" children="true" createChild="true" ecoreFeature="ecore:EReference DG.ecore#//Image/bounds"/> <genFeatures xsi:type="genmodel:GenFeature" createChild="false" ecoreFeature="ecore:EAttribute DG.ecore#//Image/isAspectRatioPreserved"/> + <genOperations xsi:type="genmodel:GenOperation" ecoreOperation="DG.ecore#//Image/sourceCannotBeEmpty"> + <genParameters xsi:type="genmodel:GenParameter" ecoreParameter="DG.ecore#//Image/sourceCannotBeEmpty/diagnostics"/> + <genParameters xsi:type="genmodel:GenParameter" ecoreParameter="DG.ecore#//Image/sourceCannotBeEmpty/context"/> + </genOperations> </genClasses> <genClasses xsi:type="genmodel:GenClass" ecoreClass="DG.ecore#//Line"> <genFeatures xsi:type="genmodel:GenFeature" property="None" children="true" @@ -207,6 +242,18 @@ propertySortChoices="true" ecoreFeature="ecore:EReference DG.ecore#//MarkedElement/midMarker"/> <genFeatures xsi:type="genmodel:GenFeature" notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference DG.ecore#//MarkedElement/startMarker"/> + <genOperations xsi:type="genmodel:GenOperation" ecoreOperation="DG.ecore#//MarkedElement/referencedStartMarkerHasId"> + <genParameters xsi:type="genmodel:GenParameter" ecoreParameter="DG.ecore#//MarkedElement/referencedStartMarkerHasId/diagnostics"/> + <genParameters xsi:type="genmodel:GenParameter" ecoreParameter="DG.ecore#//MarkedElement/referencedStartMarkerHasId/context"/> + </genOperations> + <genOperations xsi:type="genmodel:GenOperation" ecoreOperation="DG.ecore#//MarkedElement/referencedMidMarkerHasId"> + <genParameters xsi:type="genmodel:GenParameter" ecoreParameter="DG.ecore#//MarkedElement/referencedMidMarkerHasId/diagnostics"/> + <genParameters xsi:type="genmodel:GenParameter" ecoreParameter="DG.ecore#//MarkedElement/referencedMidMarkerHasId/context"/> + </genOperations> + <genOperations xsi:type="genmodel:GenOperation" ecoreOperation="DG.ecore#//MarkedElement/referencedEndMarkerHasId"> + <genParameters xsi:type="genmodel:GenParameter" ecoreParameter="DG.ecore#//MarkedElement/referencedEndMarkerHasId/diagnostics"/> + <genParameters xsi:type="genmodel:GenParameter" ecoreParameter="DG.ecore#//MarkedElement/referencedEndMarkerHasId/context"/> + </genOperations> </genClasses> <genClasses xsi:type="genmodel:GenClass" ecoreClass="DG.ecore#//Marker"> <genFeatures xsi:type="genmodel:GenFeature" property="None" children="true" @@ -239,6 +286,10 @@ <genClasses xsi:type="genmodel:GenClass" ecoreClass="DG.ecore#//Path"> <genFeatures xsi:type="genmodel:GenFeature" property="None" children="true" createChild="true" ecoreFeature="ecore:EReference DG.ecore#//Path/command"/> + <genOperations xsi:type="genmodel:GenOperation" ecoreOperation="DG.ecore#//Path/firstCommandMustBeMove"> + <genParameters xsi:type="genmodel:GenParameter" ecoreParameter="DG.ecore#//Path/firstCommandMustBeMove/diagnostics"/> + <genParameters xsi:type="genmodel:GenParameter" ecoreParameter="DG.ecore#//Path/firstCommandMustBeMove/context"/> + </genOperations> </genClasses> <genClasses xsi:type="genmodel:GenClass" ecoreClass="DG.ecore#//Pattern"> <genFeatures xsi:type="genmodel:GenFeature" property="None" children="true" @@ -277,13 +328,17 @@ <genFeatures xsi:type="genmodel:GenFeature" property="None" children="true" createChild="true" ecoreFeature="ecore:EReference DG.ecore#//Rectangle/bounds"/> <genFeatures xsi:type="genmodel:GenFeature" createChild="false" ecoreFeature="ecore:EAttribute DG.ecore#//Rectangle/cornerRadius"/> + <genOperations xsi:type="genmodel:GenOperation" ecoreOperation="DG.ecore#//Rectangle/nonNegativeCornerRadius"> + <genParameters xsi:type="genmodel:GenParameter" ecoreParameter="DG.ecore#//Rectangle/nonNegativeCornerRadius/diagnostics"/> + <genParameters xsi:type="genmodel:GenParameter" ecoreParameter="DG.ecore#//Rectangle/nonNegativeCornerRadius/context"/> + </genOperations> </genClasses> <genClasses xsi:type="genmodel:GenClass" ecoreClass="DG.ecore#//RootCanvas"> <genFeatures xsi:type="genmodel:GenFeature" createChild="false" ecoreFeature="ecore:EAttribute DG.ecore#//RootCanvas/backgroundColor"/> <genFeatures xsi:type="genmodel:GenFeature" property="None" children="true" createChild="true" ecoreFeature="ecore:EReference DG.ecore#//RootCanvas/definitions"/> <genFeatures xsi:type="genmodel:GenFeature" notify="false" createChild="false" - propertySortChoices="true" ecoreFeature="ecore:EReference DG.ecore#//RootCanvas/styleSheet"/> + propertySortChoices="true" ecoreFeature="ecore:EReference DG.ecore#//RootCanvas/externalStyleSheet"/> </genClasses> <genClasses xsi:type="genmodel:GenClass" ecoreClass="DG.ecore#//Rotate"> <genFeatures xsi:type="genmodel:GenFeature" createChild="false" ecoreFeature="ecore:EAttribute DG.ecore#//Rotate/angle"/> @@ -306,6 +361,10 @@ <genFeatures xsi:type="genmodel:GenFeature" createChild="false" ecoreFeature="ecore:EAttribute DG.ecore#//Text/data"/> <genFeatures xsi:type="genmodel:GenFeature" property="None" children="true" createChild="true" ecoreFeature="ecore:EReference DG.ecore#//Text/position"/> + <genOperations xsi:type="genmodel:GenOperation" ecoreOperation="DG.ecore#//Text/dataCannotBeEmpty"> + <genParameters xsi:type="genmodel:GenParameter" ecoreParameter="DG.ecore#//Text/dataCannotBeEmpty/diagnostics"/> + <genParameters xsi:type="genmodel:GenParameter" ecoreParameter="DG.ecore#//Text/dataCannotBeEmpty/context"/> + </genOperations> </genClasses> <genClasses xsi:type="genmodel:GenClass" ecoreClass="DG.ecore#//Translate"> <genFeatures xsi:type="genmodel:GenFeature" createChild="false" ecoreFeature="ecore:EAttribute DG.ecore#//Translate/deltaX"/> @@ -314,6 +373,12 @@ <genClasses xsi:type="genmodel:GenClass" ecoreClass="DG.ecore#//Use"> <genFeatures xsi:type="genmodel:GenFeature" property="None" children="true" createChild="true" ecoreFeature="ecore:EReference DG.ecore#//Use/bounds"/> + <genFeatures xsi:type="genmodel:GenFeature" notify="false" createChild="false" + propertySortChoices="true" ecoreFeature="ecore:EReference DG.ecore#//Use/referencedElement"/> + <genOperations xsi:type="genmodel:GenOperation" ecoreOperation="DG.ecore#//Use/referencedElementHasId"> + <genParameters xsi:type="genmodel:GenParameter" ecoreParameter="DG.ecore#//Use/referencedElementHasId/diagnostics"/> + <genParameters xsi:type="genmodel:GenParameter" ecoreParameter="DG.ecore#//Use/referencedElementHasId/context"/> + </genOperations> </genClasses> </genPackages> </genmodel:GenModel> diff --git a/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dc/AlignmentKind.java b/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dc/AlignmentKind.java deleted file mode 100644 index 36d46eb51c0..00000000000 --- a/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dc/AlignmentKind.java +++ /dev/null @@ -1,236 +0,0 @@ -/** - * Copyright (c) 2014 CEA LIST. - * - * 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: - * CEA LIST - Initial API and implementation - */ -package org.eclipse.papyrus.dd.dc; - -import java.util.Arrays; -import java.util.Collections; -import java.util.List; - -import org.eclipse.emf.common.util.Enumerator; - -/** - * <!-- begin-user-doc --> A representation of the literals of the enumeration ' - * <em><b>Alignment Kind</b></em>', and utility methods for working with them. - * <!-- end-user-doc --> <!-- begin-model-doc --> AlignmentKind enumerates the - * possible options for alignment for layout purposes. <!-- end-model-doc --> - * - * @see org.eclipse.papyrus.dd.dc.DCPackage#getAlignmentKind() - * @model - * @generated - */ -public enum AlignmentKind implements Enumerator { - /** - * The '<em><b>Start</b></em>' literal object. <!-- begin-user-doc --> <!-- - * end-user-doc --> - * - * @see #START_VALUE - * @generated - * @ordered - */ - START(0, "start", "start"), - - /** - * The '<em><b>End</b></em>' literal object. <!-- begin-user-doc --> <!-- - * end-user-doc --> - * - * @see #END_VALUE - * @generated - * @ordered - */ - END(1, "end", "end"), - - /** - * The '<em><b>Center</b></em>' literal object. <!-- begin-user-doc --> <!-- - * end-user-doc --> - * - * @see #CENTER_VALUE - * @generated - * @ordered - */ - CENTER(2, "center", "center"); - - /** - * The '<em><b>Start</b></em>' literal value. <!-- begin-user-doc --> <!-- - * end-user-doc --> <!-- begin-model-doc --> an alignment to the start of a - * given length. <!-- end-model-doc --> - * - * @see #START - * @model name="start" - * @generated - * @ordered - */ - public static final int START_VALUE = 0; - - /** - * The '<em><b>End</b></em>' literal value. <!-- begin-user-doc --> <!-- - * end-user-doc --> <!-- begin-model-doc --> an alignment to the end of a - * given length <!-- end-model-doc --> - * - * @see #END - * @model name="end" - * @generated - * @ordered - */ - public static final int END_VALUE = 1; - - /** - * The '<em><b>Center</b></em>' literal value. <!-- begin-user-doc --> <!-- - * end-user-doc --> <!-- begin-model-doc --> an alignment to the center of a - * given length <!-- end-model-doc --> - * - * @see #CENTER - * @model name="center" - * @generated - * @ordered - */ - public static final int CENTER_VALUE = 2; - - /** - * An array of all the '<em><b>Alignment Kind</b></em>' enumerators. <!-- - * begin-user-doc --> <!-- end-user-doc --> - * - * @generated - */ - private static final AlignmentKind[] VALUES_ARRAY = new AlignmentKind[] { - START, END, CENTER, }; - - /** - * A public read-only list of all the '<em><b>Alignment Kind</b></em>' - * enumerators. <!-- begin-user-doc --> <!-- end-user-doc --> - * - * @generated - */ - public static final List<AlignmentKind> VALUES = Collections - .unmodifiableList(Arrays.asList(VALUES_ARRAY)); - - /** - * Returns the '<em><b>Alignment Kind</b></em>' literal with the specified - * literal value. <!-- begin-user-doc --> <!-- end-user-doc --> - * - * @generated - */ - public static AlignmentKind get(String literal) { - for (int i = 0; i < VALUES_ARRAY.length; ++i) { - AlignmentKind result = VALUES_ARRAY[i]; - if (result.toString().equals(literal)) { - return result; - } - } - return null; - } - - /** - * Returns the '<em><b>Alignment Kind</b></em>' literal with the specified - * name. <!-- begin-user-doc --> <!-- end-user-doc --> - * - * @generated - */ - public static AlignmentKind getByName(String name) { - for (int i = 0; i < VALUES_ARRAY.length; ++i) { - AlignmentKind result = VALUES_ARRAY[i]; - if (result.getName().equals(name)) { - return result; - } - } - return null; - } - - /** - * Returns the '<em><b>Alignment Kind</b></em>' literal with the specified - * integer value. <!-- begin-user-doc --> <!-- end-user-doc --> - * - * @generated - */ - public static AlignmentKind get(int value) { - switch (value) { - case START_VALUE: - return START; - case END_VALUE: - return END; - case CENTER_VALUE: - return CENTER; - } - return null; - } - - /** - * <!-- begin-user-doc --> <!-- end-user-doc --> - * - * @generated - */ - private final int value; - - /** - * <!-- begin-user-doc --> <!-- end-user-doc --> - * - * @generated - */ - private final String name; - - /** - * <!-- begin-user-doc --> <!-- end-user-doc --> - * - * @generated - */ - private final String literal; - - /** - * Only this class can construct instances. <!-- begin-user-doc --> <!-- - * end-user-doc --> - * - * @generated - */ - private AlignmentKind(int value, String name, String literal) { - this.value = value; - this.name = name; - this.literal = literal; - } - - /** - * <!-- begin-user-doc --> <!-- end-user-doc --> - * - * @generated - */ - public int getValue() { - return value; - } - - /** - * <!-- begin-user-doc --> <!-- end-user-doc --> - * - * @generated - */ - public String getName() { - return name; - } - - /** - * <!-- begin-user-doc --> <!-- end-user-doc --> - * - * @generated - */ - public String getLiteral() { - return literal; - } - - /** - * Returns the literal value of the enumerator, which is its string - * representation. <!-- begin-user-doc --> <!-- end-user-doc --> - * - * @generated - */ - @Override - public String toString() { - return literal; - } - -} // AlignmentKind diff --git a/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dc/Bounds.java b/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dc/Bounds.java index 5b94cf56e64..b6ec9d416a7 100644 --- a/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dc/Bounds.java +++ b/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dc/Bounds.java @@ -62,12 +62,38 @@ public interface Bounds extends EObject { * * @param value * the new value of the '<em>X</em>' attribute. + * @see #isSetX() + * @see #unsetX() * @see #getX() * @generated */ void setX(double value); /** + * Unsets the value of the '{@link org.eclipse.papyrus.dd.dc.Bounds#getX + * <em>X</em>}' attribute. <!-- begin-user-doc --> <!-- end-user-doc --> + * + * @see #isSetX() + * @see #getX() + * @see #setX(double) + * @generated + */ + void unsetX(); + + /** + * Returns whether the value of the ' + * {@link org.eclipse.papyrus.dd.dc.Bounds#getX <em>X</em>}' attribute is + * set. <!-- begin-user-doc --> <!-- end-user-doc --> + * + * @return whether the value of the '<em>X</em>' attribute is set. + * @see #unsetX() + * @see #getX() + * @see #setX(double) + * @generated + */ + boolean isSetX(); + + /** * Returns the value of the '<em><b>Y</b></em>' attribute. The default value * is <code>"0"</code>. <!-- begin-user-doc --> <!-- end-user-doc --> <!-- * begin-model-doc --> a real number (>=0 or <=0) that represents the @@ -88,12 +114,38 @@ public interface Bounds extends EObject { * * @param value * the new value of the '<em>Y</em>' attribute. + * @see #isSetY() + * @see #unsetY() * @see #getY() * @generated */ void setY(double value); /** + * Unsets the value of the '{@link org.eclipse.papyrus.dd.dc.Bounds#getY + * <em>Y</em>}' attribute. <!-- begin-user-doc --> <!-- end-user-doc --> + * + * @see #isSetY() + * @see #getY() + * @see #setY(double) + * @generated + */ + void unsetY(); + + /** + * Returns whether the value of the ' + * {@link org.eclipse.papyrus.dd.dc.Bounds#getY <em>Y</em>}' attribute is + * set. <!-- begin-user-doc --> <!-- end-user-doc --> + * + * @return whether the value of the '<em>Y</em>' attribute is set. + * @see #unsetY() + * @see #getY() + * @see #setY(double) + * @generated + */ + boolean isSetY(); + + /** * Returns the value of the '<em><b>Width</b></em>' attribute. <!-- * begin-user-doc --> <!-- end-user-doc --> <!-- begin-model-doc --> a real * number (>=0) that represents the width of the bounds <!-- end-model-doc @@ -114,12 +166,39 @@ public interface Bounds extends EObject { * * @param value * the new value of the '<em>Width</em>' attribute. + * @see #isSetWidth() + * @see #unsetWidth() * @see #getWidth() * @generated */ void setWidth(double value); /** + * Unsets the value of the ' + * {@link org.eclipse.papyrus.dd.dc.Bounds#getWidth <em>Width</em>}' + * attribute. <!-- begin-user-doc --> <!-- end-user-doc --> + * + * @see #isSetWidth() + * @see #getWidth() + * @see #setWidth(double) + * @generated + */ + void unsetWidth(); + + /** + * Returns whether the value of the ' + * {@link org.eclipse.papyrus.dd.dc.Bounds#getWidth <em>Width</em>}' + * attribute is set. <!-- begin-user-doc --> <!-- end-user-doc --> + * + * @return whether the value of the '<em>Width</em>' attribute is set. + * @see #unsetWidth() + * @see #getWidth() + * @see #setWidth(double) + * @generated + */ + boolean isSetWidth(); + + /** * Returns the value of the '<em><b>Height</b></em>' attribute. <!-- * begin-user-doc --> <!-- end-user-doc --> <!-- begin-model-doc --> a real * number (>=0) that represents the height of the bounds <!-- end-model-doc @@ -147,19 +226,60 @@ public interface Bounds extends EObject { void setHeight(double value); /** + * Unsets the value of the ' + * {@link org.eclipse.papyrus.dd.dc.Bounds#getHeight <em>Height</em>}' + * attribute. <!-- begin-user-doc --> <!-- end-user-doc --> + * + * @see #isSetHeight() + * @see #getHeight() + * @see #setHeight(double) + * @generated + */ + void unsetHeight(); + + /** + * Returns whether the value of the ' + * {@link org.eclipse.papyrus.dd.dc.Bounds#getHeight <em>Height</em>}' + * attribute is set. <!-- begin-user-doc --> <!-- end-user-doc --> + * + * @return whether the value of the '<em>Height</em>' attribute is set. + * @see #unsetHeight() + * @see #getHeight() + * @see #setHeight(double) + * @generated + */ + boolean isSetHeight(); + + /** + * <!-- begin-user-doc --> <!-- end-user-doc --> <!-- begin-model-doc --> + * the width of bounds cannot be negative + * + * @param diagnostics + * The chain of diagnostics to which problems are to be appended. + * @param context + * The cache of context-specific information. <!-- end-model-doc + * --> + * @model + * annotation="http://www.eclipse.org/emf/2002/Ecore/OCL body='width >= 0'" + * @generated + */ + boolean nonNegativeWidth(DiagnosticChain diagnostics, + Map<Object, Object> context); + + /** * <!-- begin-user-doc --> <!-- end-user-doc --> <!-- begin-model-doc --> - * the width and height of bounds cannot be negative + * the height of bounds cannot be negative * * @param diagnostics * The chain of diagnostics to which problems are to be appended. * @param context * The cache of context-specific information. <!-- end-model-doc * --> - * @model annotation= - * "http://www.eclipse.org/emf/2002/Ecore/OCL body='width >= 0 and height >=0'" + * @model + * annotation="http://www.eclipse.org/emf/2002/Ecore/OCL body='height >=0'" * @generated */ - boolean nonNegativeSize(DiagnosticChain diagnostics, + boolean nonNegativeHeight(DiagnosticChain diagnostics, Map<Object, Object> context); } // Bounds diff --git a/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dc/DCPackage.java b/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dc/DCPackage.java index 57e90b163e8..82e124103ec 100644 --- a/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dc/DCPackage.java +++ b/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dc/DCPackage.java @@ -154,13 +154,22 @@ public interface DCPackage extends EPackage { int DIMENSION_FEATURE_COUNT = 2; /** - * The operation id for the '<em>Non Negative Dimension</em>' operation. - * <!-- begin-user-doc --> <!-- end-user-doc --> + * The operation id for the '<em>Non Negative Width</em>' operation. <!-- + * begin-user-doc --> <!-- end-user-doc --> + * + * @generated + * @ordered + */ + int DIMENSION___NON_NEGATIVE_WIDTH__DIAGNOSTICCHAIN_MAP = 0; + + /** + * The operation id for the '<em>Non Negative Height</em>' operation. <!-- + * begin-user-doc --> <!-- end-user-doc --> * * @generated * @ordered */ - int DIMENSION___NON_NEGATIVE_DIMENSION__DIAGNOSTICCHAIN_MAP = 0; + int DIMENSION___NON_NEGATIVE_HEIGHT__DIAGNOSTICCHAIN_MAP = 1; /** * The number of operations of the '<em>Dimension</em>' class. <!-- @@ -169,7 +178,7 @@ public interface DCPackage extends EPackage { * @generated * @ordered */ - int DIMENSION_OPERATION_COUNT = 1; + int DIMENSION_OPERATION_COUNT = 2; /** * The meta object id for the ' @@ -228,13 +237,22 @@ public interface DCPackage extends EPackage { int BOUNDS_FEATURE_COUNT = 4; /** - * The operation id for the '<em>Non Negative Size</em>' operation. <!-- + * The operation id for the '<em>Non Negative Width</em>' operation. <!-- * begin-user-doc --> <!-- end-user-doc --> * * @generated * @ordered */ - int BOUNDS___NON_NEGATIVE_SIZE__DIAGNOSTICCHAIN_MAP = 0; + int BOUNDS___NON_NEGATIVE_WIDTH__DIAGNOSTICCHAIN_MAP = 0; + + /** + * The operation id for the '<em>Non Negative Height</em>' operation. <!-- + * begin-user-doc --> <!-- end-user-doc --> + * + * @generated + * @ordered + */ + int BOUNDS___NON_NEGATIVE_HEIGHT__DIAGNOSTICCHAIN_MAP = 1; /** * The number of operations of the '<em>Bounds</em>' class. <!-- @@ -243,7 +261,7 @@ public interface DCPackage extends EPackage { * @generated * @ordered */ - int BOUNDS_OPERATION_COUNT = 1; + int BOUNDS_OPERATION_COUNT = 2; /** * The meta object id for the '{@link org.eclipse.papyrus.dd.dc.KnownColor @@ -257,24 +275,13 @@ public interface DCPackage extends EPackage { int KNOWN_COLOR = 3; /** - * The meta object id for the ' - * {@link org.eclipse.papyrus.dd.dc.AlignmentKind <em>Alignment Kind</em>}' - * enum. <!-- begin-user-doc --> <!-- end-user-doc --> - * - * @see org.eclipse.papyrus.dd.dc.AlignmentKind - * @see org.eclipse.papyrus.dd.dc.impl.DCPackageImpl#getAlignmentKind() - * @generated - */ - int ALIGNMENT_KIND = 4; - - /** * The meta object id for the '<em>Boolean</em>' data type. <!-- * begin-user-doc --> <!-- end-user-doc --> * * @see org.eclipse.papyrus.dd.dc.impl.DCPackageImpl#getBoolean() * @generated */ - int BOOLEAN = 5; + int BOOLEAN = 4; /** * The meta object id for the '<em>Integer</em>' data type. <!-- @@ -283,7 +290,7 @@ public interface DCPackage extends EPackage { * @see org.eclipse.papyrus.dd.dc.impl.DCPackageImpl#getInteger() * @generated */ - int INTEGER = 6; + int INTEGER = 5; /** * The meta object id for the '<em>Real</em>' data type. <!-- begin-user-doc @@ -292,7 +299,7 @@ public interface DCPackage extends EPackage { * @see org.eclipse.papyrus.dd.dc.impl.DCPackageImpl#getReal() * @generated */ - int REAL = 7; + int REAL = 6; /** * The meta object id for the '<em>String</em>' data type. <!-- @@ -302,7 +309,7 @@ public interface DCPackage extends EPackage { * @see org.eclipse.papyrus.dd.dc.impl.DCPackageImpl#getString() * @generated */ - int STRING = 8; + int STRING = 7; /** * The meta object id for the '<em>Color</em>' data type. <!-- @@ -312,7 +319,7 @@ public interface DCPackage extends EPackage { * @see org.eclipse.papyrus.dd.dc.impl.DCPackageImpl#getColor() * @generated */ - int COLOR = 9; + int COLOR = 8; /** * Returns the meta object for class ' @@ -386,17 +393,29 @@ public interface DCPackage extends EPackage { /** * Returns the meta object for the ' - * {@link org.eclipse.papyrus.dd.dc.Dimension#nonNegativeDimension(org.eclipse.emf.common.util.DiagnosticChain, java.util.Map) - * <em>Non Negative Dimension</em>}' operation. <!-- begin-user-doc --> <!-- + * {@link org.eclipse.papyrus.dd.dc.Dimension#nonNegativeWidth(org.eclipse.emf.common.util.DiagnosticChain, java.util.Map) + * <em>Non Negative Width</em>}' operation. <!-- begin-user-doc --> <!-- + * end-user-doc --> + * + * @return the meta object for the '<em>Non Negative Width</em>' operation. + * @see org.eclipse.papyrus.dd.dc.Dimension#nonNegativeWidth(org.eclipse.emf.common.util.DiagnosticChain, + * java.util.Map) + * @generated + */ + EOperation getDimension__NonNegativeWidth__DiagnosticChain_Map(); + + /** + * Returns the meta object for the ' + * {@link org.eclipse.papyrus.dd.dc.Dimension#nonNegativeHeight(org.eclipse.emf.common.util.DiagnosticChain, java.util.Map) + * <em>Non Negative Height</em>}' operation. <!-- begin-user-doc --> <!-- * end-user-doc --> * - * @return the meta object for the '<em>Non Negative Dimension</em>' - * operation. - * @see org.eclipse.papyrus.dd.dc.Dimension#nonNegativeDimension(org.eclipse.emf.common.util.DiagnosticChain, + * @return the meta object for the '<em>Non Negative Height</em>' operation. + * @see org.eclipse.papyrus.dd.dc.Dimension#nonNegativeHeight(org.eclipse.emf.common.util.DiagnosticChain, * java.util.Map) * @generated */ - EOperation getDimension__NonNegativeDimension__DiagnosticChain_Map(); + EOperation getDimension__NonNegativeHeight__DiagnosticChain_Map(); /** * Returns the meta object for class ' @@ -459,38 +478,40 @@ public interface DCPackage extends EPackage { /** * Returns the meta object for the ' - * {@link org.eclipse.papyrus.dd.dc.Bounds#nonNegativeSize(org.eclipse.emf.common.util.DiagnosticChain, java.util.Map) - * <em>Non Negative Size</em>} ' operation. <!-- begin-user-doc --> <!-- + * {@link org.eclipse.papyrus.dd.dc.Bounds#nonNegativeWidth(org.eclipse.emf.common.util.DiagnosticChain, java.util.Map) + * <em>Non Negative Width</em>}' operation. <!-- begin-user-doc --> <!-- * end-user-doc --> * - * @return the meta object for the '<em>Non Negative Size</em>' operation. - * @see org.eclipse.papyrus.dd.dc.Bounds#nonNegativeSize(org.eclipse.emf.common.util.DiagnosticChain, + * @return the meta object for the '<em>Non Negative Width</em>' operation. + * @see org.eclipse.papyrus.dd.dc.Bounds#nonNegativeWidth(org.eclipse.emf.common.util.DiagnosticChain, * java.util.Map) * @generated */ - EOperation getBounds__NonNegativeSize__DiagnosticChain_Map(); + EOperation getBounds__NonNegativeWidth__DiagnosticChain_Map(); /** - * Returns the meta object for enum ' - * {@link org.eclipse.papyrus.dd.dc.KnownColor <em>Known Color</em>}'. <!-- - * begin-user-doc --> <!-- end-user-doc --> + * Returns the meta object for the ' + * {@link org.eclipse.papyrus.dd.dc.Bounds#nonNegativeHeight(org.eclipse.emf.common.util.DiagnosticChain, java.util.Map) + * <em>Non Negative Height</em>}' operation. <!-- begin-user-doc --> <!-- + * end-user-doc --> * - * @return the meta object for enum '<em>Known Color</em>'. - * @see org.eclipse.papyrus.dd.dc.KnownColor + * @return the meta object for the '<em>Non Negative Height</em>' operation. + * @see org.eclipse.papyrus.dd.dc.Bounds#nonNegativeHeight(org.eclipse.emf.common.util.DiagnosticChain, + * java.util.Map) * @generated */ - EEnum getKnownColor(); + EOperation getBounds__NonNegativeHeight__DiagnosticChain_Map(); /** * Returns the meta object for enum ' - * {@link org.eclipse.papyrus.dd.dc.AlignmentKind <em>Alignment Kind</em>}'. - * <!-- begin-user-doc --> <!-- end-user-doc --> + * {@link org.eclipse.papyrus.dd.dc.KnownColor <em>Known Color</em>}'. <!-- + * begin-user-doc --> <!-- end-user-doc --> * - * @return the meta object for enum '<em>Alignment Kind</em>'. - * @see org.eclipse.papyrus.dd.dc.AlignmentKind + * @return the meta object for enum '<em>Known Color</em>'. + * @see org.eclipse.papyrus.dd.dc.KnownColor * @generated */ - EEnum getAlignmentKind(); + EEnum getKnownColor(); /** * Returns the meta object for data type '<em>Boolean</em>'. <!-- @@ -625,14 +646,22 @@ public interface DCPackage extends EPackage { EAttribute DIMENSION__HEIGHT = eINSTANCE.getDimension_Height(); /** - * The meta object literal for the ' - * <em><b>Non Negative Dimension</b></em>' operation. <!-- - * begin-user-doc --> <!-- end-user-doc --> + * The meta object literal for the '<em><b>Non Negative Width</b></em>' + * operation. <!-- begin-user-doc --> <!-- end-user-doc --> * * @generated */ - EOperation DIMENSION___NON_NEGATIVE_DIMENSION__DIAGNOSTICCHAIN_MAP = eINSTANCE - .getDimension__NonNegativeDimension__DiagnosticChain_Map(); + EOperation DIMENSION___NON_NEGATIVE_WIDTH__DIAGNOSTICCHAIN_MAP = eINSTANCE + .getDimension__NonNegativeWidth__DiagnosticChain_Map(); + + /** + * The meta object literal for the '<em><b>Non Negative Height</b></em>' + * operation. <!-- begin-user-doc --> <!-- end-user-doc --> + * + * @generated + */ + EOperation DIMENSION___NON_NEGATIVE_HEIGHT__DIAGNOSTICCHAIN_MAP = eINSTANCE + .getDimension__NonNegativeHeight__DiagnosticChain_Map(); /** * The meta object literal for the ' @@ -678,36 +707,33 @@ public interface DCPackage extends EPackage { EAttribute BOUNDS__HEIGHT = eINSTANCE.getBounds_Height(); /** - * The meta object literal for the '<em><b>Non Negative Size</b></em>' + * The meta object literal for the '<em><b>Non Negative Width</b></em>' * operation. <!-- begin-user-doc --> <!-- end-user-doc --> * * @generated */ - EOperation BOUNDS___NON_NEGATIVE_SIZE__DIAGNOSTICCHAIN_MAP = eINSTANCE - .getBounds__NonNegativeSize__DiagnosticChain_Map(); + EOperation BOUNDS___NON_NEGATIVE_WIDTH__DIAGNOSTICCHAIN_MAP = eINSTANCE + .getBounds__NonNegativeWidth__DiagnosticChain_Map(); /** - * The meta object literal for the ' - * {@link org.eclipse.papyrus.dd.dc.KnownColor <em>Known Color</em>}' - * enum. <!-- begin-user-doc --> <!-- end-user-doc --> + * The meta object literal for the '<em><b>Non Negative Height</b></em>' + * operation. <!-- begin-user-doc --> <!-- end-user-doc --> * - * @see org.eclipse.papyrus.dd.dc.KnownColor - * @see org.eclipse.papyrus.dd.dc.impl.DCPackageImpl#getKnownColor() * @generated */ - EEnum KNOWN_COLOR = eINSTANCE.getKnownColor(); + EOperation BOUNDS___NON_NEGATIVE_HEIGHT__DIAGNOSTICCHAIN_MAP = eINSTANCE + .getBounds__NonNegativeHeight__DiagnosticChain_Map(); /** * The meta object literal for the ' - * {@link org.eclipse.papyrus.dd.dc.AlignmentKind - * <em>Alignment Kind</em>}' enum. <!-- begin-user-doc --> <!-- - * end-user-doc --> + * {@link org.eclipse.papyrus.dd.dc.KnownColor <em>Known Color</em>}' + * enum. <!-- begin-user-doc --> <!-- end-user-doc --> * - * @see org.eclipse.papyrus.dd.dc.AlignmentKind - * @see org.eclipse.papyrus.dd.dc.impl.DCPackageImpl#getAlignmentKind() + * @see org.eclipse.papyrus.dd.dc.KnownColor + * @see org.eclipse.papyrus.dd.dc.impl.DCPackageImpl#getKnownColor() * @generated */ - EEnum ALIGNMENT_KIND = eINSTANCE.getAlignmentKind(); + EEnum KNOWN_COLOR = eINSTANCE.getKnownColor(); /** * The meta object literal for the '<em>Boolean</em>' data type. <!-- diff --git a/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dc/Dimension.java b/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dc/Dimension.java index 551ec51a66f..823ad0d6cc0 100644 --- a/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dc/Dimension.java +++ b/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dc/Dimension.java @@ -60,12 +60,39 @@ public interface Dimension extends EObject { * * @param value * the new value of the '<em>Width</em>' attribute. + * @see #isSetWidth() + * @see #unsetWidth() * @see #getWidth() * @generated */ void setWidth(double value); /** + * Unsets the value of the ' + * {@link org.eclipse.papyrus.dd.dc.Dimension#getWidth <em>Width</em>}' + * attribute. <!-- begin-user-doc --> <!-- end-user-doc --> + * + * @see #isSetWidth() + * @see #getWidth() + * @see #setWidth(double) + * @generated + */ + void unsetWidth(); + + /** + * Returns whether the value of the ' + * {@link org.eclipse.papyrus.dd.dc.Dimension#getWidth <em>Width</em>}' + * attribute is set. <!-- begin-user-doc --> <!-- end-user-doc --> + * + * @return whether the value of the '<em>Width</em>' attribute is set. + * @see #unsetWidth() + * @see #getWidth() + * @see #setWidth(double) + * @generated + */ + boolean isSetWidth(); + + /** * Returns the value of the '<em><b>Height</b></em>' attribute. <!-- * begin-user-doc --> <!-- end-user-doc --> <!-- begin-model-doc --> a real * number (>=0) that represents a length along the y-axis. <!-- @@ -87,25 +114,68 @@ public interface Dimension extends EObject { * * @param value * the new value of the '<em>Height</em>' attribute. + * @see #isSetHeight() + * @see #unsetHeight() * @see #getHeight() * @generated */ void setHeight(double value); /** + * Unsets the value of the ' + * {@link org.eclipse.papyrus.dd.dc.Dimension#getHeight <em>Height</em>}' + * attribute. <!-- begin-user-doc --> <!-- end-user-doc --> + * + * @see #isSetHeight() + * @see #getHeight() + * @see #setHeight(double) + * @generated + */ + void unsetHeight(); + + /** + * Returns whether the value of the ' + * {@link org.eclipse.papyrus.dd.dc.Dimension#getHeight <em>Height</em>}' + * attribute is set. <!-- begin-user-doc --> <!-- end-user-doc --> + * + * @return whether the value of the '<em>Height</em>' attribute is set. + * @see #unsetHeight() + * @see #getHeight() + * @see #setHeight(double) + * @generated + */ + boolean isSetHeight(); + + /** + * <!-- begin-user-doc --> <!-- end-user-doc --> <!-- begin-model-doc --> + * the width of a dimension cannot be negative + * + * @param diagnostics + * The chain of diagnostics to which problems are to be appended. + * @param context + * The cache of context-specific information. <!-- end-model-doc + * --> + * @model + * annotation="http://www.eclipse.org/emf/2002/Ecore/OCL body='width >=0'" + * @generated + */ + boolean nonNegativeWidth(DiagnosticChain diagnostics, + Map<Object, Object> context); + + /** * <!-- begin-user-doc --> <!-- end-user-doc --> <!-- begin-model-doc --> - * the width and height of a dimension cannot be negative + * the height of a dimension cannot be negative * * @param diagnostics * The chain of diagnostics to which problems are to be appended. * @param context * The cache of context-specific information. <!-- end-model-doc * --> - * @model annotation= - * "http://www.eclipse.org/emf/2002/Ecore/OCL body='width >= 0 and height >=0'" + * @model + * annotation="http://www.eclipse.org/emf/2002/Ecore/OCL body='height >=0'" * @generated */ - boolean nonNegativeDimension(DiagnosticChain diagnostics, + boolean nonNegativeHeight(DiagnosticChain diagnostics, Map<Object, Object> context); } // Dimension diff --git a/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dc/Point.java b/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dc/Point.java index 6b5abb8022f..9fe57282508 100644 --- a/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dc/Point.java +++ b/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dc/Point.java @@ -55,12 +55,38 @@ public interface Point extends EObject { * * @param value * the new value of the '<em>X</em>' attribute. + * @see #isSetX() + * @see #unsetX() * @see #getX() * @generated */ void setX(double value); /** + * Unsets the value of the '{@link org.eclipse.papyrus.dd.dc.Point#getX + * <em>X</em>}' attribute. <!-- begin-user-doc --> <!-- end-user-doc --> + * + * @see #isSetX() + * @see #getX() + * @see #setX(double) + * @generated + */ + void unsetX(); + + /** + * Returns whether the value of the ' + * {@link org.eclipse.papyrus.dd.dc.Point#getX <em>X</em>}' attribute is + * set. <!-- begin-user-doc --> <!-- end-user-doc --> + * + * @return whether the value of the '<em>X</em>' attribute is set. + * @see #unsetX() + * @see #getX() + * @see #setX(double) + * @generated + */ + boolean isSetX(); + + /** * Returns the value of the '<em><b>Y</b></em>' attribute. The default value * is <code>"0"</code>. <!-- begin-user-doc --> <!-- end-user-doc --> <!-- * begin-model-doc --> a real number (<= 0 or >= 0) that represents the @@ -81,9 +107,35 @@ public interface Point extends EObject { * * @param value * the new value of the '<em>Y</em>' attribute. + * @see #isSetY() + * @see #unsetY() * @see #getY() * @generated */ void setY(double value); + /** + * Unsets the value of the '{@link org.eclipse.papyrus.dd.dc.Point#getY + * <em>Y</em>}' attribute. <!-- begin-user-doc --> <!-- end-user-doc --> + * + * @see #isSetY() + * @see #getY() + * @see #setY(double) + * @generated + */ + void unsetY(); + + /** + * Returns whether the value of the ' + * {@link org.eclipse.papyrus.dd.dc.Point#getY <em>Y</em>}' attribute is + * set. <!-- begin-user-doc --> <!-- end-user-doc --> + * + * @return whether the value of the '<em>Y</em>' attribute is set. + * @see #unsetY() + * @see #getY() + * @see #setY(double) + * @generated + */ + boolean isSetY(); + } // Point diff --git a/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dc/impl/BoundsImpl.java b/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dc/impl/BoundsImpl.java index 28a416b4de0..67e646ed7b6 100644 --- a/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dc/impl/BoundsImpl.java +++ b/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dc/impl/BoundsImpl.java @@ -71,6 +71,15 @@ public class BoundsImpl extends MinimalEObjectImpl.Container implements Bounds { protected double x = X_EDEFAULT; /** + * This is true if the X attribute has been set. <!-- begin-user-doc --> + * <!-- end-user-doc --> + * + * @generated + * @ordered + */ + protected boolean xESet; + + /** * The default value of the '{@link #getY() <em>Y</em>}' attribute. <!-- * begin-user-doc --> <!-- end-user-doc --> * @@ -91,6 +100,15 @@ public class BoundsImpl extends MinimalEObjectImpl.Container implements Bounds { protected double y = Y_EDEFAULT; /** + * This is true if the Y attribute has been set. <!-- begin-user-doc --> + * <!-- end-user-doc --> + * + * @generated + * @ordered + */ + protected boolean yESet; + + /** * The default value of the '{@link #getWidth() <em>Width</em>}' attribute. * <!-- begin-user-doc --> <!-- end-user-doc --> * @@ -111,6 +129,15 @@ public class BoundsImpl extends MinimalEObjectImpl.Container implements Bounds { protected double width = WIDTH_EDEFAULT; /** + * This is true if the Width attribute has been set. <!-- begin-user-doc --> + * <!-- end-user-doc --> + * + * @generated + * @ordered + */ + protected boolean widthESet; + + /** * The default value of the '{@link #getHeight() <em>Height</em>}' * attribute. <!-- begin-user-doc --> <!-- end-user-doc --> * @@ -131,6 +158,15 @@ public class BoundsImpl extends MinimalEObjectImpl.Container implements Bounds { protected double height = HEIGHT_EDEFAULT; /** + * This is true if the Height attribute has been set. <!-- begin-user-doc + * --> <!-- end-user-doc --> + * + * @generated + * @ordered + */ + protected boolean heightESet; + + /** * <!-- begin-user-doc --> <!-- end-user-doc --> * * @generated @@ -166,9 +202,35 @@ public class BoundsImpl extends MinimalEObjectImpl.Container implements Bounds { public void setX(double newX) { double oldX = x; x = newX; + boolean oldXESet = xESet; + xESet = true; if (eNotificationRequired()) eNotify(new ENotificationImpl(this, Notification.SET, - DCPackage.BOUNDS__X, oldX, x)); + DCPackage.BOUNDS__X, oldX, x, !oldXESet)); + } + + /** + * <!-- begin-user-doc --> <!-- end-user-doc --> + * + * @generated + */ + public void unsetX() { + double oldX = x; + boolean oldXESet = xESet; + x = X_EDEFAULT; + xESet = false; + if (eNotificationRequired()) + eNotify(new ENotificationImpl(this, Notification.UNSET, + DCPackage.BOUNDS__X, oldX, X_EDEFAULT, oldXESet)); + } + + /** + * <!-- begin-user-doc --> <!-- end-user-doc --> + * + * @generated + */ + public boolean isSetX() { + return xESet; } /** @@ -188,9 +250,35 @@ public class BoundsImpl extends MinimalEObjectImpl.Container implements Bounds { public void setY(double newY) { double oldY = y; y = newY; + boolean oldYESet = yESet; + yESet = true; if (eNotificationRequired()) eNotify(new ENotificationImpl(this, Notification.SET, - DCPackage.BOUNDS__Y, oldY, y)); + DCPackage.BOUNDS__Y, oldY, y, !oldYESet)); + } + + /** + * <!-- begin-user-doc --> <!-- end-user-doc --> + * + * @generated + */ + public void unsetY() { + double oldY = y; + boolean oldYESet = yESet; + y = Y_EDEFAULT; + yESet = false; + if (eNotificationRequired()) + eNotify(new ENotificationImpl(this, Notification.UNSET, + DCPackage.BOUNDS__Y, oldY, Y_EDEFAULT, oldYESet)); + } + + /** + * <!-- begin-user-doc --> <!-- end-user-doc --> + * + * @generated + */ + public boolean isSetY() { + return yESet; } /** @@ -210,9 +298,36 @@ public class BoundsImpl extends MinimalEObjectImpl.Container implements Bounds { public void setWidth(double newWidth) { double oldWidth = width; width = newWidth; + boolean oldWidthESet = widthESet; + widthESet = true; if (eNotificationRequired()) eNotify(new ENotificationImpl(this, Notification.SET, - DCPackage.BOUNDS__WIDTH, oldWidth, width)); + DCPackage.BOUNDS__WIDTH, oldWidth, width, !oldWidthESet)); + } + + /** + * <!-- begin-user-doc --> <!-- end-user-doc --> + * + * @generated + */ + public void unsetWidth() { + double oldWidth = width; + boolean oldWidthESet = widthESet; + width = WIDTH_EDEFAULT; + widthESet = false; + if (eNotificationRequired()) + eNotify(new ENotificationImpl(this, Notification.UNSET, + DCPackage.BOUNDS__WIDTH, oldWidth, WIDTH_EDEFAULT, + oldWidthESet)); + } + + /** + * <!-- begin-user-doc --> <!-- end-user-doc --> + * + * @generated + */ + public boolean isSetWidth() { + return widthESet; } /** @@ -232,30 +347,57 @@ public class BoundsImpl extends MinimalEObjectImpl.Container implements Bounds { public void setHeight(double newHeight) { double oldHeight = height; height = newHeight; + boolean oldHeightESet = heightESet; + heightESet = true; if (eNotificationRequired()) eNotify(new ENotificationImpl(this, Notification.SET, - DCPackage.BOUNDS__HEIGHT, oldHeight, height)); + DCPackage.BOUNDS__HEIGHT, oldHeight, height, !oldHeightESet)); + } + + /** + * <!-- begin-user-doc --> <!-- end-user-doc --> + * + * @generated + */ + public void unsetHeight() { + double oldHeight = height; + boolean oldHeightESet = heightESet; + height = HEIGHT_EDEFAULT; + heightESet = false; + if (eNotificationRequired()) + eNotify(new ENotificationImpl(this, Notification.UNSET, + DCPackage.BOUNDS__HEIGHT, oldHeight, HEIGHT_EDEFAULT, + oldHeightESet)); + } + + /** + * <!-- begin-user-doc --> <!-- end-user-doc --> + * + * @generated + */ + public boolean isSetHeight() { + return heightESet; } /** * The cached validation expression for the ' - * {@link #nonNegativeSize(org.eclipse.emf.common.util.DiagnosticChain, java.util.Map) - * <em>Non Negative Size</em>}' invariant operation. <!-- begin-user-doc --> - * <!-- end-user-doc --> + * {@link #nonNegativeWidth(org.eclipse.emf.common.util.DiagnosticChain, java.util.Map) + * <em>Non Negative Width</em>}' invariant operation. <!-- begin-user-doc + * --> <!-- end-user-doc --> * - * @see #nonNegativeSize(org.eclipse.emf.common.util.DiagnosticChain, + * @see #nonNegativeWidth(org.eclipse.emf.common.util.DiagnosticChain, * java.util.Map) * @generated * @ordered */ - protected static final String NON_NEGATIVE_SIZE_DIAGNOSTIC_CHAIN_MAP__EEXPRESSION = "width >= 0 and height >=0"; + protected static final String NON_NEGATIVE_WIDTH_DIAGNOSTIC_CHAIN_MAP__EEXPRESSION = "width >= 0"; /** * <!-- begin-user-doc --> <!-- end-user-doc --> * * @generated */ - public boolean nonNegativeSize(DiagnosticChain diagnostics, + public boolean nonNegativeWidth(DiagnosticChain diagnostics, Map<Object, Object> context) { return DCValidator .validate( @@ -264,10 +406,43 @@ public class BoundsImpl extends MinimalEObjectImpl.Container implements Bounds { diagnostics, context, "http://www.eclipse.org/emf/2002/Ecore/OCL", - DCPackage.Literals.BOUNDS___NON_NEGATIVE_SIZE__DIAGNOSTICCHAIN_MAP, - NON_NEGATIVE_SIZE_DIAGNOSTIC_CHAIN_MAP__EEXPRESSION, + DCPackage.Literals.BOUNDS___NON_NEGATIVE_WIDTH__DIAGNOSTICCHAIN_MAP, + NON_NEGATIVE_WIDTH_DIAGNOSTIC_CHAIN_MAP__EEXPRESSION, Diagnostic.ERROR, DCValidator.DIAGNOSTIC_SOURCE, - DCValidator.BOUNDS__NON_NEGATIVE_SIZE); + DCValidator.BOUNDS__NON_NEGATIVE_WIDTH); + } + + /** + * The cached validation expression for the ' + * {@link #nonNegativeHeight(org.eclipse.emf.common.util.DiagnosticChain, java.util.Map) + * <em>Non Negative Height</em>}' invariant operation. <!-- begin-user-doc + * --> <!-- end-user-doc --> + * + * @see #nonNegativeHeight(org.eclipse.emf.common.util.DiagnosticChain, + * java.util.Map) + * @generated + * @ordered + */ + protected static final String NON_NEGATIVE_HEIGHT_DIAGNOSTIC_CHAIN_MAP__EEXPRESSION = "height >=0"; + + /** + * <!-- begin-user-doc --> <!-- end-user-doc --> + * + * @generated + */ + public boolean nonNegativeHeight(DiagnosticChain diagnostics, + Map<Object, Object> context) { + return DCValidator + .validate( + DCPackage.Literals.BOUNDS, + this, + diagnostics, + context, + "http://www.eclipse.org/emf/2002/Ecore/OCL", + DCPackage.Literals.BOUNDS___NON_NEGATIVE_HEIGHT__DIAGNOSTICCHAIN_MAP, + NON_NEGATIVE_HEIGHT_DIAGNOSTIC_CHAIN_MAP__EEXPRESSION, + Diagnostic.ERROR, DCValidator.DIAGNOSTIC_SOURCE, + DCValidator.BOUNDS__NON_NEGATIVE_HEIGHT); } /** @@ -323,16 +498,16 @@ public class BoundsImpl extends MinimalEObjectImpl.Container implements Bounds { public void eUnset(int featureID) { switch (featureID) { case DCPackage.BOUNDS__X: - setX(X_EDEFAULT); + unsetX(); return; case DCPackage.BOUNDS__Y: - setY(Y_EDEFAULT); + unsetY(); return; case DCPackage.BOUNDS__WIDTH: - setWidth(WIDTH_EDEFAULT); + unsetWidth(); return; case DCPackage.BOUNDS__HEIGHT: - setHeight(HEIGHT_EDEFAULT); + unsetHeight(); return; } super.eUnset(featureID); @@ -347,13 +522,13 @@ public class BoundsImpl extends MinimalEObjectImpl.Container implements Bounds { public boolean eIsSet(int featureID) { switch (featureID) { case DCPackage.BOUNDS__X: - return x != X_EDEFAULT; + return isSetX(); case DCPackage.BOUNDS__Y: - return y != Y_EDEFAULT; + return isSetY(); case DCPackage.BOUNDS__WIDTH: - return width != WIDTH_EDEFAULT; + return isSetWidth(); case DCPackage.BOUNDS__HEIGHT: - return height != HEIGHT_EDEFAULT; + return isSetHeight(); } return super.eIsSet(featureID); } @@ -368,8 +543,11 @@ public class BoundsImpl extends MinimalEObjectImpl.Container implements Bounds { public Object eInvoke(int operationID, EList<?> arguments) throws InvocationTargetException { switch (operationID) { - case DCPackage.BOUNDS___NON_NEGATIVE_SIZE__DIAGNOSTICCHAIN_MAP: - return nonNegativeSize((DiagnosticChain) arguments.get(0), + case DCPackage.BOUNDS___NON_NEGATIVE_WIDTH__DIAGNOSTICCHAIN_MAP: + return nonNegativeWidth((DiagnosticChain) arguments.get(0), + (Map<Object, Object>) arguments.get(1)); + case DCPackage.BOUNDS___NON_NEGATIVE_HEIGHT__DIAGNOSTICCHAIN_MAP: + return nonNegativeHeight((DiagnosticChain) arguments.get(0), (Map<Object, Object>) arguments.get(1)); } return super.eInvoke(operationID, arguments); @@ -387,13 +565,25 @@ public class BoundsImpl extends MinimalEObjectImpl.Container implements Bounds { StringBuffer result = new StringBuffer(super.toString()); result.append(" (x: "); - result.append(x); + if (xESet) + result.append(x); + else + result.append("<unset>"); result.append(", y: "); - result.append(y); + if (yESet) + result.append(y); + else + result.append("<unset>"); result.append(", width: "); - result.append(width); + if (widthESet) + result.append(width); + else + result.append("<unset>"); result.append(", height: "); - result.append(height); + if (heightESet) + result.append(height); + else + result.append("<unset>"); result.append(')'); return result.toString(); } diff --git a/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dc/impl/DCFactoryImpl.java b/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dc/impl/DCFactoryImpl.java index ce9fbc3b5b9..6ff06341132 100644 --- a/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dc/impl/DCFactoryImpl.java +++ b/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dc/impl/DCFactoryImpl.java @@ -91,8 +91,6 @@ public class DCFactoryImpl extends EFactoryImpl implements DCFactory { switch (eDataType.getClassifierID()) { case DCPackage.KNOWN_COLOR: return createKnownColorFromString(eDataType, initialValue); - case DCPackage.ALIGNMENT_KIND: - return createAlignmentKindFromString(eDataType, initialValue); case DCPackage.BOOLEAN: return createBooleanFromString(eDataType, initialValue); case DCPackage.INTEGER: @@ -119,8 +117,6 @@ public class DCFactoryImpl extends EFactoryImpl implements DCFactory { switch (eDataType.getClassifierID()) { case DCPackage.KNOWN_COLOR: return convertKnownColorToString(eDataType, instanceValue); - case DCPackage.ALIGNMENT_KIND: - return convertAlignmentKindToString(eDataType, instanceValue); case DCPackage.BOOLEAN: return convertBooleanToString(eDataType, instanceValue); case DCPackage.INTEGER: @@ -197,31 +193,6 @@ public class DCFactoryImpl extends EFactoryImpl implements DCFactory { * * @generated */ - public AlignmentKind createAlignmentKindFromString(EDataType eDataType, - String initialValue) { - AlignmentKind result = AlignmentKind.get(initialValue); - if (result == null) - throw new IllegalArgumentException("The value '" + initialValue - + "' is not a valid enumerator of '" + eDataType.getName() - + "'"); - return result; - } - - /** - * <!-- begin-user-doc --> <!-- end-user-doc --> - * - * @generated - */ - public String convertAlignmentKindToString(EDataType eDataType, - Object instanceValue) { - return instanceValue == null ? null : instanceValue.toString(); - } - - /** - * <!-- begin-user-doc --> <!-- end-user-doc --> - * - * @generated - */ public Boolean createBooleanFromString(EDataType eDataType, String initialValue) { return (Boolean) super.createFromString(eDataType, initialValue); diff --git a/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dc/impl/DCPackageImpl.java b/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dc/impl/DCPackageImpl.java index 019c95ac9cd..e57dfb25151 100644 --- a/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dc/impl/DCPackageImpl.java +++ b/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dc/impl/DCPackageImpl.java @@ -12,7 +12,6 @@ package org.eclipse.papyrus.dd.dc.impl; import java.awt.Color; - import org.eclipse.emf.ecore.EAttribute; import org.eclipse.emf.ecore.EClass; import org.eclipse.emf.ecore.EDataType; @@ -21,17 +20,13 @@ import org.eclipse.emf.ecore.EGenericType; import org.eclipse.emf.ecore.EOperation; import org.eclipse.emf.ecore.EPackage; import org.eclipse.emf.ecore.EValidator; - import org.eclipse.emf.ecore.impl.EPackageImpl; - -import org.eclipse.papyrus.dd.dc.AlignmentKind; import org.eclipse.papyrus.dd.dc.Bounds; import org.eclipse.papyrus.dd.dc.DCFactory; import org.eclipse.papyrus.dd.dc.DCPackage; import org.eclipse.papyrus.dd.dc.Dimension; import org.eclipse.papyrus.dd.dc.KnownColor; import org.eclipse.papyrus.dd.dc.Point; - import org.eclipse.papyrus.dd.dc.util.DCValidator; /** @@ -75,13 +70,6 @@ public class DCPackageImpl extends EPackageImpl implements DCPackage { * * @generated */ - private EEnum alignmentKindEEnum = null; - - /** - * <!-- begin-user-doc --> <!-- end-user-doc --> - * - * @generated - */ private EDataType booleanEDataType = null; /** @@ -174,7 +162,6 @@ public class DCPackageImpl extends EPackageImpl implements DCPackage { // Register package validator EValidator.Registry.INSTANCE.put(theDCPackage, new EValidator.Descriptor() { - public EValidator getEValidator() { return DCValidator.INSTANCE; } @@ -247,7 +234,7 @@ public class DCPackageImpl extends EPackageImpl implements DCPackage { * * @generated */ - public EOperation getDimension__NonNegativeDimension__DiagnosticChain_Map() { + public EOperation getDimension__NonNegativeWidth__DiagnosticChain_Map() { return dimensionEClass.getEOperations().get(0); } @@ -256,6 +243,15 @@ public class DCPackageImpl extends EPackageImpl implements DCPackage { * * @generated */ + public EOperation getDimension__NonNegativeHeight__DiagnosticChain_Map() { + return dimensionEClass.getEOperations().get(1); + } + + /** + * <!-- begin-user-doc --> <!-- end-user-doc --> + * + * @generated + */ public EClass getBounds() { return boundsEClass; } @@ -301,7 +297,7 @@ public class DCPackageImpl extends EPackageImpl implements DCPackage { * * @generated */ - public EOperation getBounds__NonNegativeSize__DiagnosticChain_Map() { + public EOperation getBounds__NonNegativeWidth__DiagnosticChain_Map() { return boundsEClass.getEOperations().get(0); } @@ -310,8 +306,8 @@ public class DCPackageImpl extends EPackageImpl implements DCPackage { * * @generated */ - public EEnum getKnownColor() { - return knownColorEEnum; + public EOperation getBounds__NonNegativeHeight__DiagnosticChain_Map() { + return boundsEClass.getEOperations().get(1); } /** @@ -319,8 +315,8 @@ public class DCPackageImpl extends EPackageImpl implements DCPackage { * * @generated */ - public EEnum getAlignmentKind() { - return alignmentKindEEnum; + public EEnum getKnownColor() { + return knownColorEEnum; } /** @@ -405,7 +401,9 @@ public class DCPackageImpl extends EPackageImpl implements DCPackage { createEAttribute(dimensionEClass, DIMENSION__WIDTH); createEAttribute(dimensionEClass, DIMENSION__HEIGHT); createEOperation(dimensionEClass, - DIMENSION___NON_NEGATIVE_DIMENSION__DIAGNOSTICCHAIN_MAP); + DIMENSION___NON_NEGATIVE_WIDTH__DIAGNOSTICCHAIN_MAP); + createEOperation(dimensionEClass, + DIMENSION___NON_NEGATIVE_HEIGHT__DIAGNOSTICCHAIN_MAP); boundsEClass = createEClass(BOUNDS); createEAttribute(boundsEClass, BOUNDS__X); @@ -413,11 +411,12 @@ public class DCPackageImpl extends EPackageImpl implements DCPackage { createEAttribute(boundsEClass, BOUNDS__WIDTH); createEAttribute(boundsEClass, BOUNDS__HEIGHT); createEOperation(boundsEClass, - BOUNDS___NON_NEGATIVE_SIZE__DIAGNOSTICCHAIN_MAP); + BOUNDS___NON_NEGATIVE_WIDTH__DIAGNOSTICCHAIN_MAP); + createEOperation(boundsEClass, + BOUNDS___NON_NEGATIVE_HEIGHT__DIAGNOSTICCHAIN_MAP); // Create enums knownColorEEnum = createEEnum(KNOWN_COLOR); - alignmentKindEEnum = createEEnum(ALIGNMENT_KIND); // Create data types booleanEDataType = createEDataType(BOOLEAN); @@ -460,26 +459,25 @@ public class DCPackageImpl extends EPackageImpl implements DCPackage { // Initialize classes, features, and operations; add parameters initEClass(pointEClass, Point.class, "Point", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); - initEAttribute(getPoint_X(), this.getReal(), "x", "0", 1, 1, + initEAttribute(getPoint_X(), this.getReal(), "x", "0", 0, 1, Point.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, - !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, !IS_ORDERED); - initEAttribute(getPoint_Y(), this.getReal(), "y", "0", 1, 1, + IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, !IS_ORDERED); + initEAttribute(getPoint_Y(), this.getReal(), "y", "0", 0, 1, Point.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, - !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, !IS_ORDERED); + IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, !IS_ORDERED); initEClass(dimensionEClass, Dimension.class, "Dimension", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); - initEAttribute(getDimension_Width(), this.getReal(), "width", null, 1, + initEAttribute(getDimension_Width(), this.getReal(), "width", "0", 0, + 1, Dimension.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, + IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, !IS_ORDERED); + initEAttribute(getDimension_Height(), this.getReal(), "height", "0", 0, 1, Dimension.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, - !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, !IS_ORDERED); - initEAttribute(getDimension_Height(), this.getReal(), "height", null, - 1, 1, Dimension.class, !IS_TRANSIENT, !IS_VOLATILE, - IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, - !IS_ORDERED); + IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, !IS_ORDERED); EOperation op = initEOperation( - getDimension__NonNegativeDimension__DiagnosticChain_Map(), - ecorePackage.getEBoolean(), "nonNegativeDimension", 0, 1, + getDimension__NonNegativeWidth__DiagnosticChain_Map(), + ecorePackage.getEBoolean(), "nonNegativeWidth", 0, 1, IS_UNIQUE, IS_ORDERED); addEParameter(op, ecorePackage.getEDiagnosticChain(), "diagnostics", 0, 1, IS_UNIQUE, IS_ORDERED); @@ -490,24 +488,50 @@ public class DCPackageImpl extends EPackageImpl implements DCPackage { g1.getETypeArguments().add(g2); addEParameter(op, g1, "context", 0, 1, IS_UNIQUE, IS_ORDERED); + op = initEOperation( + getDimension__NonNegativeHeight__DiagnosticChain_Map(), + ecorePackage.getEBoolean(), "nonNegativeHeight", 0, 1, + IS_UNIQUE, IS_ORDERED); + addEParameter(op, ecorePackage.getEDiagnosticChain(), "diagnostics", 0, + 1, IS_UNIQUE, IS_ORDERED); + g1 = createEGenericType(ecorePackage.getEMap()); + g2 = createEGenericType(ecorePackage.getEJavaObject()); + g1.getETypeArguments().add(g2); + g2 = createEGenericType(ecorePackage.getEJavaObject()); + g1.getETypeArguments().add(g2); + addEParameter(op, g1, "context", 0, 1, IS_UNIQUE, IS_ORDERED); + initEClass(boundsEClass, Bounds.class, "Bounds", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); - initEAttribute(getBounds_X(), this.getReal(), "x", "0", 1, 1, + initEAttribute(getBounds_X(), this.getReal(), "x", "0", 0, 1, + Bounds.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, + IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, !IS_ORDERED); + initEAttribute(getBounds_Y(), this.getReal(), "y", "0", 0, 1, Bounds.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, - !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, !IS_ORDERED); - initEAttribute(getBounds_Y(), this.getReal(), "y", "0", 1, 1, + IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, !IS_ORDERED); + initEAttribute(getBounds_Width(), this.getReal(), "width", "0", 0, 1, Bounds.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, - !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, !IS_ORDERED); - initEAttribute(getBounds_Width(), this.getReal(), "width", null, 1, 1, + IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, !IS_ORDERED); + initEAttribute(getBounds_Height(), this.getReal(), "height", "0", 0, 1, Bounds.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, - !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, !IS_ORDERED); - initEAttribute(getBounds_Height(), this.getReal(), "height", null, 1, - 1, Bounds.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, - !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, !IS_ORDERED); - - op = initEOperation(getBounds__NonNegativeSize__DiagnosticChain_Map(), - ecorePackage.getEBoolean(), "nonNegativeSize", 0, 1, IS_UNIQUE, - IS_ORDERED); + IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, !IS_ORDERED); + + op = initEOperation(getBounds__NonNegativeWidth__DiagnosticChain_Map(), + ecorePackage.getEBoolean(), "nonNegativeWidth", 0, 1, + IS_UNIQUE, IS_ORDERED); + addEParameter(op, ecorePackage.getEDiagnosticChain(), "diagnostics", 0, + 1, IS_UNIQUE, IS_ORDERED); + g1 = createEGenericType(ecorePackage.getEMap()); + g2 = createEGenericType(ecorePackage.getEJavaObject()); + g1.getETypeArguments().add(g2); + g2 = createEGenericType(ecorePackage.getEJavaObject()); + g1.getETypeArguments().add(g2); + addEParameter(op, g1, "context", 0, 1, IS_UNIQUE, IS_ORDERED); + + op = initEOperation( + getBounds__NonNegativeHeight__DiagnosticChain_Map(), + ecorePackage.getEBoolean(), "nonNegativeHeight", 0, 1, + IS_UNIQUE, IS_ORDERED); addEParameter(op, ecorePackage.getEDiagnosticChain(), "diagnostics", 0, 1, IS_UNIQUE, IS_ORDERED); g1 = createEGenericType(ecorePackage.getEMap()); @@ -537,11 +561,6 @@ public class DCPackageImpl extends EPackageImpl implements DCPackage { addEEnumLiteral(knownColorEEnum, KnownColor.SILVER); addEEnumLiteral(knownColorEEnum, KnownColor.GRAY); - initEEnum(alignmentKindEEnum, AlignmentKind.class, "AlignmentKind"); - addEEnumLiteral(alignmentKindEEnum, AlignmentKind.START); - addEEnumLiteral(alignmentKindEEnum, AlignmentKind.END); - addEEnumLiteral(alignmentKindEEnum, AlignmentKind.CENTER); - // Initialize data types initEDataType(booleanEDataType, boolean.class, "Boolean", IS_SERIALIZABLE, !IS_GENERATED_INSTANCE_CLASS); @@ -586,11 +605,14 @@ public class DCPackageImpl extends EPackageImpl implements DCPackage { */ protected void createOCLAnnotations() { String source = "http://www.eclipse.org/emf/2002/Ecore/OCL"; - addAnnotation( - getDimension__NonNegativeDimension__DiagnosticChain_Map(), - source, new String[] { "body", "width >= 0 and height >=0" }); - addAnnotation(getBounds__NonNegativeSize__DiagnosticChain_Map(), - source, new String[] { "body", "width >= 0 and height >=0" }); + addAnnotation(getDimension__NonNegativeWidth__DiagnosticChain_Map(), + source, new String[] { "body", "width >=0" }); + addAnnotation(getDimension__NonNegativeHeight__DiagnosticChain_Map(), + source, new String[] { "body", "height >=0" }); + addAnnotation(getBounds__NonNegativeWidth__DiagnosticChain_Map(), + source, new String[] { "body", "width >= 0" }); + addAnnotation(getBounds__NonNegativeHeight__DiagnosticChain_Map(), + source, new String[] { "body", "height >=0" }); } } // DCPackageImpl diff --git a/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dc/impl/DimensionImpl.java b/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dc/impl/DimensionImpl.java index 2fc03c792a5..4dd581619b6 100644 --- a/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dc/impl/DimensionImpl.java +++ b/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dc/impl/DimensionImpl.java @@ -70,6 +70,15 @@ public class DimensionImpl extends MinimalEObjectImpl.Container implements protected double width = WIDTH_EDEFAULT; /** + * This is true if the Width attribute has been set. <!-- begin-user-doc --> + * <!-- end-user-doc --> + * + * @generated + * @ordered + */ + protected boolean widthESet; + + /** * The default value of the '{@link #getHeight() <em>Height</em>}' * attribute. <!-- begin-user-doc --> <!-- end-user-doc --> * @@ -90,6 +99,15 @@ public class DimensionImpl extends MinimalEObjectImpl.Container implements protected double height = HEIGHT_EDEFAULT; /** + * This is true if the Height attribute has been set. <!-- begin-user-doc + * --> <!-- end-user-doc --> + * + * @generated + * @ordered + */ + protected boolean heightESet; + + /** * <!-- begin-user-doc --> <!-- end-user-doc --> * * @generated @@ -125,9 +143,36 @@ public class DimensionImpl extends MinimalEObjectImpl.Container implements public void setWidth(double newWidth) { double oldWidth = width; width = newWidth; + boolean oldWidthESet = widthESet; + widthESet = true; if (eNotificationRequired()) eNotify(new ENotificationImpl(this, Notification.SET, - DCPackage.DIMENSION__WIDTH, oldWidth, width)); + DCPackage.DIMENSION__WIDTH, oldWidth, width, !oldWidthESet)); + } + + /** + * <!-- begin-user-doc --> <!-- end-user-doc --> + * + * @generated + */ + public void unsetWidth() { + double oldWidth = width; + boolean oldWidthESet = widthESet; + width = WIDTH_EDEFAULT; + widthESet = false; + if (eNotificationRequired()) + eNotify(new ENotificationImpl(this, Notification.UNSET, + DCPackage.DIMENSION__WIDTH, oldWidth, WIDTH_EDEFAULT, + oldWidthESet)); + } + + /** + * <!-- begin-user-doc --> <!-- end-user-doc --> + * + * @generated + */ + public boolean isSetWidth() { + return widthESet; } /** @@ -147,30 +192,91 @@ public class DimensionImpl extends MinimalEObjectImpl.Container implements public void setHeight(double newHeight) { double oldHeight = height; height = newHeight; + boolean oldHeightESet = heightESet; + heightESet = true; if (eNotificationRequired()) eNotify(new ENotificationImpl(this, Notification.SET, - DCPackage.DIMENSION__HEIGHT, oldHeight, height)); + DCPackage.DIMENSION__HEIGHT, oldHeight, height, + !oldHeightESet)); + } + + /** + * <!-- begin-user-doc --> <!-- end-user-doc --> + * + * @generated + */ + public void unsetHeight() { + double oldHeight = height; + boolean oldHeightESet = heightESet; + height = HEIGHT_EDEFAULT; + heightESet = false; + if (eNotificationRequired()) + eNotify(new ENotificationImpl(this, Notification.UNSET, + DCPackage.DIMENSION__HEIGHT, oldHeight, HEIGHT_EDEFAULT, + oldHeightESet)); + } + + /** + * <!-- begin-user-doc --> <!-- end-user-doc --> + * + * @generated + */ + public boolean isSetHeight() { + return heightESet; + } + + /** + * The cached validation expression for the ' + * {@link #nonNegativeWidth(org.eclipse.emf.common.util.DiagnosticChain, java.util.Map) + * <em>Non Negative Width</em>}' invariant operation. <!-- begin-user-doc + * --> <!-- end-user-doc --> + * + * @see #nonNegativeWidth(org.eclipse.emf.common.util.DiagnosticChain, + * java.util.Map) + * @generated + * @ordered + */ + protected static final String NON_NEGATIVE_WIDTH_DIAGNOSTIC_CHAIN_MAP__EEXPRESSION = "width >=0"; + + /** + * <!-- begin-user-doc --> <!-- end-user-doc --> + * + * @generated + */ + public boolean nonNegativeWidth(DiagnosticChain diagnostics, + Map<Object, Object> context) { + return DCValidator + .validate( + DCPackage.Literals.DIMENSION, + this, + diagnostics, + context, + "http://www.eclipse.org/emf/2002/Ecore/OCL", + DCPackage.Literals.DIMENSION___NON_NEGATIVE_WIDTH__DIAGNOSTICCHAIN_MAP, + NON_NEGATIVE_WIDTH_DIAGNOSTIC_CHAIN_MAP__EEXPRESSION, + Diagnostic.ERROR, DCValidator.DIAGNOSTIC_SOURCE, + DCValidator.DIMENSION__NON_NEGATIVE_WIDTH); } /** * The cached validation expression for the ' - * {@link #nonNegativeDimension(org.eclipse.emf.common.util.DiagnosticChain, java.util.Map) - * <em>Non Negative Dimension</em>}' invariant operation. <!-- - * begin-user-doc --> <!-- end-user-doc --> + * {@link #nonNegativeHeight(org.eclipse.emf.common.util.DiagnosticChain, java.util.Map) + * <em>Non Negative Height</em>}' invariant operation. <!-- begin-user-doc + * --> <!-- end-user-doc --> * - * @see #nonNegativeDimension(org.eclipse.emf.common.util.DiagnosticChain, + * @see #nonNegativeHeight(org.eclipse.emf.common.util.DiagnosticChain, * java.util.Map) * @generated * @ordered */ - protected static final String NON_NEGATIVE_DIMENSION_DIAGNOSTIC_CHAIN_MAP__EEXPRESSION = "width >= 0 and height >=0"; + protected static final String NON_NEGATIVE_HEIGHT_DIAGNOSTIC_CHAIN_MAP__EEXPRESSION = "height >=0"; /** * <!-- begin-user-doc --> <!-- end-user-doc --> * * @generated */ - public boolean nonNegativeDimension(DiagnosticChain diagnostics, + public boolean nonNegativeHeight(DiagnosticChain diagnostics, Map<Object, Object> context) { return DCValidator .validate( @@ -179,10 +285,10 @@ public class DimensionImpl extends MinimalEObjectImpl.Container implements diagnostics, context, "http://www.eclipse.org/emf/2002/Ecore/OCL", - DCPackage.Literals.DIMENSION___NON_NEGATIVE_DIMENSION__DIAGNOSTICCHAIN_MAP, - NON_NEGATIVE_DIMENSION_DIAGNOSTIC_CHAIN_MAP__EEXPRESSION, + DCPackage.Literals.DIMENSION___NON_NEGATIVE_HEIGHT__DIAGNOSTICCHAIN_MAP, + NON_NEGATIVE_HEIGHT_DIAGNOSTIC_CHAIN_MAP__EEXPRESSION, Diagnostic.ERROR, DCValidator.DIAGNOSTIC_SOURCE, - DCValidator.DIMENSION__NON_NEGATIVE_DIMENSION); + DCValidator.DIMENSION__NON_NEGATIVE_HEIGHT); } /** @@ -228,10 +334,10 @@ public class DimensionImpl extends MinimalEObjectImpl.Container implements public void eUnset(int featureID) { switch (featureID) { case DCPackage.DIMENSION__WIDTH: - setWidth(WIDTH_EDEFAULT); + unsetWidth(); return; case DCPackage.DIMENSION__HEIGHT: - setHeight(HEIGHT_EDEFAULT); + unsetHeight(); return; } super.eUnset(featureID); @@ -246,9 +352,9 @@ public class DimensionImpl extends MinimalEObjectImpl.Container implements public boolean eIsSet(int featureID) { switch (featureID) { case DCPackage.DIMENSION__WIDTH: - return width != WIDTH_EDEFAULT; + return isSetWidth(); case DCPackage.DIMENSION__HEIGHT: - return height != HEIGHT_EDEFAULT; + return isSetHeight(); } return super.eIsSet(featureID); } @@ -263,8 +369,11 @@ public class DimensionImpl extends MinimalEObjectImpl.Container implements public Object eInvoke(int operationID, EList<?> arguments) throws InvocationTargetException { switch (operationID) { - case DCPackage.DIMENSION___NON_NEGATIVE_DIMENSION__DIAGNOSTICCHAIN_MAP: - return nonNegativeDimension((DiagnosticChain) arguments.get(0), + case DCPackage.DIMENSION___NON_NEGATIVE_WIDTH__DIAGNOSTICCHAIN_MAP: + return nonNegativeWidth((DiagnosticChain) arguments.get(0), + (Map<Object, Object>) arguments.get(1)); + case DCPackage.DIMENSION___NON_NEGATIVE_HEIGHT__DIAGNOSTICCHAIN_MAP: + return nonNegativeHeight((DiagnosticChain) arguments.get(0), (Map<Object, Object>) arguments.get(1)); } return super.eInvoke(operationID, arguments); @@ -282,9 +391,15 @@ public class DimensionImpl extends MinimalEObjectImpl.Container implements StringBuffer result = new StringBuffer(super.toString()); result.append(" (width: "); - result.append(width); + if (widthESet) + result.append(width); + else + result.append("<unset>"); result.append(", height: "); - result.append(height); + if (heightESet) + result.append(height); + else + result.append("<unset>"); result.append(')'); return result.toString(); } diff --git a/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dc/impl/PointImpl.java b/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dc/impl/PointImpl.java index e902c1e3ff3..489fb62de81 100644 --- a/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dc/impl/PointImpl.java +++ b/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dc/impl/PointImpl.java @@ -57,6 +57,15 @@ public class PointImpl extends MinimalEObjectImpl.Container implements Point { protected double x = X_EDEFAULT; /** + * This is true if the X attribute has been set. <!-- begin-user-doc --> + * <!-- end-user-doc --> + * + * @generated + * @ordered + */ + protected boolean xESet; + + /** * The default value of the '{@link #getY() <em>Y</em>}' attribute. <!-- * begin-user-doc --> <!-- end-user-doc --> * @@ -77,6 +86,15 @@ public class PointImpl extends MinimalEObjectImpl.Container implements Point { protected double y = Y_EDEFAULT; /** + * This is true if the Y attribute has been set. <!-- begin-user-doc --> + * <!-- end-user-doc --> + * + * @generated + * @ordered + */ + protected boolean yESet; + + /** * <!-- begin-user-doc --> <!-- end-user-doc --> * * @generated @@ -112,9 +130,35 @@ public class PointImpl extends MinimalEObjectImpl.Container implements Point { public void setX(double newX) { double oldX = x; x = newX; + boolean oldXESet = xESet; + xESet = true; if (eNotificationRequired()) eNotify(new ENotificationImpl(this, Notification.SET, - DCPackage.POINT__X, oldX, x)); + DCPackage.POINT__X, oldX, x, !oldXESet)); + } + + /** + * <!-- begin-user-doc --> <!-- end-user-doc --> + * + * @generated + */ + public void unsetX() { + double oldX = x; + boolean oldXESet = xESet; + x = X_EDEFAULT; + xESet = false; + if (eNotificationRequired()) + eNotify(new ENotificationImpl(this, Notification.UNSET, + DCPackage.POINT__X, oldX, X_EDEFAULT, oldXESet)); + } + + /** + * <!-- begin-user-doc --> <!-- end-user-doc --> + * + * @generated + */ + public boolean isSetX() { + return xESet; } /** @@ -134,9 +178,35 @@ public class PointImpl extends MinimalEObjectImpl.Container implements Point { public void setY(double newY) { double oldY = y; y = newY; + boolean oldYESet = yESet; + yESet = true; if (eNotificationRequired()) eNotify(new ENotificationImpl(this, Notification.SET, - DCPackage.POINT__Y, oldY, y)); + DCPackage.POINT__Y, oldY, y, !oldYESet)); + } + + /** + * <!-- begin-user-doc --> <!-- end-user-doc --> + * + * @generated + */ + public void unsetY() { + double oldY = y; + boolean oldYESet = yESet; + y = Y_EDEFAULT; + yESet = false; + if (eNotificationRequired()) + eNotify(new ENotificationImpl(this, Notification.UNSET, + DCPackage.POINT__Y, oldY, Y_EDEFAULT, oldYESet)); + } + + /** + * <!-- begin-user-doc --> <!-- end-user-doc --> + * + * @generated + */ + public boolean isSetY() { + return yESet; } /** @@ -182,10 +252,10 @@ public class PointImpl extends MinimalEObjectImpl.Container implements Point { public void eUnset(int featureID) { switch (featureID) { case DCPackage.POINT__X: - setX(X_EDEFAULT); + unsetX(); return; case DCPackage.POINT__Y: - setY(Y_EDEFAULT); + unsetY(); return; } super.eUnset(featureID); @@ -200,9 +270,9 @@ public class PointImpl extends MinimalEObjectImpl.Container implements Point { public boolean eIsSet(int featureID) { switch (featureID) { case DCPackage.POINT__X: - return x != X_EDEFAULT; + return isSetX(); case DCPackage.POINT__Y: - return y != Y_EDEFAULT; + return isSetY(); } return super.eIsSet(featureID); } @@ -219,9 +289,15 @@ public class PointImpl extends MinimalEObjectImpl.Container implements Point { StringBuffer result = new StringBuffer(super.toString()); result.append(" (x: "); - result.append(x); + if (xESet) + result.append(x); + else + result.append("<unset>"); result.append(", y: "); - result.append(y); + if (yESet) + result.append(y); + else + result.append("<unset>"); result.append(')'); return result.toString(); } diff --git a/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dc/util/DCAdapterFactory.java b/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dc/util/DCAdapterFactory.java index 5678bb454a3..b225359f91c 100644 --- a/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dc/util/DCAdapterFactory.java +++ b/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dc/util/DCAdapterFactory.java @@ -76,7 +76,6 @@ public class DCAdapterFactory extends AdapterFactoryImpl { * @generated */ protected DCSwitch<Adapter> modelSwitch = new DCSwitch<Adapter>() { - @Override public Adapter casePoint(Point object) { return createPointAdapter(); diff --git a/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dc/util/DCValidator.java b/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dc/util/DCValidator.java index ab42f6e1395..2a3ccfc2a6f 100644 --- a/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dc/util/DCValidator.java +++ b/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dc/util/DCValidator.java @@ -57,21 +57,39 @@ public class DCValidator extends EObjectValidator { /** * The {@link org.eclipse.emf.common.util.Diagnostic#getCode() code} for - * constraint 'Non Negative Dimension' of 'Dimension'. <!-- begin-user-doc - * --> <!-- end-user-doc --> + * constraint 'Non Negative Width' of 'Dimension'. <!-- begin-user-doc --> + * <!-- end-user-doc --> + * + * @generated + */ + public static final int DIMENSION__NON_NEGATIVE_WIDTH = 1; + + /** + * The {@link org.eclipse.emf.common.util.Diagnostic#getCode() code} for + * constraint 'Non Negative Height' of 'Dimension'. <!-- begin-user-doc --> + * <!-- end-user-doc --> * * @generated */ - public static final int DIMENSION__NON_NEGATIVE_DIMENSION = 1; + public static final int DIMENSION__NON_NEGATIVE_HEIGHT = 2; /** * The {@link org.eclipse.emf.common.util.Diagnostic#getCode() code} for - * constraint 'Non Negative Size' of 'Bounds'. <!-- begin-user-doc --> <!-- + * constraint 'Non Negative Width' of 'Bounds'. <!-- begin-user-doc --> <!-- * end-user-doc --> * * @generated */ - public static final int BOUNDS__NON_NEGATIVE_SIZE = 2; + public static final int BOUNDS__NON_NEGATIVE_WIDTH = 3; + + /** + * The {@link org.eclipse.emf.common.util.Diagnostic#getCode() code} for + * constraint 'Non Negative Height' of 'Bounds'. <!-- begin-user-doc --> + * <!-- end-user-doc --> + * + * @generated + */ + public static final int BOUNDS__NON_NEGATIVE_HEIGHT = 4; /** * A constant with a fixed name that can be used as the base value for @@ -80,7 +98,7 @@ public class DCValidator extends EObjectValidator { * * @generated */ - private static final int GENERATED_DIAGNOSTIC_CODE_COUNT = 2; + private static final int GENERATED_DIAGNOSTIC_CODE_COUNT = 4; /** * A constant with a fixed name that can be used as the base value for @@ -145,9 +163,6 @@ public class DCValidator extends EObjectValidator { return validateBounds((Bounds) value, diagnostics, context); case DCPackage.KNOWN_COLOR: return validateKnownColor((KnownColor) value, diagnostics, context); - case DCPackage.ALIGNMENT_KIND: - return validateAlignmentKind((AlignmentKind) value, diagnostics, - context); case DCPackage.BOOLEAN: return validateBoolean((Boolean) value, diagnostics, context); case DCPackage.INTEGER: @@ -204,20 +219,34 @@ public class DCValidator extends EObjectValidator { result &= validate_EveryMapEntryUnique(dimension, diagnostics, context); if (result || diagnostics != null) - result &= validateDimension_nonNegativeDimension(dimension, + result &= validateDimension_nonNegativeWidth(dimension, + diagnostics, context); + if (result || diagnostics != null) + result &= validateDimension_nonNegativeHeight(dimension, diagnostics, context); return result; } /** - * Validates the nonNegativeDimension constraint of '<em>Dimension</em>'. - * <!-- begin-user-doc --> <!-- end-user-doc --> + * Validates the nonNegativeWidth constraint of '<em>Dimension</em>'. <!-- + * begin-user-doc --> <!-- end-user-doc --> + * + * @generated + */ + public boolean validateDimension_nonNegativeWidth(Dimension dimension, + DiagnosticChain diagnostics, Map<Object, Object> context) { + return dimension.nonNegativeWidth(diagnostics, context); + } + + /** + * Validates the nonNegativeHeight constraint of '<em>Dimension</em>'. <!-- + * begin-user-doc --> <!-- end-user-doc --> * * @generated */ - public boolean validateDimension_nonNegativeDimension(Dimension dimension, + public boolean validateDimension_nonNegativeHeight(Dimension dimension, DiagnosticChain diagnostics, Map<Object, Object> context) { - return dimension.nonNegativeDimension(diagnostics, context); + return dimension.nonNegativeHeight(diagnostics, context); } /** @@ -249,30 +278,34 @@ public class DCValidator extends EObjectValidator { if (result || diagnostics != null) result &= validate_EveryMapEntryUnique(bounds, diagnostics, context); if (result || diagnostics != null) - result &= validateBounds_nonNegativeSize(bounds, diagnostics, + result &= validateBounds_nonNegativeWidth(bounds, diagnostics, + context); + if (result || diagnostics != null) + result &= validateBounds_nonNegativeHeight(bounds, diagnostics, context); return result; } /** - * Validates the nonNegativeSize constraint of '<em>Bounds</em>'. <!-- + * Validates the nonNegativeWidth constraint of '<em>Bounds</em>'. <!-- * begin-user-doc --> <!-- end-user-doc --> * * @generated */ - public boolean validateBounds_nonNegativeSize(Bounds bounds, + public boolean validateBounds_nonNegativeWidth(Bounds bounds, DiagnosticChain diagnostics, Map<Object, Object> context) { - return bounds.nonNegativeSize(diagnostics, context); + return bounds.nonNegativeWidth(diagnostics, context); } /** - * <!-- begin-user-doc --> <!-- end-user-doc --> + * Validates the nonNegativeHeight constraint of '<em>Bounds</em>'. <!-- + * begin-user-doc --> <!-- end-user-doc --> * * @generated */ - public boolean validateKnownColor(KnownColor knownColor, + public boolean validateBounds_nonNegativeHeight(Bounds bounds, DiagnosticChain diagnostics, Map<Object, Object> context) { - return true; + return bounds.nonNegativeHeight(diagnostics, context); } /** @@ -280,7 +313,7 @@ public class DCValidator extends EObjectValidator { * * @generated */ - public boolean validateAlignmentKind(AlignmentKind alignmentKind, + public boolean validateKnownColor(KnownColor knownColor, DiagnosticChain diagnostics, Map<Object, Object> context) { return true; } diff --git a/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/Canvas.java b/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/Canvas.java index 55c63ad0a74..d5f092d0227 100644 --- a/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/Canvas.java +++ b/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/Canvas.java @@ -11,6 +11,8 @@ */ package org.eclipse.papyrus.dd.dg; +import java.util.Map; +import org.eclipse.emf.common.util.DiagnosticChain; import org.eclipse.papyrus.dd.dc.Bounds; /** @@ -41,7 +43,7 @@ public interface Canvas extends Group { * @return the value of the '<em>Bounds</em>' containment reference. * @see #setBounds(Bounds) * @see org.eclipse.papyrus.dd.dg.DGPackage#getCanvas_Bounds() - * @model containment="true" required="true" ordered="false" + * @model containment="true" ordered="false" * @generated */ Bounds getBounds(); @@ -58,4 +60,19 @@ public interface Canvas extends Group { */ void setBounds(Bounds value); + /** + * <!-- begin-user-doc --> <!-- end-user-doc --> <!-- begin-model-doc --> + * + * @param diagnostics + * The chain of diagnostics to which problems are to be appended. + * @param context + * The cache of context-specific information. <!-- end-model-doc + * --> + * @model annotation= + * "http://www.eclipse.org/emf/2002/Ecore/OCL body='transform->isEmpty()'" + * @generated + */ + boolean canvasCannotHaveTransforms(DiagnosticChain diagnostics, + Map<Object, Object> context); + } // Canvas diff --git a/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/Circle.java b/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/Circle.java index a48af9d97a4..1e3ad034632 100644 --- a/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/Circle.java +++ b/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/Circle.java @@ -64,16 +64,16 @@ public interface Circle extends GraphicalElement { void setCenter(Point value); /** - * Returns the value of the '<em><b>Radius</b></em>' attribute. <!-- - * begin-user-doc --> <!-- end-user-doc --> <!-- begin-model-doc --> a real - * number (>=0) that represents the radius of the circle. <!-- end-model-doc - * --> + * Returns the value of the '<em><b>Radius</b></em>' attribute. The default + * value is <code>"0"</code>. <!-- begin-user-doc --> <!-- end-user-doc --> + * <!-- begin-model-doc --> a real number (>=0) that represents the radius + * of the circle. <!-- end-model-doc --> * * @return the value of the '<em>Radius</em>' attribute. * @see #setRadius(double) * @see org.eclipse.papyrus.dd.dg.DGPackage#getCircle_Radius() - * @model dataType="org.eclipse.papyrus.dd.dc.Real" required="true" - * ordered="false" + * @model default="0" dataType="org.eclipse.papyrus.dd.dc.Real" + * required="true" ordered="false" * @generated */ double getRadius(); @@ -92,7 +92,7 @@ public interface Circle extends GraphicalElement { /** * <!-- begin-user-doc --> <!-- end-user-doc --> <!-- begin-model-doc --> - * the radius cannot be negative + * The radius of a circle cannot be negative * * @param diagnostics * The chain of diagnostics to which problems are to be appended. diff --git a/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/CubicCurveTo.java b/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/CubicCurveTo.java index cad76fb9705..c995ff4d354 100644 --- a/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/CubicCurveTo.java +++ b/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/CubicCurveTo.java @@ -30,11 +30,11 @@ import org.eclipse.papyrus.dd.dc.Point; * <p> * The following features are supported: * <ul> - * <li>{@link org.eclipse.papyrus.dd.dg.CubicCurveTo#getPoint <em>Point</em>}</li> * <li>{@link org.eclipse.papyrus.dd.dg.CubicCurveTo#getStartControl <em>Start * Control</em>}</li> * <li>{@link org.eclipse.papyrus.dd.dg.CubicCurveTo#getEndControl <em>End * Control</em>}</li> + * <li>{@link org.eclipse.papyrus.dd.dg.CubicCurveTo#getPoint <em>Point</em>}</li> * </ul> * </p> * diff --git a/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/DGFactory.java b/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/DGFactory.java index 63fb694ffa8..6726c1dc661 100644 --- a/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/DGFactory.java +++ b/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/DGFactory.java @@ -156,13 +156,13 @@ public interface DGFactory extends EFactory { Ellipse createEllipse(); /** - * Returns a new object of class '<em>Elliptical Curve To</em>'. <!-- + * Returns a new object of class '<em>Elliptical Arc To</em>'. <!-- * begin-user-doc --> <!-- end-user-doc --> * - * @return a new object of class '<em>Elliptical Curve To</em>'. + * @return a new object of class '<em>Elliptical Arc To</em>'. * @generated */ - EllipticalCurveTo createEllipticalCurveTo(); + EllipticalArcTo createEllipticalArcTo(); /** * Returns a new object of class '<em>Quadratic Curve To</em>'. <!-- diff --git a/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/DGPackage.java b/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/DGPackage.java index 078667a8d9a..b02830381e0 100644 --- a/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/DGPackage.java +++ b/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/DGPackage.java @@ -101,13 +101,22 @@ public interface DGPackage extends EPackage { int DEFINITION_FEATURE_COUNT = 1; /** + * The operation id for the '<em>Id Cannot Be Empty</em>' operation. <!-- + * begin-user-doc --> <!-- end-user-doc --> + * + * @generated + * @ordered + */ + int DEFINITION___ID_CANNOT_BE_EMPTY__DIAGNOSTICCHAIN_MAP = 0; + + /** * The number of operations of the '<em>Definition</em>' class. <!-- * begin-user-doc --> <!-- end-user-doc --> * * @generated * @ordered */ - int DEFINITION_OPERATION_COUNT = 0; + int DEFINITION_OPERATION_COUNT = 1; /** * The meta object id for the ' @@ -149,13 +158,13 @@ public interface DGPackage extends EPackage { int GRAPHICAL_ELEMENT__GROUP = DEFINITION_FEATURE_COUNT + 1; /** - * The feature id for the '<em><b>Keyword</b></em>' attribute list. <!-- + * The feature id for the '<em><b>Class</b></em>' attribute list. <!-- * begin-user-doc --> <!-- end-user-doc --> * * @generated * @ordered */ - int GRAPHICAL_ELEMENT__KEYWORD = DEFINITION_FEATURE_COUNT + 2; + int GRAPHICAL_ELEMENT__CLASS = DEFINITION_FEATURE_COUNT + 2; /** * The feature id for the '<em><b>Style</b></em>' containment reference. @@ -185,13 +194,31 @@ public interface DGPackage extends EPackage { int GRAPHICAL_ELEMENT_FEATURE_COUNT = DEFINITION_FEATURE_COUNT + 5; /** + * The operation id for the '<em>Id Cannot Be Empty</em>' operation. <!-- + * begin-user-doc --> <!-- end-user-doc --> + * + * @generated + * @ordered + */ + int GRAPHICAL_ELEMENT___ID_CANNOT_BE_EMPTY__DIAGNOSTICCHAIN_MAP = DEFINITION___ID_CANNOT_BE_EMPTY__DIAGNOSTICCHAIN_MAP; + + /** + * The operation id for the '<em>Referenced Clippath Has Id</em>' operation. + * <!-- begin-user-doc --> <!-- end-user-doc --> + * + * @generated + * @ordered + */ + int GRAPHICAL_ELEMENT___REFERENCED_CLIPPATH_HAS_ID__DIAGNOSTICCHAIN_MAP = DEFINITION_OPERATION_COUNT + 0; + + /** * The number of operations of the '<em>Graphical Element</em>' class. <!-- * begin-user-doc --> <!-- end-user-doc --> * * @generated * @ordered */ - int GRAPHICAL_ELEMENT_OPERATION_COUNT = DEFINITION_OPERATION_COUNT + 0; + int GRAPHICAL_ELEMENT_OPERATION_COUNT = DEFINITION_OPERATION_COUNT + 1; /** * The meta object id for the ' @@ -232,13 +259,13 @@ public interface DGPackage extends EPackage { int GROUP__GROUP = GRAPHICAL_ELEMENT__GROUP; /** - * The feature id for the '<em><b>Keyword</b></em>' attribute list. <!-- + * The feature id for the '<em><b>Class</b></em>' attribute list. <!-- * begin-user-doc --> <!-- end-user-doc --> * * @generated * @ordered */ - int GROUP__KEYWORD = GRAPHICAL_ELEMENT__KEYWORD; + int GROUP__CLASS = GRAPHICAL_ELEMENT__CLASS; /** * The feature id for the '<em><b>Style</b></em>' containment reference. @@ -277,6 +304,24 @@ public interface DGPackage extends EPackage { int GROUP_FEATURE_COUNT = GRAPHICAL_ELEMENT_FEATURE_COUNT + 1; /** + * The operation id for the '<em>Id Cannot Be Empty</em>' operation. <!-- + * begin-user-doc --> <!-- end-user-doc --> + * + * @generated + * @ordered + */ + int GROUP___ID_CANNOT_BE_EMPTY__DIAGNOSTICCHAIN_MAP = GRAPHICAL_ELEMENT___ID_CANNOT_BE_EMPTY__DIAGNOSTICCHAIN_MAP; + + /** + * The operation id for the '<em>Referenced Clippath Has Id</em>' operation. + * <!-- begin-user-doc --> <!-- end-user-doc --> + * + * @generated + * @ordered + */ + int GROUP___REFERENCED_CLIPPATH_HAS_ID__DIAGNOSTICCHAIN_MAP = GRAPHICAL_ELEMENT___REFERENCED_CLIPPATH_HAS_ID__DIAGNOSTICCHAIN_MAP; + + /** * The number of operations of the '<em>Group</em>' class. <!-- * begin-user-doc --> <!-- end-user-doc --> * @@ -324,13 +369,13 @@ public interface DGPackage extends EPackage { int CANVAS__GROUP = GROUP__GROUP; /** - * The feature id for the '<em><b>Keyword</b></em>' attribute list. <!-- + * The feature id for the '<em><b>Class</b></em>' attribute list. <!-- * begin-user-doc --> <!-- end-user-doc --> * * @generated * @ordered */ - int CANVAS__KEYWORD = GROUP__KEYWORD; + int CANVAS__CLASS = GROUP__CLASS; /** * The feature id for the '<em><b>Style</b></em>' containment reference. @@ -378,13 +423,40 @@ public interface DGPackage extends EPackage { int CANVAS_FEATURE_COUNT = GROUP_FEATURE_COUNT + 1; /** + * The operation id for the '<em>Id Cannot Be Empty</em>' operation. <!-- + * begin-user-doc --> <!-- end-user-doc --> + * + * @generated + * @ordered + */ + int CANVAS___ID_CANNOT_BE_EMPTY__DIAGNOSTICCHAIN_MAP = GROUP___ID_CANNOT_BE_EMPTY__DIAGNOSTICCHAIN_MAP; + + /** + * The operation id for the '<em>Referenced Clippath Has Id</em>' operation. + * <!-- begin-user-doc --> <!-- end-user-doc --> + * + * @generated + * @ordered + */ + int CANVAS___REFERENCED_CLIPPATH_HAS_ID__DIAGNOSTICCHAIN_MAP = GROUP___REFERENCED_CLIPPATH_HAS_ID__DIAGNOSTICCHAIN_MAP; + + /** + * The operation id for the '<em>Canvas Cannot Have Transforms</em>' + * operation. <!-- begin-user-doc --> <!-- end-user-doc --> + * + * @generated + * @ordered + */ + int CANVAS___CANVAS_CANNOT_HAVE_TRANSFORMS__DIAGNOSTICCHAIN_MAP = GROUP_OPERATION_COUNT + 0; + + /** * The number of operations of the '<em>Canvas</em>' class. <!-- * begin-user-doc --> <!-- end-user-doc --> * * @generated * @ordered */ - int CANVAS_OPERATION_COUNT = GROUP_OPERATION_COUNT + 0; + int CANVAS_OPERATION_COUNT = GROUP_OPERATION_COUNT + 1; /** * The meta object id for the ' @@ -511,13 +583,13 @@ public interface DGPackage extends EPackage { int CLIP_PATH__GROUP = GROUP__GROUP; /** - * The feature id for the '<em><b>Keyword</b></em>' attribute list. <!-- + * The feature id for the '<em><b>Class</b></em>' attribute list. <!-- * begin-user-doc --> <!-- end-user-doc --> * * @generated * @ordered */ - int CLIP_PATH__KEYWORD = GROUP__KEYWORD; + int CLIP_PATH__CLASS = GROUP__CLASS; /** * The feature id for the '<em><b>Style</b></em>' containment reference. @@ -556,6 +628,24 @@ public interface DGPackage extends EPackage { int CLIP_PATH_FEATURE_COUNT = GROUP_FEATURE_COUNT + 0; /** + * The operation id for the '<em>Id Cannot Be Empty</em>' operation. <!-- + * begin-user-doc --> <!-- end-user-doc --> + * + * @generated + * @ordered + */ + int CLIP_PATH___ID_CANNOT_BE_EMPTY__DIAGNOSTICCHAIN_MAP = GROUP___ID_CANNOT_BE_EMPTY__DIAGNOSTICCHAIN_MAP; + + /** + * The operation id for the '<em>Referenced Clippath Has Id</em>' operation. + * <!-- begin-user-doc --> <!-- end-user-doc --> + * + * @generated + * @ordered + */ + int CLIP_PATH___REFERENCED_CLIPPATH_HAS_ID__DIAGNOSTICCHAIN_MAP = GROUP___REFERENCED_CLIPPATH_HAS_ID__DIAGNOSTICCHAIN_MAP; + + /** * The number of operations of the '<em>Clip Path</em>' class. <!-- * begin-user-doc --> <!-- end-user-doc --> * @@ -776,13 +866,22 @@ public interface DGPackage extends EPackage { int PAINT_FEATURE_COUNT = 2; /** + * The operation id for the '<em>Referenced Paint Server Has Id</em>' + * operation. <!-- begin-user-doc --> <!-- end-user-doc --> + * + * @generated + * @ordered + */ + int PAINT___REFERENCED_PAINT_SERVER_HAS_ID__DIAGNOSTICCHAIN_MAP = 0; + + /** * The number of operations of the '<em>Paint</em>' class. <!-- * begin-user-doc --> <!-- end-user-doc --> * * @generated * @ordered */ - int PAINT_OPERATION_COUNT = 0; + int PAINT_OPERATION_COUNT = 1; /** * The meta object id for the ' @@ -824,6 +923,15 @@ public interface DGPackage extends EPackage { int PAINT_SERVER_FEATURE_COUNT = DEFINITION_FEATURE_COUNT + 1; /** + * The operation id for the '<em>Id Cannot Be Empty</em>' operation. <!-- + * begin-user-doc --> <!-- end-user-doc --> + * + * @generated + * @ordered + */ + int PAINT_SERVER___ID_CANNOT_BE_EMPTY__DIAGNOSTICCHAIN_MAP = DEFINITION___ID_CANNOT_BE_EMPTY__DIAGNOSTICCHAIN_MAP; + + /** * The number of operations of the '<em>Paint Server</em>' class. <!-- * begin-user-doc --> <!-- end-user-doc --> * @@ -900,13 +1008,13 @@ public interface DGPackage extends EPackage { int CIRCLE__GROUP = GRAPHICAL_ELEMENT__GROUP; /** - * The feature id for the '<em><b>Keyword</b></em>' attribute list. <!-- + * The feature id for the '<em><b>Class</b></em>' attribute list. <!-- * begin-user-doc --> <!-- end-user-doc --> * * @generated * @ordered */ - int CIRCLE__KEYWORD = GRAPHICAL_ELEMENT__KEYWORD; + int CIRCLE__CLASS = GRAPHICAL_ELEMENT__CLASS; /** * The feature id for the '<em><b>Style</b></em>' containment reference. @@ -954,6 +1062,24 @@ public interface DGPackage extends EPackage { int CIRCLE_FEATURE_COUNT = GRAPHICAL_ELEMENT_FEATURE_COUNT + 2; /** + * The operation id for the '<em>Id Cannot Be Empty</em>' operation. <!-- + * begin-user-doc --> <!-- end-user-doc --> + * + * @generated + * @ordered + */ + int CIRCLE___ID_CANNOT_BE_EMPTY__DIAGNOSTICCHAIN_MAP = GRAPHICAL_ELEMENT___ID_CANNOT_BE_EMPTY__DIAGNOSTICCHAIN_MAP; + + /** + * The operation id for the '<em>Referenced Clippath Has Id</em>' operation. + * <!-- begin-user-doc --> <!-- end-user-doc --> + * + * @generated + * @ordered + */ + int CIRCLE___REFERENCED_CLIPPATH_HAS_ID__DIAGNOSTICCHAIN_MAP = GRAPHICAL_ELEMENT___REFERENCED_CLIPPATH_HAS_ID__DIAGNOSTICCHAIN_MAP; + + /** * The operation id for the '<em>Non Negative Radius</em>' operation. <!-- * begin-user-doc --> <!-- end-user-doc --> * @@ -1031,31 +1157,31 @@ public interface DGPackage extends EPackage { int CUBIC_CURVE_TO__IS_RELATIVE = PATH_COMMAND__IS_RELATIVE; /** - * The feature id for the '<em><b>Point</b></em>' containment reference. - * <!-- begin-user-doc --> <!-- end-user-doc --> + * The feature id for the '<em><b>Start Control</b></em>' containment + * reference. <!-- begin-user-doc --> <!-- end-user-doc --> * * @generated * @ordered */ - int CUBIC_CURVE_TO__POINT = PATH_COMMAND_FEATURE_COUNT + 0; + int CUBIC_CURVE_TO__START_CONTROL = PATH_COMMAND_FEATURE_COUNT + 0; /** - * The feature id for the '<em><b>Start Control</b></em>' containment + * The feature id for the '<em><b>End Control</b></em>' containment * reference. <!-- begin-user-doc --> <!-- end-user-doc --> * * @generated * @ordered */ - int CUBIC_CURVE_TO__START_CONTROL = PATH_COMMAND_FEATURE_COUNT + 1; + int CUBIC_CURVE_TO__END_CONTROL = PATH_COMMAND_FEATURE_COUNT + 1; /** - * The feature id for the '<em><b>End Control</b></em>' containment - * reference. <!-- begin-user-doc --> <!-- end-user-doc --> + * The feature id for the '<em><b>Point</b></em>' containment reference. + * <!-- begin-user-doc --> <!-- end-user-doc --> * * @generated * @ordered */ - int CUBIC_CURVE_TO__END_CONTROL = PATH_COMMAND_FEATURE_COUNT + 2; + int CUBIC_CURVE_TO__POINT = PATH_COMMAND_FEATURE_COUNT + 2; /** * The number of structural features of the '<em>Cubic Curve To</em>' class. @@ -1222,22 +1348,22 @@ public interface DGPackage extends EPackage { int STYLE_SELECTOR = 17; /** - * The feature id for the '<em><b>Type</b></em>' reference. <!-- + * The feature id for the '<em><b>Kind</b></em>' attribute. <!-- * begin-user-doc --> <!-- end-user-doc --> * * @generated * @ordered */ - int STYLE_SELECTOR__TYPE = 0; + int STYLE_SELECTOR__KIND = 0; /** - * The feature id for the '<em><b>Keyword</b></em>' attribute list. <!-- + * The feature id for the '<em><b>Class</b></em>' attribute list. <!-- * begin-user-doc --> <!-- end-user-doc --> * * @generated * @ordered */ - int STYLE_SELECTOR__KEYWORD = 1; + int STYLE_SELECTOR__CLASS = 1; /** * The number of structural features of the '<em>Style Selector</em>' class. @@ -1296,13 +1422,13 @@ public interface DGPackage extends EPackage { int ELLIPSE__GROUP = GRAPHICAL_ELEMENT__GROUP; /** - * The feature id for the '<em><b>Keyword</b></em>' attribute list. <!-- + * The feature id for the '<em><b>Class</b></em>' attribute list. <!-- * begin-user-doc --> <!-- end-user-doc --> * * @generated * @ordered */ - int ELLIPSE__KEYWORD = GRAPHICAL_ELEMENT__KEYWORD; + int ELLIPSE__CLASS = GRAPHICAL_ELEMENT__CLASS; /** * The feature id for the '<em><b>Style</b></em>' containment reference. @@ -1350,43 +1476,52 @@ public interface DGPackage extends EPackage { int ELLIPSE_FEATURE_COUNT = GRAPHICAL_ELEMENT_FEATURE_COUNT + 2; /** - * The number of operations of the '<em>Ellipse</em>' class. <!-- + * The operation id for the '<em>Id Cannot Be Empty</em>' operation. <!-- * begin-user-doc --> <!-- end-user-doc --> * * @generated * @ordered */ - int ELLIPSE_OPERATION_COUNT = GRAPHICAL_ELEMENT_OPERATION_COUNT + 0; + int ELLIPSE___ID_CANNOT_BE_EMPTY__DIAGNOSTICCHAIN_MAP = GRAPHICAL_ELEMENT___ID_CANNOT_BE_EMPTY__DIAGNOSTICCHAIN_MAP; /** - * The meta object id for the ' - * {@link org.eclipse.papyrus.dd.dg.impl.EllipticalCurveToImpl - * <em>Elliptical Curve To</em>}' class. <!-- begin-user-doc --> <!-- - * end-user-doc --> + * The operation id for the '<em>Referenced Clippath Has Id</em>' operation. + * <!-- begin-user-doc --> <!-- end-user-doc --> * - * @see org.eclipse.papyrus.dd.dg.impl.EllipticalCurveToImpl - * @see org.eclipse.papyrus.dd.dg.impl.DGPackageImpl#getEllipticalCurveTo() * @generated + * @ordered */ - int ELLIPTICAL_CURVE_TO = 19; + int ELLIPSE___REFERENCED_CLIPPATH_HAS_ID__DIAGNOSTICCHAIN_MAP = GRAPHICAL_ELEMENT___REFERENCED_CLIPPATH_HAS_ID__DIAGNOSTICCHAIN_MAP; /** - * The feature id for the '<em><b>Is Relative</b></em>' attribute. <!-- + * The number of operations of the '<em>Ellipse</em>' class. <!-- * begin-user-doc --> <!-- end-user-doc --> * * @generated * @ordered */ - int ELLIPTICAL_CURVE_TO__IS_RELATIVE = PATH_COMMAND__IS_RELATIVE; + int ELLIPSE_OPERATION_COUNT = GRAPHICAL_ELEMENT_OPERATION_COUNT + 0; /** - * The feature id for the '<em><b>Point</b></em>' containment reference. - * <!-- begin-user-doc --> <!-- end-user-doc --> + * The meta object id for the ' + * {@link org.eclipse.papyrus.dd.dg.impl.EllipticalArcToImpl + * <em>Elliptical Arc To</em>}' class. <!-- begin-user-doc --> <!-- + * end-user-doc --> + * + * @see org.eclipse.papyrus.dd.dg.impl.EllipticalArcToImpl + * @see org.eclipse.papyrus.dd.dg.impl.DGPackageImpl#getEllipticalArcTo() + * @generated + */ + int ELLIPTICAL_ARC_TO = 19; + + /** + * The feature id for the '<em><b>Is Relative</b></em>' attribute. <!-- + * begin-user-doc --> <!-- end-user-doc --> * * @generated * @ordered */ - int ELLIPTICAL_CURVE_TO__POINT = PATH_COMMAND_FEATURE_COUNT + 0; + int ELLIPTICAL_ARC_TO__IS_RELATIVE = PATH_COMMAND__IS_RELATIVE; /** * The feature id for the '<em><b>Radii</b></em>' containment reference. @@ -1395,7 +1530,7 @@ public interface DGPackage extends EPackage { * @generated * @ordered */ - int ELLIPTICAL_CURVE_TO__RADII = PATH_COMMAND_FEATURE_COUNT + 1; + int ELLIPTICAL_ARC_TO__RADII = PATH_COMMAND_FEATURE_COUNT + 0; /** * The feature id for the '<em><b>Rotation</b></em>' attribute. <!-- @@ -1404,7 +1539,7 @@ public interface DGPackage extends EPackage { * @generated * @ordered */ - int ELLIPTICAL_CURVE_TO__ROTATION = PATH_COMMAND_FEATURE_COUNT + 2; + int ELLIPTICAL_ARC_TO__ROTATION = PATH_COMMAND_FEATURE_COUNT + 1; /** * The feature id for the '<em><b>Is Large Arc</b></em>' attribute. <!-- @@ -1413,7 +1548,7 @@ public interface DGPackage extends EPackage { * @generated * @ordered */ - int ELLIPTICAL_CURVE_TO__IS_LARGE_ARC = PATH_COMMAND_FEATURE_COUNT + 3; + int ELLIPTICAL_ARC_TO__IS_LARGE_ARC = PATH_COMMAND_FEATURE_COUNT + 2; /** * The feature id for the '<em><b>Is Sweep</b></em>' attribute. <!-- @@ -1422,25 +1557,34 @@ public interface DGPackage extends EPackage { * @generated * @ordered */ - int ELLIPTICAL_CURVE_TO__IS_SWEEP = PATH_COMMAND_FEATURE_COUNT + 4; + int ELLIPTICAL_ARC_TO__IS_SWEEP = PATH_COMMAND_FEATURE_COUNT + 3; + + /** + * The feature id for the '<em><b>Point</b></em>' containment reference. + * <!-- begin-user-doc --> <!-- end-user-doc --> + * + * @generated + * @ordered + */ + int ELLIPTICAL_ARC_TO__POINT = PATH_COMMAND_FEATURE_COUNT + 4; /** - * The number of structural features of the '<em>Elliptical Curve To</em>' + * The number of structural features of the '<em>Elliptical Arc To</em>' * class. <!-- begin-user-doc --> <!-- end-user-doc --> * * @generated * @ordered */ - int ELLIPTICAL_CURVE_TO_FEATURE_COUNT = PATH_COMMAND_FEATURE_COUNT + 5; + int ELLIPTICAL_ARC_TO_FEATURE_COUNT = PATH_COMMAND_FEATURE_COUNT + 5; /** - * The number of operations of the '<em>Elliptical Curve To</em>' class. - * <!-- begin-user-doc --> <!-- end-user-doc --> + * The number of operations of the '<em>Elliptical Arc To</em>' class. <!-- + * begin-user-doc --> <!-- end-user-doc --> * * @generated * @ordered */ - int ELLIPTICAL_CURVE_TO_OPERATION_COUNT = PATH_COMMAND_OPERATION_COUNT + 0; + int ELLIPTICAL_ARC_TO_OPERATION_COUNT = PATH_COMMAND_OPERATION_COUNT + 0; /** * The meta object id for the ' @@ -1464,22 +1608,22 @@ public interface DGPackage extends EPackage { int QUADRATIC_CURVE_TO__IS_RELATIVE = PATH_COMMAND__IS_RELATIVE; /** - * The feature id for the '<em><b>Point</b></em>' containment reference. + * The feature id for the '<em><b>Control</b></em>' containment reference. * <!-- begin-user-doc --> <!-- end-user-doc --> * * @generated * @ordered */ - int QUADRATIC_CURVE_TO__POINT = PATH_COMMAND_FEATURE_COUNT + 0; + int QUADRATIC_CURVE_TO__CONTROL = PATH_COMMAND_FEATURE_COUNT + 0; /** - * The feature id for the '<em><b>Control</b></em>' containment reference. + * The feature id for the '<em><b>Point</b></em>' containment reference. * <!-- begin-user-doc --> <!-- end-user-doc --> * * @generated * @ordered */ - int QUADRATIC_CURVE_TO__CONTROL = PATH_COMMAND_FEATURE_COUNT + 1; + int QUADRATIC_CURVE_TO__POINT = PATH_COMMAND_FEATURE_COUNT + 1; /** * The number of structural features of the '<em>Quadratic Curve To</em>' @@ -1547,6 +1691,15 @@ public interface DGPackage extends EPackage { int GRADIENT_FEATURE_COUNT = PAINT_SERVER_FEATURE_COUNT + 1; /** + * The operation id for the '<em>Id Cannot Be Empty</em>' operation. <!-- + * begin-user-doc --> <!-- end-user-doc --> + * + * @generated + * @ordered + */ + int GRADIENT___ID_CANNOT_BE_EMPTY__DIAGNOSTICCHAIN_MAP = PAINT_SERVER___ID_CANNOT_BE_EMPTY__DIAGNOSTICCHAIN_MAP; + + /** * The number of operations of the '<em>Gradient</em>' class. <!-- * begin-user-doc --> <!-- end-user-doc --> * @@ -1669,13 +1822,13 @@ public interface DGPackage extends EPackage { int IMAGE__GROUP = GRAPHICAL_ELEMENT__GROUP; /** - * The feature id for the '<em><b>Keyword</b></em>' attribute list. <!-- + * The feature id for the '<em><b>Class</b></em>' attribute list. <!-- * begin-user-doc --> <!-- end-user-doc --> * * @generated * @ordered */ - int IMAGE__KEYWORD = GRAPHICAL_ELEMENT__KEYWORD; + int IMAGE__CLASS = GRAPHICAL_ELEMENT__CLASS; /** * The feature id for the '<em><b>Style</b></em>' containment reference. @@ -1732,13 +1885,40 @@ public interface DGPackage extends EPackage { int IMAGE_FEATURE_COUNT = GRAPHICAL_ELEMENT_FEATURE_COUNT + 3; /** + * The operation id for the '<em>Id Cannot Be Empty</em>' operation. <!-- + * begin-user-doc --> <!-- end-user-doc --> + * + * @generated + * @ordered + */ + int IMAGE___ID_CANNOT_BE_EMPTY__DIAGNOSTICCHAIN_MAP = GRAPHICAL_ELEMENT___ID_CANNOT_BE_EMPTY__DIAGNOSTICCHAIN_MAP; + + /** + * The operation id for the '<em>Referenced Clippath Has Id</em>' operation. + * <!-- begin-user-doc --> <!-- end-user-doc --> + * + * @generated + * @ordered + */ + int IMAGE___REFERENCED_CLIPPATH_HAS_ID__DIAGNOSTICCHAIN_MAP = GRAPHICAL_ELEMENT___REFERENCED_CLIPPATH_HAS_ID__DIAGNOSTICCHAIN_MAP; + + /** + * The operation id for the '<em>Source Cannot Be Empty</em>' operation. + * <!-- begin-user-doc --> <!-- end-user-doc --> + * + * @generated + * @ordered + */ + int IMAGE___SOURCE_CANNOT_BE_EMPTY__DIAGNOSTICCHAIN_MAP = GRAPHICAL_ELEMENT_OPERATION_COUNT + 0; + + /** * The number of operations of the '<em>Image</em>' class. <!-- * begin-user-doc --> <!-- end-user-doc --> * * @generated * @ordered */ - int IMAGE_OPERATION_COUNT = GRAPHICAL_ELEMENT_OPERATION_COUNT + 0; + int IMAGE_OPERATION_COUNT = GRAPHICAL_ELEMENT_OPERATION_COUNT + 1; /** * The meta object id for the ' @@ -1780,13 +1960,13 @@ public interface DGPackage extends EPackage { int MARKED_ELEMENT__GROUP = GRAPHICAL_ELEMENT__GROUP; /** - * The feature id for the '<em><b>Keyword</b></em>' attribute list. <!-- + * The feature id for the '<em><b>Class</b></em>' attribute list. <!-- * begin-user-doc --> <!-- end-user-doc --> * * @generated * @ordered */ - int MARKED_ELEMENT__KEYWORD = GRAPHICAL_ELEMENT__KEYWORD; + int MARKED_ELEMENT__CLASS = GRAPHICAL_ELEMENT__CLASS; /** * The feature id for the '<em><b>Style</b></em>' containment reference. @@ -1843,13 +2023,58 @@ public interface DGPackage extends EPackage { int MARKED_ELEMENT_FEATURE_COUNT = GRAPHICAL_ELEMENT_FEATURE_COUNT + 3; /** + * The operation id for the '<em>Id Cannot Be Empty</em>' operation. <!-- + * begin-user-doc --> <!-- end-user-doc --> + * + * @generated + * @ordered + */ + int MARKED_ELEMENT___ID_CANNOT_BE_EMPTY__DIAGNOSTICCHAIN_MAP = GRAPHICAL_ELEMENT___ID_CANNOT_BE_EMPTY__DIAGNOSTICCHAIN_MAP; + + /** + * The operation id for the '<em>Referenced Clippath Has Id</em>' operation. + * <!-- begin-user-doc --> <!-- end-user-doc --> + * + * @generated + * @ordered + */ + int MARKED_ELEMENT___REFERENCED_CLIPPATH_HAS_ID__DIAGNOSTICCHAIN_MAP = GRAPHICAL_ELEMENT___REFERENCED_CLIPPATH_HAS_ID__DIAGNOSTICCHAIN_MAP; + + /** + * The operation id for the '<em>Referenced Start Marker Has Id</em>' + * operation. <!-- begin-user-doc --> <!-- end-user-doc --> + * + * @generated + * @ordered + */ + int MARKED_ELEMENT___REFERENCED_START_MARKER_HAS_ID__DIAGNOSTICCHAIN_MAP = GRAPHICAL_ELEMENT_OPERATION_COUNT + 0; + + /** + * The operation id for the '<em>Referenced Mid Marker Has Id</em>' + * operation. <!-- begin-user-doc --> <!-- end-user-doc --> + * + * @generated + * @ordered + */ + int MARKED_ELEMENT___REFERENCED_MID_MARKER_HAS_ID__DIAGNOSTICCHAIN_MAP = GRAPHICAL_ELEMENT_OPERATION_COUNT + 1; + + /** + * The operation id for the '<em>Referenced End Marker Has Id</em>' + * operation. <!-- begin-user-doc --> <!-- end-user-doc --> + * + * @generated + * @ordered + */ + int MARKED_ELEMENT___REFERENCED_END_MARKER_HAS_ID__DIAGNOSTICCHAIN_MAP = GRAPHICAL_ELEMENT_OPERATION_COUNT + 2; + + /** * The number of operations of the '<em>Marked Element</em>' class. <!-- * begin-user-doc --> <!-- end-user-doc --> * * @generated * @ordered */ - int MARKED_ELEMENT_OPERATION_COUNT = GRAPHICAL_ELEMENT_OPERATION_COUNT + 0; + int MARKED_ELEMENT_OPERATION_COUNT = GRAPHICAL_ELEMENT_OPERATION_COUNT + 3; /** * The meta object id for the ' @@ -1890,13 +2115,13 @@ public interface DGPackage extends EPackage { int LINE__GROUP = MARKED_ELEMENT__GROUP; /** - * The feature id for the '<em><b>Keyword</b></em>' attribute list. <!-- + * The feature id for the '<em><b>Class</b></em>' attribute list. <!-- * begin-user-doc --> <!-- end-user-doc --> * * @generated * @ordered */ - int LINE__KEYWORD = MARKED_ELEMENT__KEYWORD; + int LINE__CLASS = MARKED_ELEMENT__CLASS; /** * The feature id for the '<em><b>Style</b></em>' containment reference. @@ -1971,6 +2196,51 @@ public interface DGPackage extends EPackage { int LINE_FEATURE_COUNT = MARKED_ELEMENT_FEATURE_COUNT + 2; /** + * The operation id for the '<em>Id Cannot Be Empty</em>' operation. <!-- + * begin-user-doc --> <!-- end-user-doc --> + * + * @generated + * @ordered + */ + int LINE___ID_CANNOT_BE_EMPTY__DIAGNOSTICCHAIN_MAP = MARKED_ELEMENT___ID_CANNOT_BE_EMPTY__DIAGNOSTICCHAIN_MAP; + + /** + * The operation id for the '<em>Referenced Clippath Has Id</em>' operation. + * <!-- begin-user-doc --> <!-- end-user-doc --> + * + * @generated + * @ordered + */ + int LINE___REFERENCED_CLIPPATH_HAS_ID__DIAGNOSTICCHAIN_MAP = MARKED_ELEMENT___REFERENCED_CLIPPATH_HAS_ID__DIAGNOSTICCHAIN_MAP; + + /** + * The operation id for the '<em>Referenced Start Marker Has Id</em>' + * operation. <!-- begin-user-doc --> <!-- end-user-doc --> + * + * @generated + * @ordered + */ + int LINE___REFERENCED_START_MARKER_HAS_ID__DIAGNOSTICCHAIN_MAP = MARKED_ELEMENT___REFERENCED_START_MARKER_HAS_ID__DIAGNOSTICCHAIN_MAP; + + /** + * The operation id for the '<em>Referenced Mid Marker Has Id</em>' + * operation. <!-- begin-user-doc --> <!-- end-user-doc --> + * + * @generated + * @ordered + */ + int LINE___REFERENCED_MID_MARKER_HAS_ID__DIAGNOSTICCHAIN_MAP = MARKED_ELEMENT___REFERENCED_MID_MARKER_HAS_ID__DIAGNOSTICCHAIN_MAP; + + /** + * The operation id for the '<em>Referenced End Marker Has Id</em>' + * operation. <!-- begin-user-doc --> <!-- end-user-doc --> + * + * @generated + * @ordered + */ + int LINE___REFERENCED_END_MARKER_HAS_ID__DIAGNOSTICCHAIN_MAP = MARKED_ELEMENT___REFERENCED_END_MARKER_HAS_ID__DIAGNOSTICCHAIN_MAP; + + /** * The number of operations of the '<em>Line</em>' class. <!-- * begin-user-doc --> <!-- end-user-doc --> * @@ -2018,13 +2288,13 @@ public interface DGPackage extends EPackage { int MARKER__GROUP = GROUP__GROUP; /** - * The feature id for the '<em><b>Keyword</b></em>' attribute list. <!-- + * The feature id for the '<em><b>Class</b></em>' attribute list. <!-- * begin-user-doc --> <!-- end-user-doc --> * * @generated * @ordered */ - int MARKER__KEYWORD = GROUP__KEYWORD; + int MARKER__CLASS = GROUP__CLASS; /** * The feature id for the '<em><b>Style</b></em>' containment reference. @@ -2081,6 +2351,24 @@ public interface DGPackage extends EPackage { int MARKER_FEATURE_COUNT = GROUP_FEATURE_COUNT + 2; /** + * The operation id for the '<em>Id Cannot Be Empty</em>' operation. <!-- + * begin-user-doc --> <!-- end-user-doc --> + * + * @generated + * @ordered + */ + int MARKER___ID_CANNOT_BE_EMPTY__DIAGNOSTICCHAIN_MAP = GROUP___ID_CANNOT_BE_EMPTY__DIAGNOSTICCHAIN_MAP; + + /** + * The operation id for the '<em>Referenced Clippath Has Id</em>' operation. + * <!-- begin-user-doc --> <!-- end-user-doc --> + * + * @generated + * @ordered + */ + int MARKER___REFERENCED_CLIPPATH_HAS_ID__DIAGNOSTICCHAIN_MAP = GROUP___REFERENCED_CLIPPATH_HAS_ID__DIAGNOSTICCHAIN_MAP; + + /** * The number of operations of the '<em>Marker</em>' class. <!-- * begin-user-doc --> <!-- end-user-doc --> * @@ -2156,6 +2444,15 @@ public interface DGPackage extends EPackage { int LINEAR_GRADIENT_FEATURE_COUNT = GRADIENT_FEATURE_COUNT + 2; /** + * The operation id for the '<em>Id Cannot Be Empty</em>' operation. <!-- + * begin-user-doc --> <!-- end-user-doc --> + * + * @generated + * @ordered + */ + int LINEAR_GRADIENT___ID_CANNOT_BE_EMPTY__DIAGNOSTICCHAIN_MAP = GRADIENT___ID_CANNOT_BE_EMPTY__DIAGNOSTICCHAIN_MAP; + + /** * The operation id for the '<em>Valid Gradient Vector</em>' operation. <!-- * begin-user-doc --> <!-- end-user-doc --> * @@ -2342,13 +2639,13 @@ public interface DGPackage extends EPackage { int PATH__GROUP = MARKED_ELEMENT__GROUP; /** - * The feature id for the '<em><b>Keyword</b></em>' attribute list. <!-- + * The feature id for the '<em><b>Class</b></em>' attribute list. <!-- * begin-user-doc --> <!-- end-user-doc --> * * @generated * @ordered */ - int PATH__KEYWORD = MARKED_ELEMENT__KEYWORD; + int PATH__CLASS = MARKED_ELEMENT__CLASS; /** * The feature id for the '<em><b>Style</b></em>' containment reference. @@ -2414,13 +2711,67 @@ public interface DGPackage extends EPackage { int PATH_FEATURE_COUNT = MARKED_ELEMENT_FEATURE_COUNT + 1; /** + * The operation id for the '<em>Id Cannot Be Empty</em>' operation. <!-- + * begin-user-doc --> <!-- end-user-doc --> + * + * @generated + * @ordered + */ + int PATH___ID_CANNOT_BE_EMPTY__DIAGNOSTICCHAIN_MAP = MARKED_ELEMENT___ID_CANNOT_BE_EMPTY__DIAGNOSTICCHAIN_MAP; + + /** + * The operation id for the '<em>Referenced Clippath Has Id</em>' operation. + * <!-- begin-user-doc --> <!-- end-user-doc --> + * + * @generated + * @ordered + */ + int PATH___REFERENCED_CLIPPATH_HAS_ID__DIAGNOSTICCHAIN_MAP = MARKED_ELEMENT___REFERENCED_CLIPPATH_HAS_ID__DIAGNOSTICCHAIN_MAP; + + /** + * The operation id for the '<em>Referenced Start Marker Has Id</em>' + * operation. <!-- begin-user-doc --> <!-- end-user-doc --> + * + * @generated + * @ordered + */ + int PATH___REFERENCED_START_MARKER_HAS_ID__DIAGNOSTICCHAIN_MAP = MARKED_ELEMENT___REFERENCED_START_MARKER_HAS_ID__DIAGNOSTICCHAIN_MAP; + + /** + * The operation id for the '<em>Referenced Mid Marker Has Id</em>' + * operation. <!-- begin-user-doc --> <!-- end-user-doc --> + * + * @generated + * @ordered + */ + int PATH___REFERENCED_MID_MARKER_HAS_ID__DIAGNOSTICCHAIN_MAP = MARKED_ELEMENT___REFERENCED_MID_MARKER_HAS_ID__DIAGNOSTICCHAIN_MAP; + + /** + * The operation id for the '<em>Referenced End Marker Has Id</em>' + * operation. <!-- begin-user-doc --> <!-- end-user-doc --> + * + * @generated + * @ordered + */ + int PATH___REFERENCED_END_MARKER_HAS_ID__DIAGNOSTICCHAIN_MAP = MARKED_ELEMENT___REFERENCED_END_MARKER_HAS_ID__DIAGNOSTICCHAIN_MAP; + + /** + * The operation id for the '<em>First Command Must Be Move</em>' operation. + * <!-- begin-user-doc --> <!-- end-user-doc --> + * + * @generated + * @ordered + */ + int PATH___FIRST_COMMAND_MUST_BE_MOVE__DIAGNOSTICCHAIN_MAP = MARKED_ELEMENT_OPERATION_COUNT + 0; + + /** * The number of operations of the '<em>Path</em>' class. <!-- * begin-user-doc --> <!-- end-user-doc --> * * @generated * @ordered */ - int PATH_OPERATION_COUNT = MARKED_ELEMENT_OPERATION_COUNT + 0; + int PATH_OPERATION_COUNT = MARKED_ELEMENT_OPERATION_COUNT + 1; /** * The meta object id for the ' @@ -2479,6 +2830,15 @@ public interface DGPackage extends EPackage { int PATTERN_FEATURE_COUNT = PAINT_SERVER_FEATURE_COUNT + 2; /** + * The operation id for the '<em>Id Cannot Be Empty</em>' operation. <!-- + * begin-user-doc --> <!-- end-user-doc --> + * + * @generated + * @ordered + */ + int PATTERN___ID_CANNOT_BE_EMPTY__DIAGNOSTICCHAIN_MAP = PAINT_SERVER___ID_CANNOT_BE_EMPTY__DIAGNOSTICCHAIN_MAP; + + /** * The number of operations of the '<em>Pattern</em>' class. <!-- * begin-user-doc --> <!-- end-user-doc --> * @@ -2526,13 +2886,13 @@ public interface DGPackage extends EPackage { int POLYGON__GROUP = MARKED_ELEMENT__GROUP; /** - * The feature id for the '<em><b>Keyword</b></em>' attribute list. <!-- + * The feature id for the '<em><b>Class</b></em>' attribute list. <!-- * begin-user-doc --> <!-- end-user-doc --> * * @generated * @ordered */ - int POLYGON__KEYWORD = MARKED_ELEMENT__KEYWORD; + int POLYGON__CLASS = MARKED_ELEMENT__CLASS; /** * The feature id for the '<em><b>Style</b></em>' containment reference. @@ -2598,6 +2958,51 @@ public interface DGPackage extends EPackage { int POLYGON_FEATURE_COUNT = MARKED_ELEMENT_FEATURE_COUNT + 1; /** + * The operation id for the '<em>Id Cannot Be Empty</em>' operation. <!-- + * begin-user-doc --> <!-- end-user-doc --> + * + * @generated + * @ordered + */ + int POLYGON___ID_CANNOT_BE_EMPTY__DIAGNOSTICCHAIN_MAP = MARKED_ELEMENT___ID_CANNOT_BE_EMPTY__DIAGNOSTICCHAIN_MAP; + + /** + * The operation id for the '<em>Referenced Clippath Has Id</em>' operation. + * <!-- begin-user-doc --> <!-- end-user-doc --> + * + * @generated + * @ordered + */ + int POLYGON___REFERENCED_CLIPPATH_HAS_ID__DIAGNOSTICCHAIN_MAP = MARKED_ELEMENT___REFERENCED_CLIPPATH_HAS_ID__DIAGNOSTICCHAIN_MAP; + + /** + * The operation id for the '<em>Referenced Start Marker Has Id</em>' + * operation. <!-- begin-user-doc --> <!-- end-user-doc --> + * + * @generated + * @ordered + */ + int POLYGON___REFERENCED_START_MARKER_HAS_ID__DIAGNOSTICCHAIN_MAP = MARKED_ELEMENT___REFERENCED_START_MARKER_HAS_ID__DIAGNOSTICCHAIN_MAP; + + /** + * The operation id for the '<em>Referenced Mid Marker Has Id</em>' + * operation. <!-- begin-user-doc --> <!-- end-user-doc --> + * + * @generated + * @ordered + */ + int POLYGON___REFERENCED_MID_MARKER_HAS_ID__DIAGNOSTICCHAIN_MAP = MARKED_ELEMENT___REFERENCED_MID_MARKER_HAS_ID__DIAGNOSTICCHAIN_MAP; + + /** + * The operation id for the '<em>Referenced End Marker Has Id</em>' + * operation. <!-- begin-user-doc --> <!-- end-user-doc --> + * + * @generated + * @ordered + */ + int POLYGON___REFERENCED_END_MARKER_HAS_ID__DIAGNOSTICCHAIN_MAP = MARKED_ELEMENT___REFERENCED_END_MARKER_HAS_ID__DIAGNOSTICCHAIN_MAP; + + /** * The number of operations of the '<em>Polygon</em>' class. <!-- * begin-user-doc --> <!-- end-user-doc --> * @@ -2645,13 +3050,13 @@ public interface DGPackage extends EPackage { int POLYLINE__GROUP = MARKED_ELEMENT__GROUP; /** - * The feature id for the '<em><b>Keyword</b></em>' attribute list. <!-- + * The feature id for the '<em><b>Class</b></em>' attribute list. <!-- * begin-user-doc --> <!-- end-user-doc --> * * @generated * @ordered */ - int POLYLINE__KEYWORD = MARKED_ELEMENT__KEYWORD; + int POLYLINE__CLASS = MARKED_ELEMENT__CLASS; /** * The feature id for the '<em><b>Style</b></em>' containment reference. @@ -2717,6 +3122,51 @@ public interface DGPackage extends EPackage { int POLYLINE_FEATURE_COUNT = MARKED_ELEMENT_FEATURE_COUNT + 1; /** + * The operation id for the '<em>Id Cannot Be Empty</em>' operation. <!-- + * begin-user-doc --> <!-- end-user-doc --> + * + * @generated + * @ordered + */ + int POLYLINE___ID_CANNOT_BE_EMPTY__DIAGNOSTICCHAIN_MAP = MARKED_ELEMENT___ID_CANNOT_BE_EMPTY__DIAGNOSTICCHAIN_MAP; + + /** + * The operation id for the '<em>Referenced Clippath Has Id</em>' operation. + * <!-- begin-user-doc --> <!-- end-user-doc --> + * + * @generated + * @ordered + */ + int POLYLINE___REFERENCED_CLIPPATH_HAS_ID__DIAGNOSTICCHAIN_MAP = MARKED_ELEMENT___REFERENCED_CLIPPATH_HAS_ID__DIAGNOSTICCHAIN_MAP; + + /** + * The operation id for the '<em>Referenced Start Marker Has Id</em>' + * operation. <!-- begin-user-doc --> <!-- end-user-doc --> + * + * @generated + * @ordered + */ + int POLYLINE___REFERENCED_START_MARKER_HAS_ID__DIAGNOSTICCHAIN_MAP = MARKED_ELEMENT___REFERENCED_START_MARKER_HAS_ID__DIAGNOSTICCHAIN_MAP; + + /** + * The operation id for the '<em>Referenced Mid Marker Has Id</em>' + * operation. <!-- begin-user-doc --> <!-- end-user-doc --> + * + * @generated + * @ordered + */ + int POLYLINE___REFERENCED_MID_MARKER_HAS_ID__DIAGNOSTICCHAIN_MAP = MARKED_ELEMENT___REFERENCED_MID_MARKER_HAS_ID__DIAGNOSTICCHAIN_MAP; + + /** + * The operation id for the '<em>Referenced End Marker Has Id</em>' + * operation. <!-- begin-user-doc --> <!-- end-user-doc --> + * + * @generated + * @ordered + */ + int POLYLINE___REFERENCED_END_MARKER_HAS_ID__DIAGNOSTICCHAIN_MAP = MARKED_ELEMENT___REFERENCED_END_MARKER_HAS_ID__DIAGNOSTICCHAIN_MAP; + + /** * The number of operations of the '<em>Polyline</em>' class. <!-- * begin-user-doc --> <!-- end-user-doc --> * @@ -2801,6 +3251,15 @@ public interface DGPackage extends EPackage { int RADIAL_GRADIENT_FEATURE_COUNT = GRADIENT_FEATURE_COUNT + 3; /** + * The operation id for the '<em>Id Cannot Be Empty</em>' operation. <!-- + * begin-user-doc --> <!-- end-user-doc --> + * + * @generated + * @ordered + */ + int RADIAL_GRADIENT___ID_CANNOT_BE_EMPTY__DIAGNOSTICCHAIN_MAP = GRADIENT___ID_CANNOT_BE_EMPTY__DIAGNOSTICCHAIN_MAP; + + /** * The operation id for the '<em>Valid Center Point</em>' operation. <!-- * begin-user-doc --> <!-- end-user-doc --> * @@ -2875,13 +3334,13 @@ public interface DGPackage extends EPackage { int RECTANGLE__GROUP = GRAPHICAL_ELEMENT__GROUP; /** - * The feature id for the '<em><b>Keyword</b></em>' attribute list. <!-- + * The feature id for the '<em><b>Class</b></em>' attribute list. <!-- * begin-user-doc --> <!-- end-user-doc --> * * @generated * @ordered */ - int RECTANGLE__KEYWORD = GRAPHICAL_ELEMENT__KEYWORD; + int RECTANGLE__CLASS = GRAPHICAL_ELEMENT__CLASS; /** * The feature id for the '<em><b>Style</b></em>' containment reference. @@ -2929,13 +3388,40 @@ public interface DGPackage extends EPackage { int RECTANGLE_FEATURE_COUNT = GRAPHICAL_ELEMENT_FEATURE_COUNT + 2; /** + * The operation id for the '<em>Id Cannot Be Empty</em>' operation. <!-- + * begin-user-doc --> <!-- end-user-doc --> + * + * @generated + * @ordered + */ + int RECTANGLE___ID_CANNOT_BE_EMPTY__DIAGNOSTICCHAIN_MAP = GRAPHICAL_ELEMENT___ID_CANNOT_BE_EMPTY__DIAGNOSTICCHAIN_MAP; + + /** + * The operation id for the '<em>Referenced Clippath Has Id</em>' operation. + * <!-- begin-user-doc --> <!-- end-user-doc --> + * + * @generated + * @ordered + */ + int RECTANGLE___REFERENCED_CLIPPATH_HAS_ID__DIAGNOSTICCHAIN_MAP = GRAPHICAL_ELEMENT___REFERENCED_CLIPPATH_HAS_ID__DIAGNOSTICCHAIN_MAP; + + /** + * The operation id for the '<em>Non Negative Corner Radius</em>' operation. + * <!-- begin-user-doc --> <!-- end-user-doc --> + * + * @generated + * @ordered + */ + int RECTANGLE___NON_NEGATIVE_CORNER_RADIUS__DIAGNOSTICCHAIN_MAP = GRAPHICAL_ELEMENT_OPERATION_COUNT + 0; + + /** * The number of operations of the '<em>Rectangle</em>' class. <!-- * begin-user-doc --> <!-- end-user-doc --> * * @generated * @ordered */ - int RECTANGLE_OPERATION_COUNT = GRAPHICAL_ELEMENT_OPERATION_COUNT + 0; + int RECTANGLE_OPERATION_COUNT = GRAPHICAL_ELEMENT_OPERATION_COUNT + 1; /** * The meta object id for the ' @@ -2977,13 +3463,13 @@ public interface DGPackage extends EPackage { int ROOT_CANVAS__GROUP = CANVAS__GROUP; /** - * The feature id for the '<em><b>Keyword</b></em>' attribute list. <!-- + * The feature id for the '<em><b>Class</b></em>' attribute list. <!-- * begin-user-doc --> <!-- end-user-doc --> * * @generated * @ordered */ - int ROOT_CANVAS__KEYWORD = CANVAS__KEYWORD; + int ROOT_CANVAS__CLASS = CANVAS__CLASS; /** * The feature id for the '<em><b>Style</b></em>' containment reference. @@ -3040,13 +3526,13 @@ public interface DGPackage extends EPackage { int ROOT_CANVAS__DEFINITIONS = CANVAS_FEATURE_COUNT + 1; /** - * The feature id for the '<em><b>Style Sheet</b></em>' reference list. <!-- - * begin-user-doc --> <!-- end-user-doc --> + * The feature id for the '<em><b>External Style Sheet</b></em>' reference + * list. <!-- begin-user-doc --> <!-- end-user-doc --> * * @generated * @ordered */ - int ROOT_CANVAS__STYLE_SHEET = CANVAS_FEATURE_COUNT + 2; + int ROOT_CANVAS__EXTERNAL_STYLE_SHEET = CANVAS_FEATURE_COUNT + 2; /** * The number of structural features of the '<em>Root Canvas</em>' class. @@ -3058,6 +3544,33 @@ public interface DGPackage extends EPackage { int ROOT_CANVAS_FEATURE_COUNT = CANVAS_FEATURE_COUNT + 3; /** + * The operation id for the '<em>Id Cannot Be Empty</em>' operation. <!-- + * begin-user-doc --> <!-- end-user-doc --> + * + * @generated + * @ordered + */ + int ROOT_CANVAS___ID_CANNOT_BE_EMPTY__DIAGNOSTICCHAIN_MAP = CANVAS___ID_CANNOT_BE_EMPTY__DIAGNOSTICCHAIN_MAP; + + /** + * The operation id for the '<em>Referenced Clippath Has Id</em>' operation. + * <!-- begin-user-doc --> <!-- end-user-doc --> + * + * @generated + * @ordered + */ + int ROOT_CANVAS___REFERENCED_CLIPPATH_HAS_ID__DIAGNOSTICCHAIN_MAP = CANVAS___REFERENCED_CLIPPATH_HAS_ID__DIAGNOSTICCHAIN_MAP; + + /** + * The operation id for the '<em>Canvas Cannot Have Transforms</em>' + * operation. <!-- begin-user-doc --> <!-- end-user-doc --> + * + * @generated + * @ordered + */ + int ROOT_CANVAS___CANVAS_CANNOT_HAVE_TRANSFORMS__DIAGNOSTICCHAIN_MAP = CANVAS___CANVAS_CANNOT_HAVE_TRANSFORMS__DIAGNOSTICCHAIN_MAP; + + /** * The number of operations of the '<em>Root Canvas</em>' class. <!-- * begin-user-doc --> <!-- end-user-doc --> * @@ -3255,13 +3768,13 @@ public interface DGPackage extends EPackage { int TEXT__GROUP = GRAPHICAL_ELEMENT__GROUP; /** - * The feature id for the '<em><b>Keyword</b></em>' attribute list. <!-- + * The feature id for the '<em><b>Class</b></em>' attribute list. <!-- * begin-user-doc --> <!-- end-user-doc --> * * @generated * @ordered */ - int TEXT__KEYWORD = GRAPHICAL_ELEMENT__KEYWORD; + int TEXT__CLASS = GRAPHICAL_ELEMENT__CLASS; /** * The feature id for the '<em><b>Style</b></em>' containment reference. @@ -3309,13 +3822,40 @@ public interface DGPackage extends EPackage { int TEXT_FEATURE_COUNT = GRAPHICAL_ELEMENT_FEATURE_COUNT + 2; /** + * The operation id for the '<em>Id Cannot Be Empty</em>' operation. <!-- + * begin-user-doc --> <!-- end-user-doc --> + * + * @generated + * @ordered + */ + int TEXT___ID_CANNOT_BE_EMPTY__DIAGNOSTICCHAIN_MAP = GRAPHICAL_ELEMENT___ID_CANNOT_BE_EMPTY__DIAGNOSTICCHAIN_MAP; + + /** + * The operation id for the '<em>Referenced Clippath Has Id</em>' operation. + * <!-- begin-user-doc --> <!-- end-user-doc --> + * + * @generated + * @ordered + */ + int TEXT___REFERENCED_CLIPPATH_HAS_ID__DIAGNOSTICCHAIN_MAP = GRAPHICAL_ELEMENT___REFERENCED_CLIPPATH_HAS_ID__DIAGNOSTICCHAIN_MAP; + + /** + * The operation id for the '<em>Data Cannot Be Empty</em>' operation. <!-- + * begin-user-doc --> <!-- end-user-doc --> + * + * @generated + * @ordered + */ + int TEXT___DATA_CANNOT_BE_EMPTY__DIAGNOSTICCHAIN_MAP = GRAPHICAL_ELEMENT_OPERATION_COUNT + 0; + + /** * The number of operations of the '<em>Text</em>' class. <!-- * begin-user-doc --> <!-- end-user-doc --> * * @generated * @ordered */ - int TEXT_OPERATION_COUNT = GRAPHICAL_ELEMENT_OPERATION_COUNT + 0; + int TEXT_OPERATION_COUNT = GRAPHICAL_ELEMENT_OPERATION_COUNT + 1; /** * The meta object id for the ' @@ -3403,13 +3943,13 @@ public interface DGPackage extends EPackage { int USE__GROUP = GRAPHICAL_ELEMENT__GROUP; /** - * The feature id for the '<em><b>Keyword</b></em>' attribute list. <!-- + * The feature id for the '<em><b>Class</b></em>' attribute list. <!-- * begin-user-doc --> <!-- end-user-doc --> * * @generated * @ordered */ - int USE__KEYWORD = GRAPHICAL_ELEMENT__KEYWORD; + int USE__CLASS = GRAPHICAL_ELEMENT__CLASS; /** * The feature id for the '<em><b>Style</b></em>' containment reference. @@ -3439,13 +3979,49 @@ public interface DGPackage extends EPackage { int USE__BOUNDS = GRAPHICAL_ELEMENT_FEATURE_COUNT + 0; /** + * The feature id for the '<em><b>Referenced Element</b></em>' reference. + * <!-- begin-user-doc --> <!-- end-user-doc --> + * + * @generated + * @ordered + */ + int USE__REFERENCED_ELEMENT = GRAPHICAL_ELEMENT_FEATURE_COUNT + 1; + + /** * The number of structural features of the '<em>Use</em>' class. <!-- * begin-user-doc --> <!-- end-user-doc --> * * @generated * @ordered */ - int USE_FEATURE_COUNT = GRAPHICAL_ELEMENT_FEATURE_COUNT + 1; + int USE_FEATURE_COUNT = GRAPHICAL_ELEMENT_FEATURE_COUNT + 2; + + /** + * The operation id for the '<em>Id Cannot Be Empty</em>' operation. <!-- + * begin-user-doc --> <!-- end-user-doc --> + * + * @generated + * @ordered + */ + int USE___ID_CANNOT_BE_EMPTY__DIAGNOSTICCHAIN_MAP = GRAPHICAL_ELEMENT___ID_CANNOT_BE_EMPTY__DIAGNOSTICCHAIN_MAP; + + /** + * The operation id for the '<em>Referenced Clippath Has Id</em>' operation. + * <!-- begin-user-doc --> <!-- end-user-doc --> + * + * @generated + * @ordered + */ + int USE___REFERENCED_CLIPPATH_HAS_ID__DIAGNOSTICCHAIN_MAP = GRAPHICAL_ELEMENT___REFERENCED_CLIPPATH_HAS_ID__DIAGNOSTICCHAIN_MAP; + + /** + * The operation id for the '<em>Referenced Element Has Id</em>' operation. + * <!-- begin-user-doc --> <!-- end-user-doc --> + * + * @generated + * @ordered + */ + int USE___REFERENCED_ELEMENT_HAS_ID__DIAGNOSTICCHAIN_MAP = GRAPHICAL_ELEMENT_OPERATION_COUNT + 0; /** * The number of operations of the '<em>Use</em>' class. <!-- begin-user-doc @@ -3454,7 +4030,7 @@ public interface DGPackage extends EPackage { * @generated * @ordered */ - int USE_OPERATION_COUNT = GRAPHICAL_ELEMENT_OPERATION_COUNT + 0; + int USE_OPERATION_COUNT = GRAPHICAL_ELEMENT_OPERATION_COUNT + 1; /** * The meta object id for the ' @@ -3468,6 +4044,17 @@ public interface DGPackage extends EPackage { int FONT_DECORATION = 43; /** + * The meta object id for the '{@link org.eclipse.papyrus.dd.dg.ElementKind + * <em>Element Kind</em>}' enum. <!-- begin-user-doc --> <!-- end-user-doc + * --> + * + * @see org.eclipse.papyrus.dd.dg.ElementKind + * @see org.eclipse.papyrus.dd.dg.impl.DGPackageImpl#getElementKind() + * @generated + */ + int ELEMENT_KIND = 44; + + /** * Returns the meta object for class ' * {@link org.eclipse.papyrus.dd.dg.Canvas <em>Canvas</em>}'. <!-- * begin-user-doc --> <!-- end-user-doc --> @@ -3491,6 +4078,20 @@ public interface DGPackage extends EPackage { EReference getCanvas_Bounds(); /** + * Returns the meta object for the ' + * {@link org.eclipse.papyrus.dd.dg.Canvas#canvasCannotHaveTransforms(org.eclipse.emf.common.util.DiagnosticChain, java.util.Map) + * <em>Canvas Cannot Have Transforms</em>}' operation. <!-- begin-user-doc + * --> <!-- end-user-doc --> + * + * @return the meta object for the '<em>Canvas Cannot Have Transforms</em>' + * operation. + * @see org.eclipse.papyrus.dd.dg.Canvas#canvasCannotHaveTransforms(org.eclipse.emf.common.util.DiagnosticChain, + * java.util.Map) + * @generated + */ + EOperation getCanvas__CanvasCannotHaveTransforms__DiagnosticChain_Map(); + + /** * Returns the meta object for class ' * {@link org.eclipse.papyrus.dd.dg.Group <em>Group</em>}'. <!-- * begin-user-doc --> <!-- end-user-doc --> @@ -3503,12 +4104,12 @@ public interface DGPackage extends EPackage { /** * Returns the meta object for the containment reference list ' - * {@link org.eclipse.papyrus.dd.dg.Group#getMember <em>Member</em>}'. <!-- + * {@link org.eclipse.papyrus.dd.dg.Group#getMembers <em>Member</em>}'. <!-- * begin-user-doc --> <!-- end-user-doc --> * * @return the meta object for the containment reference list ' * <em>Member</em>'. - * @see org.eclipse.papyrus.dd.dg.Group#getMember() + * @see org.eclipse.papyrus.dd.dg.Group#getMembers() * @see #getGroup() * @generated */ @@ -3552,15 +4153,15 @@ public interface DGPackage extends EPackage { /** * Returns the meta object for the attribute list ' - * {@link org.eclipse.papyrus.dd.dg.GraphicalElement#getKeyword - * <em>Keyword</em>}'. <!-- begin-user-doc --> <!-- end-user-doc --> + * {@link org.eclipse.papyrus.dd.dg.GraphicalElement#getClasses + * <em>Class</em>}'. <!-- begin-user-doc --> <!-- end-user-doc --> * - * @return the meta object for the attribute list '<em>Keyword</em>'. - * @see org.eclipse.papyrus.dd.dg.GraphicalElement#getKeyword() + * @return the meta object for the attribute list '<em>Class</em>'. + * @see org.eclipse.papyrus.dd.dg.GraphicalElement#getClasses() * @see #getGraphicalElement() * @generated */ - EAttribute getGraphicalElement_Keyword(); + EAttribute getGraphicalElement_Class(); /** * Returns the meta object for the containment reference ' @@ -3576,18 +4177,32 @@ public interface DGPackage extends EPackage { /** * Returns the meta object for the containment reference list ' - * {@link org.eclipse.papyrus.dd.dg.GraphicalElement#getTransform + * {@link org.eclipse.papyrus.dd.dg.GraphicalElement#getTransforms * <em>Transform</em>}'. <!-- begin-user-doc --> <!-- end-user-doc --> * * @return the meta object for the containment reference list ' * <em>Transform</em>'. - * @see org.eclipse.papyrus.dd.dg.GraphicalElement#getTransform() + * @see org.eclipse.papyrus.dd.dg.GraphicalElement#getTransforms() * @see #getGraphicalElement() * @generated */ EReference getGraphicalElement_Transform(); /** + * Returns the meta object for the ' + * {@link org.eclipse.papyrus.dd.dg.GraphicalElement#referencedClippathHasId(org.eclipse.emf.common.util.DiagnosticChain, java.util.Map) + * <em>Referenced Clippath Has Id</em>}' operation. <!-- begin-user-doc --> + * <!-- end-user-doc --> + * + * @return the meta object for the '<em>Referenced Clippath Has Id</em>' + * operation. + * @see org.eclipse.papyrus.dd.dg.GraphicalElement#referencedClippathHasId(org.eclipse.emf.common.util.DiagnosticChain, + * java.util.Map) + * @generated + */ + EOperation getGraphicalElement__ReferencedClippathHasId__DiagnosticChain_Map(); + + /** * Returns the meta object for class ' * {@link org.eclipse.papyrus.dd.dg.Definition <em>Definition</em>}'. <!-- * begin-user-doc --> <!-- end-user-doc --> @@ -3611,6 +4226,19 @@ public interface DGPackage extends EPackage { EAttribute getDefinition_Id(); /** + * Returns the meta object for the ' + * {@link org.eclipse.papyrus.dd.dg.Definition#idCannotBeEmpty(org.eclipse.emf.common.util.DiagnosticChain, java.util.Map) + * <em>Id Cannot Be Empty</em>}' operation. <!-- begin-user-doc --> <!-- + * end-user-doc --> + * + * @return the meta object for the '<em>Id Cannot Be Empty</em>' operation. + * @see org.eclipse.papyrus.dd.dg.Definition#idCannotBeEmpty(org.eclipse.emf.common.util.DiagnosticChain, + * java.util.Map) + * @generated + */ + EOperation getDefinition__IdCannotBeEmpty__DiagnosticChain_Map(); + + /** * Returns the meta object for class ' * {@link org.eclipse.papyrus.dd.dg.MoveTo <em>Move To</em>}'. <!-- * begin-user-doc --> <!-- end-user-doc --> @@ -3740,13 +4368,13 @@ public interface DGPackage extends EPackage { /** * Returns the meta object for the attribute list ' - * {@link org.eclipse.papyrus.dd.dg.Style#getStrokeDashLength + * {@link org.eclipse.papyrus.dd.dg.Style#getStrokeDashLengths * <em>Stroke Dash Length</em>}'. <!-- begin-user-doc --> <!-- end-user-doc * --> * * @return the meta object for the attribute list ' * <em>Stroke Dash Length</em>'. - * @see org.eclipse.papyrus.dd.dg.Style#getStrokeDashLength() + * @see org.eclipse.papyrus.dd.dg.Style#getStrokeDashLengths() * @see #getStyle() * @generated */ @@ -3915,6 +4543,20 @@ public interface DGPackage extends EPackage { EReference getPaint_PaintServer(); /** + * Returns the meta object for the ' + * {@link org.eclipse.papyrus.dd.dg.Paint#referencedPaintServerHasId(org.eclipse.emf.common.util.DiagnosticChain, java.util.Map) + * <em>Referenced Paint Server Has Id</em>}' operation. <!-- begin-user-doc + * --> <!-- end-user-doc --> + * + * @return the meta object for the '<em>Referenced Paint Server Has Id</em>' + * operation. + * @see org.eclipse.papyrus.dd.dg.Paint#referencedPaintServerHasId(org.eclipse.emf.common.util.DiagnosticChain, + * java.util.Map) + * @generated + */ + EOperation getPaint__ReferencedPaintServerHasId__DiagnosticChain_Map(); + + /** * Returns the meta object for class ' * {@link org.eclipse.papyrus.dd.dg.PaintServer <em>Paint Server</em>}'. * <!-- begin-user-doc --> <!-- end-user-doc --> @@ -3927,12 +4569,12 @@ public interface DGPackage extends EPackage { /** * Returns the meta object for the containment reference list ' - * {@link org.eclipse.papyrus.dd.dg.PaintServer#getTransform + * {@link org.eclipse.papyrus.dd.dg.PaintServer#getTransforms * <em>Transform</em>}'. <!-- begin-user-doc --> <!-- end-user-doc --> * * @return the meta object for the containment reference list ' * <em>Transform</em>'. - * @see org.eclipse.papyrus.dd.dg.PaintServer#getTransform() + * @see org.eclipse.papyrus.dd.dg.PaintServer#getTransforms() * @see #getPaintServer() * @generated */ @@ -4070,12 +4712,12 @@ public interface DGPackage extends EPackage { /** * Returns the meta object for the containment reference list ' - * {@link org.eclipse.papyrus.dd.dg.Definitions#getDefnition + * {@link org.eclipse.papyrus.dd.dg.Definitions#getDefnitions * <em>Defnition</em>}'. <!-- begin-user-doc --> <!-- end-user-doc --> * * @return the meta object for the containment reference list ' * <em>Defnition</em>'. - * @see org.eclipse.papyrus.dd.dg.Definitions#getDefnition() + * @see org.eclipse.papyrus.dd.dg.Definitions#getDefnitions() * @see #getDefinitions() * @generated */ @@ -4107,12 +4749,12 @@ public interface DGPackage extends EPackage { /** * Returns the meta object for the containment reference list ' - * {@link org.eclipse.papyrus.dd.dg.StyleSheet#getRule <em>Rule</em>}'. <!-- - * begin-user-doc --> <!-- end-user-doc --> + * {@link org.eclipse.papyrus.dd.dg.StyleSheet#getRules <em>Rule</em>}'. + * <!-- begin-user-doc --> <!-- end-user-doc --> * * @return the meta object for the containment reference list '<em>Rule</em> * '. - * @see org.eclipse.papyrus.dd.dg.StyleSheet#getRule() + * @see org.eclipse.papyrus.dd.dg.StyleSheet#getRules() * @see #getStyleSheet() * @generated */ @@ -4131,12 +4773,12 @@ public interface DGPackage extends EPackage { /** * Returns the meta object for the containment reference list ' - * {@link org.eclipse.papyrus.dd.dg.StyleRule#getSelector <em>Selector</em>} - * '. <!-- begin-user-doc --> <!-- end-user-doc --> + * {@link org.eclipse.papyrus.dd.dg.StyleRule#getSelectors + * <em>Selector</em>}'. <!-- begin-user-doc --> <!-- end-user-doc --> * * @return the meta object for the containment reference list ' * <em>Selector</em>'. - * @see org.eclipse.papyrus.dd.dg.StyleRule#getSelector() + * @see org.eclipse.papyrus.dd.dg.StyleRule#getSelectors() * @see #getStyleRule() * @generated */ @@ -4166,28 +4808,28 @@ public interface DGPackage extends EPackage { EClass getStyleSelector(); /** - * Returns the meta object for the reference ' - * {@link org.eclipse.papyrus.dd.dg.StyleSelector#getType <em>Type</em>}'. + * Returns the meta object for the attribute ' + * {@link org.eclipse.papyrus.dd.dg.StyleSelector#getKind <em>Kind</em>}'. * <!-- begin-user-doc --> <!-- end-user-doc --> * - * @return the meta object for the reference '<em>Type</em>'. - * @see org.eclipse.papyrus.dd.dg.StyleSelector#getType() + * @return the meta object for the attribute '<em>Kind</em>'. + * @see org.eclipse.papyrus.dd.dg.StyleSelector#getKind() * @see #getStyleSelector() * @generated */ - EReference getStyleSelector_Type(); + EAttribute getStyleSelector_Kind(); /** * Returns the meta object for the attribute list ' - * {@link org.eclipse.papyrus.dd.dg.StyleSelector#getKeyword - * <em>Keyword</em>}'. <!-- begin-user-doc --> <!-- end-user-doc --> + * {@link org.eclipse.papyrus.dd.dg.StyleSelector#getClasses <em>Class</em>} + * '. <!-- begin-user-doc --> <!-- end-user-doc --> * - * @return the meta object for the attribute list '<em>Keyword</em>'. - * @see org.eclipse.papyrus.dd.dg.StyleSelector#getKeyword() + * @return the meta object for the attribute list '<em>Class</em>'. + * @see org.eclipse.papyrus.dd.dg.StyleSelector#getClasses() * @see #getStyleSelector() * @generated */ - EAttribute getStyleSelector_Keyword(); + EAttribute getStyleSelector_Class(); /** * Returns the meta object for class ' @@ -4226,75 +4868,75 @@ public interface DGPackage extends EPackage { /** * Returns the meta object for class ' - * {@link org.eclipse.papyrus.dd.dg.EllipticalCurveTo - * <em>Elliptical Curve To</em>}'. <!-- begin-user-doc --> <!-- end-user-doc + * {@link org.eclipse.papyrus.dd.dg.EllipticalArcTo + * <em>Elliptical Arc To</em>}'. <!-- begin-user-doc --> <!-- end-user-doc * --> * - * @return the meta object for class '<em>Elliptical Curve To</em>'. - * @see org.eclipse.papyrus.dd.dg.EllipticalCurveTo + * @return the meta object for class '<em>Elliptical Arc To</em>'. + * @see org.eclipse.papyrus.dd.dg.EllipticalArcTo * @generated */ - EClass getEllipticalCurveTo(); + EClass getEllipticalArcTo(); /** * Returns the meta object for the containment reference ' - * {@link org.eclipse.papyrus.dd.dg.EllipticalCurveTo#getPoint - * <em>Point</em>}'. <!-- begin-user-doc --> <!-- end-user-doc --> + * {@link org.eclipse.papyrus.dd.dg.EllipticalArcTo#getPoint <em>Point</em>} + * '. <!-- begin-user-doc --> <!-- end-user-doc --> * * @return the meta object for the containment reference '<em>Point</em>'. - * @see org.eclipse.papyrus.dd.dg.EllipticalCurveTo#getPoint() - * @see #getEllipticalCurveTo() + * @see org.eclipse.papyrus.dd.dg.EllipticalArcTo#getPoint() + * @see #getEllipticalArcTo() * @generated */ - EReference getEllipticalCurveTo_Point(); + EReference getEllipticalArcTo_Point(); /** * Returns the meta object for the containment reference ' - * {@link org.eclipse.papyrus.dd.dg.EllipticalCurveTo#getRadii - * <em>Radii</em>}'. <!-- begin-user-doc --> <!-- end-user-doc --> + * {@link org.eclipse.papyrus.dd.dg.EllipticalArcTo#getRadii <em>Radii</em>} + * '. <!-- begin-user-doc --> <!-- end-user-doc --> * * @return the meta object for the containment reference '<em>Radii</em>'. - * @see org.eclipse.papyrus.dd.dg.EllipticalCurveTo#getRadii() - * @see #getEllipticalCurveTo() + * @see org.eclipse.papyrus.dd.dg.EllipticalArcTo#getRadii() + * @see #getEllipticalArcTo() * @generated */ - EReference getEllipticalCurveTo_Radii(); + EReference getEllipticalArcTo_Radii(); /** * Returns the meta object for the attribute ' - * {@link org.eclipse.papyrus.dd.dg.EllipticalCurveTo#getRotation + * {@link org.eclipse.papyrus.dd.dg.EllipticalArcTo#getRotation * <em>Rotation</em>}'. <!-- begin-user-doc --> <!-- end-user-doc --> * * @return the meta object for the attribute '<em>Rotation</em>'. - * @see org.eclipse.papyrus.dd.dg.EllipticalCurveTo#getRotation() - * @see #getEllipticalCurveTo() + * @see org.eclipse.papyrus.dd.dg.EllipticalArcTo#getRotation() + * @see #getEllipticalArcTo() * @generated */ - EAttribute getEllipticalCurveTo_Rotation(); + EAttribute getEllipticalArcTo_Rotation(); /** * Returns the meta object for the attribute ' - * {@link org.eclipse.papyrus.dd.dg.EllipticalCurveTo#isLargeArc + * {@link org.eclipse.papyrus.dd.dg.EllipticalArcTo#isLargeArc * <em>Is Large Arc</em>}'. <!-- begin-user-doc --> <!-- end-user-doc --> * * @return the meta object for the attribute '<em>Is Large Arc</em>'. - * @see org.eclipse.papyrus.dd.dg.EllipticalCurveTo#isLargeArc() - * @see #getEllipticalCurveTo() + * @see org.eclipse.papyrus.dd.dg.EllipticalArcTo#isLargeArc() + * @see #getEllipticalArcTo() * @generated */ - EAttribute getEllipticalCurveTo_IsLargeArc(); + EAttribute getEllipticalArcTo_IsLargeArc(); /** * Returns the meta object for the attribute ' - * {@link org.eclipse.papyrus.dd.dg.EllipticalCurveTo#isSweep + * {@link org.eclipse.papyrus.dd.dg.EllipticalArcTo#isSweep * <em>Is Sweep</em>}'. <!-- begin-user-doc --> <!-- end-user-doc --> * * @return the meta object for the attribute '<em>Is Sweep</em>'. - * @see org.eclipse.papyrus.dd.dg.EllipticalCurveTo#isSweep() - * @see #getEllipticalCurveTo() + * @see org.eclipse.papyrus.dd.dg.EllipticalArcTo#isSweep() + * @see #getEllipticalArcTo() * @generated */ - EAttribute getEllipticalCurveTo_IsSweep(); + EAttribute getEllipticalArcTo_IsSweep(); /** * Returns the meta object for class ' @@ -4345,12 +4987,12 @@ public interface DGPackage extends EPackage { /** * Returns the meta object for the containment reference list ' - * {@link org.eclipse.papyrus.dd.dg.Gradient#getStop <em>Stop</em>}'. <!-- + * {@link org.eclipse.papyrus.dd.dg.Gradient#getStops <em>Stop</em>}'. <!-- * begin-user-doc --> <!-- end-user-doc --> * * @return the meta object for the containment reference list '<em>Stop</em> * '. - * @see org.eclipse.papyrus.dd.dg.Gradient#getStop() + * @see org.eclipse.papyrus.dd.dg.Gradient#getStops() * @see #getGradient() * @generated */ @@ -4479,6 +5121,20 @@ public interface DGPackage extends EPackage { EAttribute getImage_IsAspectRatioPreserved(); /** + * Returns the meta object for the ' + * {@link org.eclipse.papyrus.dd.dg.Image#sourceCannotBeEmpty(org.eclipse.emf.common.util.DiagnosticChain, java.util.Map) + * <em>Source Cannot Be Empty</em>}' operation. <!-- begin-user-doc --> <!-- + * end-user-doc --> + * + * @return the meta object for the '<em>Source Cannot Be Empty</em>' + * operation. + * @see org.eclipse.papyrus.dd.dg.Image#sourceCannotBeEmpty(org.eclipse.emf.common.util.DiagnosticChain, + * java.util.Map) + * @generated + */ + EOperation getImage__SourceCannotBeEmpty__DiagnosticChain_Map(); + + /** * Returns the meta object for class '{@link org.eclipse.papyrus.dd.dg.Line * <em>Line</em>}'. <!-- begin-user-doc --> <!-- end-user-doc --> * @@ -4560,6 +5216,48 @@ public interface DGPackage extends EPackage { EReference getMarkedElement_StartMarker(); /** + * Returns the meta object for the ' + * {@link org.eclipse.papyrus.dd.dg.MarkedElement#referencedStartMarkerHasId(org.eclipse.emf.common.util.DiagnosticChain, java.util.Map) + * <em>Referenced Start Marker Has Id</em>}' operation. <!-- begin-user-doc + * --> <!-- end-user-doc --> + * + * @return the meta object for the '<em>Referenced Start Marker Has Id</em>' + * operation. + * @see org.eclipse.papyrus.dd.dg.MarkedElement#referencedStartMarkerHasId(org.eclipse.emf.common.util.DiagnosticChain, + * java.util.Map) + * @generated + */ + EOperation getMarkedElement__ReferencedStartMarkerHasId__DiagnosticChain_Map(); + + /** + * Returns the meta object for the ' + * {@link org.eclipse.papyrus.dd.dg.MarkedElement#referencedMidMarkerHasId(org.eclipse.emf.common.util.DiagnosticChain, java.util.Map) + * <em>Referenced Mid Marker Has Id</em>}' operation. <!-- begin-user-doc + * --> <!-- end-user-doc --> + * + * @return the meta object for the '<em>Referenced Mid Marker Has Id</em>' + * operation. + * @see org.eclipse.papyrus.dd.dg.MarkedElement#referencedMidMarkerHasId(org.eclipse.emf.common.util.DiagnosticChain, + * java.util.Map) + * @generated + */ + EOperation getMarkedElement__ReferencedMidMarkerHasId__DiagnosticChain_Map(); + + /** + * Returns the meta object for the ' + * {@link org.eclipse.papyrus.dd.dg.MarkedElement#referencedEndMarkerHasId(org.eclipse.emf.common.util.DiagnosticChain, java.util.Map) + * <em>Referenced End Marker Has Id</em>}' operation. <!-- begin-user-doc + * --> <!-- end-user-doc --> + * + * @return the meta object for the '<em>Referenced End Marker Has Id</em>' + * operation. + * @see org.eclipse.papyrus.dd.dg.MarkedElement#referencedEndMarkerHasId(org.eclipse.emf.common.util.DiagnosticChain, + * java.util.Map) + * @generated + */ + EOperation getMarkedElement__ReferencedEndMarkerHasId__DiagnosticChain_Map(); + + /** * Returns the meta object for class ' * {@link org.eclipse.papyrus.dd.dg.Marker <em>Marker</em>}'. <!-- * begin-user-doc --> <!-- end-user-doc --> @@ -4762,18 +5460,32 @@ public interface DGPackage extends EPackage { /** * Returns the meta object for the containment reference list ' - * {@link org.eclipse.papyrus.dd.dg.Path#getCommand <em>Command</em>}'. <!-- - * begin-user-doc --> <!-- end-user-doc --> + * {@link org.eclipse.papyrus.dd.dg.Path#getCommands <em>Command</em>}'. + * <!-- begin-user-doc --> <!-- end-user-doc --> * * @return the meta object for the containment reference list ' * <em>Command</em>'. - * @see org.eclipse.papyrus.dd.dg.Path#getCommand() + * @see org.eclipse.papyrus.dd.dg.Path#getCommands() * @see #getPath() * @generated */ EReference getPath_Command(); /** + * Returns the meta object for the ' + * {@link org.eclipse.papyrus.dd.dg.Path#firstCommandMustBeMove(org.eclipse.emf.common.util.DiagnosticChain, java.util.Map) + * <em>First Command Must Be Move</em>}' operation. <!-- begin-user-doc --> + * <!-- end-user-doc --> + * + * @return the meta object for the '<em>First Command Must Be Move</em>' + * operation. + * @see org.eclipse.papyrus.dd.dg.Path#firstCommandMustBeMove(org.eclipse.emf.common.util.DiagnosticChain, + * java.util.Map) + * @generated + */ + EOperation getPath__FirstCommandMustBeMove__DiagnosticChain_Map(); + + /** * Returns the meta object for class ' * {@link org.eclipse.papyrus.dd.dg.Pattern <em>Pattern</em>}'. <!-- * begin-user-doc --> <!-- end-user-doc --> @@ -4821,12 +5533,12 @@ public interface DGPackage extends EPackage { /** * Returns the meta object for the containment reference list ' - * {@link org.eclipse.papyrus.dd.dg.Polygon#getPoint <em>Point</em>}'. <!-- + * {@link org.eclipse.papyrus.dd.dg.Polygon#getPoints <em>Point</em>}'. <!-- * begin-user-doc --> <!-- end-user-doc --> * * @return the meta object for the containment reference list ' * <em>Point</em>'. - * @see org.eclipse.papyrus.dd.dg.Polygon#getPoint() + * @see org.eclipse.papyrus.dd.dg.Polygon#getPoints() * @see #getPolygon() * @generated */ @@ -4845,12 +5557,12 @@ public interface DGPackage extends EPackage { /** * Returns the meta object for the containment reference list ' - * {@link org.eclipse.papyrus.dd.dg.Polyline#getPoint <em>Point</em>}'. <!-- - * begin-user-doc --> <!-- end-user-doc --> + * {@link org.eclipse.papyrus.dd.dg.Polyline#getPoints <em>Point</em>}'. + * <!-- begin-user-doc --> <!-- end-user-doc --> * * @return the meta object for the containment reference list ' * <em>Point</em>'. - * @see org.eclipse.papyrus.dd.dg.Polyline#getPoint() + * @see org.eclipse.papyrus.dd.dg.Polyline#getPoints() * @see #getPolyline() * @generated */ @@ -4978,6 +5690,20 @@ public interface DGPackage extends EPackage { EAttribute getRectangle_CornerRadius(); /** + * Returns the meta object for the ' + * {@link org.eclipse.papyrus.dd.dg.Rectangle#nonNegativeCornerRadius(org.eclipse.emf.common.util.DiagnosticChain, java.util.Map) + * <em>Non Negative Corner Radius</em>}' operation. <!-- begin-user-doc --> + * <!-- end-user-doc --> + * + * @return the meta object for the '<em>Non Negative Corner Radius</em>' + * operation. + * @see org.eclipse.papyrus.dd.dg.Rectangle#nonNegativeCornerRadius(org.eclipse.emf.common.util.DiagnosticChain, + * java.util.Map) + * @generated + */ + EOperation getRectangle__NonNegativeCornerRadius__DiagnosticChain_Map(); + + /** * Returns the meta object for class ' * {@link org.eclipse.papyrus.dd.dg.RootCanvas <em>Root Canvas</em>}'. <!-- * begin-user-doc --> <!-- end-user-doc --> @@ -5016,15 +5742,17 @@ public interface DGPackage extends EPackage { /** * Returns the meta object for the reference list ' - * {@link org.eclipse.papyrus.dd.dg.RootCanvas#getStyleSheet - * <em>Style Sheet</em>}'. <!-- begin-user-doc --> <!-- end-user-doc --> + * {@link org.eclipse.papyrus.dd.dg.RootCanvas#getExternalStyleSheets + * <em>External Style Sheet</em>}'. <!-- begin-user-doc --> <!-- + * end-user-doc --> * - * @return the meta object for the reference list '<em>Style Sheet</em>'. - * @see org.eclipse.papyrus.dd.dg.RootCanvas#getStyleSheet() + * @return the meta object for the reference list ' + * <em>External Style Sheet</em>'. + * @see org.eclipse.papyrus.dd.dg.RootCanvas#getExternalStyleSheets() * @see #getRootCanvas() * @generated */ - EReference getRootCanvas_StyleSheet(); + EReference getRootCanvas_ExternalStyleSheet(); /** * Returns the meta object for class ' @@ -5179,6 +5907,20 @@ public interface DGPackage extends EPackage { EReference getText_Position(); /** + * Returns the meta object for the ' + * {@link org.eclipse.papyrus.dd.dg.Text#dataCannotBeEmpty(org.eclipse.emf.common.util.DiagnosticChain, java.util.Map) + * <em>Data Cannot Be Empty</em>}' operation. <!-- begin-user-doc --> <!-- + * end-user-doc --> + * + * @return the meta object for the '<em>Data Cannot Be Empty</em>' + * operation. + * @see org.eclipse.papyrus.dd.dg.Text#dataCannotBeEmpty(org.eclipse.emf.common.util.DiagnosticChain, + * java.util.Map) + * @generated + */ + EOperation getText__DataCannotBeEmpty__DiagnosticChain_Map(); + + /** * Returns the meta object for class ' * {@link org.eclipse.papyrus.dd.dg.Translate <em>Translate</em>}'. <!-- * begin-user-doc --> <!-- end-user-doc --> @@ -5236,6 +5978,33 @@ public interface DGPackage extends EPackage { EReference getUse_Bounds(); /** + * Returns the meta object for the reference ' + * {@link org.eclipse.papyrus.dd.dg.Use#getReferencedElement + * <em>Referenced Element</em>}'. <!-- begin-user-doc --> <!-- end-user-doc + * --> + * + * @return the meta object for the reference '<em>Referenced Element</em>'. + * @see org.eclipse.papyrus.dd.dg.Use#getReferencedElement() + * @see #getUse() + * @generated + */ + EReference getUse_ReferencedElement(); + + /** + * Returns the meta object for the ' + * {@link org.eclipse.papyrus.dd.dg.Use#referencedElementHasId(org.eclipse.emf.common.util.DiagnosticChain, java.util.Map) + * <em>Referenced Element Has Id</em>}' operation. <!-- begin-user-doc --> + * <!-- end-user-doc --> + * + * @return the meta object for the '<em>Referenced Element Has Id</em>' + * operation. + * @see org.eclipse.papyrus.dd.dg.Use#referencedElementHasId(org.eclipse.emf.common.util.DiagnosticChain, + * java.util.Map) + * @generated + */ + EOperation getUse__ReferencedElementHasId__DiagnosticChain_Map(); + + /** * Returns the meta object for enum ' * {@link org.eclipse.papyrus.dd.dg.FontDecoration <em>Font Decoration</em>} * '. <!-- begin-user-doc --> <!-- end-user-doc --> @@ -5247,6 +6016,17 @@ public interface DGPackage extends EPackage { EEnum getFontDecoration(); /** + * Returns the meta object for enum ' + * {@link org.eclipse.papyrus.dd.dg.ElementKind <em>Element Kind</em>}'. + * <!-- begin-user-doc --> <!-- end-user-doc --> + * + * @return the meta object for enum '<em>Element Kind</em>'. + * @see org.eclipse.papyrus.dd.dg.ElementKind + * @generated + */ + EEnum getElementKind(); + + /** * Returns the factory that creates the instances of the model. <!-- * begin-user-doc --> <!-- end-user-doc --> * @@ -5291,6 +6071,16 @@ public interface DGPackage extends EPackage { /** * The meta object literal for the ' + * <em><b>Canvas Cannot Have Transforms</b></em>' operation. <!-- + * begin-user-doc --> <!-- end-user-doc --> + * + * @generated + */ + EOperation CANVAS___CANVAS_CANNOT_HAVE_TRANSFORMS__DIAGNOSTICCHAIN_MAP = eINSTANCE + .getCanvas__CanvasCannotHaveTransforms__DiagnosticChain_Map(); + + /** + * The meta object literal for the ' * {@link org.eclipse.papyrus.dd.dg.impl.GroupImpl <em>Group</em>}' * class. <!-- begin-user-doc --> <!-- end-user-doc --> * @@ -5339,13 +6129,13 @@ public interface DGPackage extends EPackage { .getGraphicalElement_Group(); /** - * The meta object literal for the '<em><b>Keyword</b></em>' attribute + * The meta object literal for the '<em><b>Class</b></em>' attribute * list feature. <!-- begin-user-doc --> <!-- end-user-doc --> * * @generated */ - EAttribute GRAPHICAL_ELEMENT__KEYWORD = eINSTANCE - .getGraphicalElement_Keyword(); + EAttribute GRAPHICAL_ELEMENT__CLASS = eINSTANCE + .getGraphicalElement_Class(); /** * The meta object literal for the '<em><b>Style</b></em>' containment @@ -5368,6 +6158,16 @@ public interface DGPackage extends EPackage { /** * The meta object literal for the ' + * <em><b>Referenced Clippath Has Id</b></em>' operation. <!-- + * begin-user-doc --> <!-- end-user-doc --> + * + * @generated + */ + EOperation GRAPHICAL_ELEMENT___REFERENCED_CLIPPATH_HAS_ID__DIAGNOSTICCHAIN_MAP = eINSTANCE + .getGraphicalElement__ReferencedClippathHasId__DiagnosticChain_Map(); + + /** + * The meta object literal for the ' * {@link org.eclipse.papyrus.dd.dg.impl.DefinitionImpl * <em>Definition</em>}' class. <!-- begin-user-doc --> <!-- * end-user-doc --> @@ -5387,6 +6187,15 @@ public interface DGPackage extends EPackage { EAttribute DEFINITION__ID = eINSTANCE.getDefinition_Id(); /** + * The meta object literal for the '<em><b>Id Cannot Be Empty</b></em>' + * operation. <!-- begin-user-doc --> <!-- end-user-doc --> + * + * @generated + */ + EOperation DEFINITION___ID_CANNOT_BE_EMPTY__DIAGNOSTICCHAIN_MAP = eINSTANCE + .getDefinition__IdCannotBeEmpty__DiagnosticChain_Map(); + + /** * The meta object literal for the ' * {@link org.eclipse.papyrus.dd.dg.impl.MoveToImpl <em>Move To</em>}' * class. <!-- begin-user-doc --> <!-- end-user-doc --> @@ -5613,6 +6422,16 @@ public interface DGPackage extends EPackage { /** * The meta object literal for the ' + * <em><b>Referenced Paint Server Has Id</b></em>' operation. <!-- + * begin-user-doc --> <!-- end-user-doc --> + * + * @generated + */ + EOperation PAINT___REFERENCED_PAINT_SERVER_HAS_ID__DIAGNOSTICCHAIN_MAP = eINSTANCE + .getPaint__ReferencedPaintServerHasId__DiagnosticChain_Map(); + + /** + * The meta object literal for the ' * {@link org.eclipse.papyrus.dd.dg.impl.PaintServerImpl * <em>Paint Server</em>}' class. <!-- begin-user-doc --> <!-- * end-user-doc --> @@ -5827,21 +6646,20 @@ public interface DGPackage extends EPackage { EClass STYLE_SELECTOR = eINSTANCE.getStyleSelector(); /** - * The meta object literal for the '<em><b>Type</b></em>' reference + * The meta object literal for the '<em><b>Kind</b></em>' attribute * feature. <!-- begin-user-doc --> <!-- end-user-doc --> * * @generated */ - EReference STYLE_SELECTOR__TYPE = eINSTANCE.getStyleSelector_Type(); + EAttribute STYLE_SELECTOR__KIND = eINSTANCE.getStyleSelector_Kind(); /** - * The meta object literal for the '<em><b>Keyword</b></em>' attribute + * The meta object literal for the '<em><b>Class</b></em>' attribute * list feature. <!-- begin-user-doc --> <!-- end-user-doc --> * * @generated */ - EAttribute STYLE_SELECTOR__KEYWORD = eINSTANCE - .getStyleSelector_Keyword(); + EAttribute STYLE_SELECTOR__CLASS = eINSTANCE.getStyleSelector_Class(); /** * The meta object literal for the ' @@ -5872,15 +6690,15 @@ public interface DGPackage extends EPackage { /** * The meta object literal for the ' - * {@link org.eclipse.papyrus.dd.dg.impl.EllipticalCurveToImpl - * <em>Elliptical Curve To</em>}' class. <!-- begin-user-doc --> <!-- + * {@link org.eclipse.papyrus.dd.dg.impl.EllipticalArcToImpl + * <em>Elliptical Arc To</em>}' class. <!-- begin-user-doc --> <!-- * end-user-doc --> * - * @see org.eclipse.papyrus.dd.dg.impl.EllipticalCurveToImpl - * @see org.eclipse.papyrus.dd.dg.impl.DGPackageImpl#getEllipticalCurveTo() + * @see org.eclipse.papyrus.dd.dg.impl.EllipticalArcToImpl + * @see org.eclipse.papyrus.dd.dg.impl.DGPackageImpl#getEllipticalArcTo() * @generated */ - EClass ELLIPTICAL_CURVE_TO = eINSTANCE.getEllipticalCurveTo(); + EClass ELLIPTICAL_ARC_TO = eINSTANCE.getEllipticalArcTo(); /** * The meta object literal for the '<em><b>Point</b></em>' containment @@ -5888,8 +6706,8 @@ public interface DGPackage extends EPackage { * * @generated */ - EReference ELLIPTICAL_CURVE_TO__POINT = eINSTANCE - .getEllipticalCurveTo_Point(); + EReference ELLIPTICAL_ARC_TO__POINT = eINSTANCE + .getEllipticalArcTo_Point(); /** * The meta object literal for the '<em><b>Radii</b></em>' containment @@ -5897,8 +6715,8 @@ public interface DGPackage extends EPackage { * * @generated */ - EReference ELLIPTICAL_CURVE_TO__RADII = eINSTANCE - .getEllipticalCurveTo_Radii(); + EReference ELLIPTICAL_ARC_TO__RADII = eINSTANCE + .getEllipticalArcTo_Radii(); /** * The meta object literal for the '<em><b>Rotation</b></em>' attribute @@ -5906,8 +6724,8 @@ public interface DGPackage extends EPackage { * * @generated */ - EAttribute ELLIPTICAL_CURVE_TO__ROTATION = eINSTANCE - .getEllipticalCurveTo_Rotation(); + EAttribute ELLIPTICAL_ARC_TO__ROTATION = eINSTANCE + .getEllipticalArcTo_Rotation(); /** * The meta object literal for the '<em><b>Is Large Arc</b></em>' @@ -5915,8 +6733,8 @@ public interface DGPackage extends EPackage { * * @generated */ - EAttribute ELLIPTICAL_CURVE_TO__IS_LARGE_ARC = eINSTANCE - .getEllipticalCurveTo_IsLargeArc(); + EAttribute ELLIPTICAL_ARC_TO__IS_LARGE_ARC = eINSTANCE + .getEllipticalArcTo_IsLargeArc(); /** * The meta object literal for the '<em><b>Is Sweep</b></em>' attribute @@ -5924,8 +6742,8 @@ public interface DGPackage extends EPackage { * * @generated */ - EAttribute ELLIPTICAL_CURVE_TO__IS_SWEEP = eINSTANCE - .getEllipticalCurveTo_IsSweep(); + EAttribute ELLIPTICAL_ARC_TO__IS_SWEEP = eINSTANCE + .getEllipticalArcTo_IsSweep(); /** * The meta object literal for the ' @@ -6069,6 +6887,16 @@ public interface DGPackage extends EPackage { /** * The meta object literal for the ' + * <em><b>Source Cannot Be Empty</b></em>' operation. <!-- + * begin-user-doc --> <!-- end-user-doc --> + * + * @generated + */ + EOperation IMAGE___SOURCE_CANNOT_BE_EMPTY__DIAGNOSTICCHAIN_MAP = eINSTANCE + .getImage__SourceCannotBeEmpty__DiagnosticChain_Map(); + + /** + * The meta object literal for the ' * {@link org.eclipse.papyrus.dd.dg.impl.LineImpl <em>Line</em>}' class. * <!-- begin-user-doc --> <!-- end-user-doc --> * @@ -6135,6 +6963,36 @@ public interface DGPackage extends EPackage { /** * The meta object literal for the ' + * <em><b>Referenced Start Marker Has Id</b></em>' operation. <!-- + * begin-user-doc --> <!-- end-user-doc --> + * + * @generated + */ + EOperation MARKED_ELEMENT___REFERENCED_START_MARKER_HAS_ID__DIAGNOSTICCHAIN_MAP = eINSTANCE + .getMarkedElement__ReferencedStartMarkerHasId__DiagnosticChain_Map(); + + /** + * The meta object literal for the ' + * <em><b>Referenced Mid Marker Has Id</b></em>' operation. <!-- + * begin-user-doc --> <!-- end-user-doc --> + * + * @generated + */ + EOperation MARKED_ELEMENT___REFERENCED_MID_MARKER_HAS_ID__DIAGNOSTICCHAIN_MAP = eINSTANCE + .getMarkedElement__ReferencedMidMarkerHasId__DiagnosticChain_Map(); + + /** + * The meta object literal for the ' + * <em><b>Referenced End Marker Has Id</b></em>' operation. <!-- + * begin-user-doc --> <!-- end-user-doc --> + * + * @generated + */ + EOperation MARKED_ELEMENT___REFERENCED_END_MARKER_HAS_ID__DIAGNOSTICCHAIN_MAP = eINSTANCE + .getMarkedElement__ReferencedEndMarkerHasId__DiagnosticChain_Map(); + + /** + * The meta object literal for the ' * {@link org.eclipse.papyrus.dd.dg.impl.MarkerImpl <em>Marker</em>}' * class. <!-- begin-user-doc --> <!-- end-user-doc --> * @@ -6298,6 +7156,16 @@ public interface DGPackage extends EPackage { /** * The meta object literal for the ' + * <em><b>First Command Must Be Move</b></em>' operation. <!-- + * begin-user-doc --> <!-- end-user-doc --> + * + * @generated + */ + EOperation PATH___FIRST_COMMAND_MUST_BE_MOVE__DIAGNOSTICCHAIN_MAP = eINSTANCE + .getPath__FirstCommandMustBeMove__DiagnosticChain_Map(); + + /** + * The meta object literal for the ' * {@link org.eclipse.papyrus.dd.dg.impl.PatternImpl <em>Pattern</em>}' * class. <!-- begin-user-doc --> <!-- end-user-doc --> * @@ -6457,6 +7325,16 @@ public interface DGPackage extends EPackage { /** * The meta object literal for the ' + * <em><b>Non Negative Corner Radius</b></em>' operation. <!-- + * begin-user-doc --> <!-- end-user-doc --> + * + * @generated + */ + EOperation RECTANGLE___NON_NEGATIVE_CORNER_RADIUS__DIAGNOSTICCHAIN_MAP = eINSTANCE + .getRectangle__NonNegativeCornerRadius__DiagnosticChain_Map(); + + /** + * The meta object literal for the ' * {@link org.eclipse.papyrus.dd.dg.impl.RootCanvasImpl * <em>Root Canvas</em>}' class. <!-- begin-user-doc --> <!-- * end-user-doc --> @@ -6487,13 +7365,14 @@ public interface DGPackage extends EPackage { .getRootCanvas_Definitions(); /** - * The meta object literal for the '<em><b>Style Sheet</b></em>' - * reference list feature. <!-- begin-user-doc --> <!-- end-user-doc --> + * The meta object literal for the '<em><b>External Style Sheet</b></em> + * ' reference list feature. <!-- begin-user-doc --> <!-- end-user-doc + * --> * * @generated */ - EReference ROOT_CANVAS__STYLE_SHEET = eINSTANCE - .getRootCanvas_StyleSheet(); + EReference ROOT_CANVAS__EXTERNAL_STYLE_SHEET = eINSTANCE + .getRootCanvas_ExternalStyleSheet(); /** * The meta object literal for the ' @@ -6614,6 +7493,15 @@ public interface DGPackage extends EPackage { EReference TEXT__POSITION = eINSTANCE.getText_Position(); /** + * The meta object literal for the '<em><b>Data Cannot Be Empty</b></em> + * ' operation. <!-- begin-user-doc --> <!-- end-user-doc --> + * + * @generated + */ + EOperation TEXT___DATA_CANNOT_BE_EMPTY__DIAGNOSTICCHAIN_MAP = eINSTANCE + .getText__DataCannotBeEmpty__DiagnosticChain_Map(); + + /** * The meta object literal for the ' * {@link org.eclipse.papyrus.dd.dg.impl.TranslateImpl * <em>Translate</em>}' class. <!-- begin-user-doc --> <!-- end-user-doc @@ -6661,6 +7549,25 @@ public interface DGPackage extends EPackage { EReference USE__BOUNDS = eINSTANCE.getUse_Bounds(); /** + * The meta object literal for the '<em><b>Referenced Element</b></em>' + * reference feature. <!-- begin-user-doc --> <!-- end-user-doc --> + * + * @generated + */ + EReference USE__REFERENCED_ELEMENT = eINSTANCE + .getUse_ReferencedElement(); + + /** + * The meta object literal for the ' + * <em><b>Referenced Element Has Id</b></em>' operation. <!-- + * begin-user-doc --> <!-- end-user-doc --> + * + * @generated + */ + EOperation USE___REFERENCED_ELEMENT_HAS_ID__DIAGNOSTICCHAIN_MAP = eINSTANCE + .getUse__ReferencedElementHasId__DiagnosticChain_Map(); + + /** * The meta object literal for the ' * {@link org.eclipse.papyrus.dd.dg.FontDecoration * <em>Font Decoration</em>}' enum. <!-- begin-user-doc --> <!-- @@ -6672,6 +7579,17 @@ public interface DGPackage extends EPackage { */ EEnum FONT_DECORATION = eINSTANCE.getFontDecoration(); + /** + * The meta object literal for the ' + * {@link org.eclipse.papyrus.dd.dg.ElementKind <em>Element Kind</em>}' + * enum. <!-- begin-user-doc --> <!-- end-user-doc --> + * + * @see org.eclipse.papyrus.dd.dg.ElementKind + * @see org.eclipse.papyrus.dd.dg.impl.DGPackageImpl#getElementKind() + * @generated + */ + EEnum ELEMENT_KIND = eINSTANCE.getElementKind(); + } } // DGPackage diff --git a/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/Definition.java b/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/Definition.java index a1aa5433109..ecadd73bdd5 100644 --- a/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/Definition.java +++ b/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/Definition.java @@ -11,6 +11,8 @@ */ package org.eclipse.papyrus.dd.dg; +import java.util.Map; +import org.eclipse.emf.common.util.DiagnosticChain; import org.eclipse.emf.ecore.EObject; /** @@ -38,7 +40,7 @@ public interface Definition extends EObject { * @see #setId(String) * @see org.eclipse.papyrus.dd.dg.DGPackage#getDefinition_Id() * @model id="true" dataType="org.eclipse.papyrus.dd.dc.String" - * required="true" ordered="false" + * ordered="false" * @generated */ String getId(); @@ -54,4 +56,19 @@ public interface Definition extends EObject { */ void setId(String value); + /** + * <!-- begin-user-doc --> <!-- end-user-doc --> <!-- begin-model-doc --> + * + * @param diagnostics + * The chain of diagnostics to which problems are to be appended. + * @param context + * The cache of context-specific information. <!-- end-model-doc + * --> + * @model annotation= + * "http://www.eclipse.org/emf/2002/Ecore/OCL body='id->notEmpty() implies id.size() > 0'" + * @generated + */ + boolean idCannotBeEmpty(DiagnosticChain diagnostics, + Map<Object, Object> context); + } // Definition diff --git a/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/Definitions.java b/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/Definitions.java index 9a802eb5602..d84d3ca0421 100644 --- a/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/Definitions.java +++ b/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/Definitions.java @@ -22,7 +22,7 @@ import org.eclipse.emf.ecore.EObject; * <p> * The following features are supported: * <ul> - * <li>{@link org.eclipse.papyrus.dd.dg.Definitions#getDefnition <em>Defnition + * <li>{@link org.eclipse.papyrus.dd.dg.Definitions#getDefnitions <em>Defnition * </em>}</li> * <li>{@link org.eclipse.papyrus.dd.dg.Definitions#getStyleSheet <em>Style * Sheet</em>}</li> @@ -47,7 +47,7 @@ public interface Definitions extends EObject { * @model containment="true" * @generated */ - EList<Definition> getDefnition(); + EList<Definition> getDefnitions(); /** * Returns the value of the '<em><b>Style Sheet</b></em>' containment diff --git a/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/ElementKind.java b/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/ElementKind.java new file mode 100644 index 00000000000..1e6ea7ae2c3 --- /dev/null +++ b/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/ElementKind.java @@ -0,0 +1,542 @@ +/** + * Copyright (c) 2014 CEA LIST. + * + * 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: + * CEA LIST - Initial API and implementation + */ +package org.eclipse.papyrus.dd.dg; + +import java.util.Arrays; +import java.util.Collections; +import java.util.List; + +import org.eclipse.emf.common.util.Enumerator; + +/** + * <!-- begin-user-doc --> A representation of the literals of the enumeration ' + * <em><b>Element Kind</b></em>', and utility methods for working with them. + * <!-- end-user-doc --> + * + * @see org.eclipse.papyrus.dd.dg.DGPackage#getElementKind() + * @model + * @generated + */ +public enum ElementKind implements Enumerator { + /** + * The '<em><b>Canvas</b></em>' literal object. <!-- begin-user-doc --> <!-- + * end-user-doc --> + * + * @see #CANVAS_VALUE + * @generated + * @ordered + */ + CANVAS(0, "canvas", "canvas"), + + /** + * The '<em><b>Circle</b></em>' literal object. <!-- begin-user-doc --> <!-- + * end-user-doc --> + * + * @see #CIRCLE_VALUE + * @generated + * @ordered + */ + CIRCLE(1, "circle", "circle"), + + /** + * The '<em><b>Clip Path</b></em>' literal object. <!-- begin-user-doc --> + * <!-- end-user-doc --> + * + * @see #CLIP_PATH_VALUE + * @generated + * @ordered + */ + CLIP_PATH(2, "clipPath", "clipPath"), + + /** + * The '<em><b>Ellipse</b></em>' literal object. <!-- begin-user-doc --> + * <!-- end-user-doc --> + * + * @see #ELLIPSE_VALUE + * @generated + * @ordered + */ + ELLIPSE(3, "ellipse", "ellipse"), + + /** + * The '<em><b>Group</b></em>' literal object. <!-- begin-user-doc --> <!-- + * end-user-doc --> + * + * @see #GROUP_VALUE + * @generated + * @ordered + */ + GROUP(4, "group", "group"), + + /** + * The '<em><b>Image</b></em>' literal object. <!-- begin-user-doc --> <!-- + * end-user-doc --> + * + * @see #IMAGE_VALUE + * @generated + * @ordered + */ + IMAGE(5, "image", "image"), + + /** + * The '<em><b>Line</b></em>' literal object. <!-- begin-user-doc --> <!-- + * end-user-doc --> + * + * @see #LINE_VALUE + * @generated + * @ordered + */ + LINE(6, "line", "line"), + + /** + * The '<em><b>Marker</b></em>' literal object. <!-- begin-user-doc --> <!-- + * end-user-doc --> + * + * @see #MARKER_VALUE + * @generated + * @ordered + */ + MARKER(7, "marker", "marker"), + + /** + * The '<em><b>Path</b></em>' literal object. <!-- begin-user-doc --> <!-- + * end-user-doc --> + * + * @see #PATH_VALUE + * @generated + * @ordered + */ + PATH(8, "path", "path"), + + /** + * The '<em><b>Polygon</b></em>' literal object. <!-- begin-user-doc --> + * <!-- end-user-doc --> + * + * @see #POLYGON_VALUE + * @generated + * @ordered + */ + POLYGON(9, "polygon", "polygon"), + + /** + * The '<em><b>Polyline</b></em>' literal object. <!-- begin-user-doc --> + * <!-- end-user-doc --> + * + * @see #POLYLINE_VALUE + * @generated + * @ordered + */ + POLYLINE(10, "polyline", "polyline"), + + /** + * The '<em><b>Rectangle</b></em>' literal object. <!-- begin-user-doc --> + * <!-- end-user-doc --> + * + * @see #RECTANGLE_VALUE + * @generated + * @ordered + */ + RECTANGLE(11, "rectangle", "rectangle"), + + /** + * The '<em><b>Text</b></em>' literal object. <!-- begin-user-doc --> <!-- + * end-user-doc --> + * + * @see #TEXT_VALUE + * @generated + * @ordered + */ + TEXT(12, "text", "text"), + + /** + * The '<em><b>Use</b></em>' literal object. <!-- begin-user-doc --> <!-- + * end-user-doc --> + * + * @see #USE_VALUE + * @generated + * @ordered + */ + USE(13, "use", "use"); + + /** + * The '<em><b>Canvas</b></em>' literal value. <!-- begin-user-doc --> + * <p> + * If the meaning of '<em><b>Canvas</b></em>' literal object isn't clear, + * there really should be more of a description here... + * </p> + * <!-- end-user-doc --> + * + * @see #CANVAS + * @model name="canvas" + * @generated + * @ordered + */ + public static final int CANVAS_VALUE = 0; + + /** + * The '<em><b>Circle</b></em>' literal value. <!-- begin-user-doc --> + * <p> + * If the meaning of '<em><b>Circle</b></em>' literal object isn't clear, + * there really should be more of a description here... + * </p> + * <!-- end-user-doc --> + * + * @see #CIRCLE + * @model name="circle" + * @generated + * @ordered + */ + public static final int CIRCLE_VALUE = 1; + + /** + * The '<em><b>Clip Path</b></em>' literal value. <!-- begin-user-doc --> + * <p> + * If the meaning of '<em><b>Clip Path</b></em>' literal object isn't clear, + * there really should be more of a description here... + * </p> + * <!-- end-user-doc --> + * + * @see #CLIP_PATH + * @model name="clipPath" + * @generated + * @ordered + */ + public static final int CLIP_PATH_VALUE = 2; + + /** + * The '<em><b>Ellipse</b></em>' literal value. <!-- begin-user-doc --> + * <p> + * If the meaning of '<em><b>Ellipse</b></em>' literal object isn't clear, + * there really should be more of a description here... + * </p> + * <!-- end-user-doc --> + * + * @see #ELLIPSE + * @model name="ellipse" + * @generated + * @ordered + */ + public static final int ELLIPSE_VALUE = 3; + + /** + * The '<em><b>Group</b></em>' literal value. <!-- begin-user-doc --> + * <p> + * If the meaning of '<em><b>Group</b></em>' literal object isn't clear, + * there really should be more of a description here... + * </p> + * <!-- end-user-doc --> + * + * @see #GROUP + * @model name="group" + * @generated + * @ordered + */ + public static final int GROUP_VALUE = 4; + + /** + * The '<em><b>Image</b></em>' literal value. <!-- begin-user-doc --> + * <p> + * If the meaning of '<em><b>Image</b></em>' literal object isn't clear, + * there really should be more of a description here... + * </p> + * <!-- end-user-doc --> + * + * @see #IMAGE + * @model name="image" + * @generated + * @ordered + */ + public static final int IMAGE_VALUE = 5; + + /** + * The '<em><b>Line</b></em>' literal value. <!-- begin-user-doc --> + * <p> + * If the meaning of '<em><b>Line</b></em>' literal object isn't clear, + * there really should be more of a description here... + * </p> + * <!-- end-user-doc --> + * + * @see #LINE + * @model name="line" + * @generated + * @ordered + */ + public static final int LINE_VALUE = 6; + + /** + * The '<em><b>Marker</b></em>' literal value. <!-- begin-user-doc --> + * <p> + * If the meaning of '<em><b>Marker</b></em>' literal object isn't clear, + * there really should be more of a description here... + * </p> + * <!-- end-user-doc --> + * + * @see #MARKER + * @model name="marker" + * @generated + * @ordered + */ + public static final int MARKER_VALUE = 7; + + /** + * The '<em><b>Path</b></em>' literal value. <!-- begin-user-doc --> + * <p> + * If the meaning of '<em><b>Path</b></em>' literal object isn't clear, + * there really should be more of a description here... + * </p> + * <!-- end-user-doc --> + * + * @see #PATH + * @model name="path" + * @generated + * @ordered + */ + public static final int PATH_VALUE = 8; + + /** + * The '<em><b>Polygon</b></em>' literal value. <!-- begin-user-doc --> + * <p> + * If the meaning of '<em><b>Polygon</b></em>' literal object isn't clear, + * there really should be more of a description here... + * </p> + * <!-- end-user-doc --> + * + * @see #POLYGON + * @model name="polygon" + * @generated + * @ordered + */ + public static final int POLYGON_VALUE = 9; + + /** + * The '<em><b>Polyline</b></em>' literal value. <!-- begin-user-doc --> + * <p> + * If the meaning of '<em><b>Polyline</b></em>' literal object isn't clear, + * there really should be more of a description here... + * </p> + * <!-- end-user-doc --> + * + * @see #POLYLINE + * @model name="polyline" + * @generated + * @ordered + */ + public static final int POLYLINE_VALUE = 10; + + /** + * The '<em><b>Rectangle</b></em>' literal value. <!-- begin-user-doc --> + * <p> + * If the meaning of '<em><b>Rectangle</b></em>' literal object isn't clear, + * there really should be more of a description here... + * </p> + * <!-- end-user-doc --> + * + * @see #RECTANGLE + * @model name="rectangle" + * @generated + * @ordered + */ + public static final int RECTANGLE_VALUE = 11; + + /** + * The '<em><b>Text</b></em>' literal value. <!-- begin-user-doc --> + * <p> + * If the meaning of '<em><b>Text</b></em>' literal object isn't clear, + * there really should be more of a description here... + * </p> + * <!-- end-user-doc --> + * + * @see #TEXT + * @model name="text" + * @generated + * @ordered + */ + public static final int TEXT_VALUE = 12; + + /** + * The '<em><b>Use</b></em>' literal value. <!-- begin-user-doc --> + * <p> + * If the meaning of '<em><b>Use</b></em>' literal object isn't clear, there + * really should be more of a description here... + * </p> + * <!-- end-user-doc --> + * + * @see #USE + * @model name="use" + * @generated + * @ordered + */ + public static final int USE_VALUE = 13; + + /** + * An array of all the '<em><b>Element Kind</b></em>' enumerators. <!-- + * begin-user-doc --> <!-- end-user-doc --> + * + * @generated + */ + private static final ElementKind[] VALUES_ARRAY = new ElementKind[] { + CANVAS, CIRCLE, CLIP_PATH, ELLIPSE, GROUP, IMAGE, LINE, MARKER, + PATH, POLYGON, POLYLINE, RECTANGLE, TEXT, USE, }; + + /** + * A public read-only list of all the '<em><b>Element Kind</b></em>' + * enumerators. <!-- begin-user-doc --> <!-- end-user-doc --> + * + * @generated + */ + public static final List<ElementKind> VALUES = Collections + .unmodifiableList(Arrays.asList(VALUES_ARRAY)); + + /** + * Returns the '<em><b>Element Kind</b></em>' literal with the specified + * literal value. <!-- begin-user-doc --> <!-- end-user-doc --> + * + * @generated + */ + public static ElementKind get(String literal) { + for (int i = 0; i < VALUES_ARRAY.length; ++i) { + ElementKind result = VALUES_ARRAY[i]; + if (result.toString().equals(literal)) { + return result; + } + } + return null; + } + + /** + * Returns the '<em><b>Element Kind</b></em>' literal with the specified + * name. <!-- begin-user-doc --> <!-- end-user-doc --> + * + * @generated + */ + public static ElementKind getByName(String name) { + for (int i = 0; i < VALUES_ARRAY.length; ++i) { + ElementKind result = VALUES_ARRAY[i]; + if (result.getName().equals(name)) { + return result; + } + } + return null; + } + + /** + * Returns the '<em><b>Element Kind</b></em>' literal with the specified + * integer value. <!-- begin-user-doc --> <!-- end-user-doc --> + * + * @generated + */ + public static ElementKind get(int value) { + switch (value) { + case CANVAS_VALUE: + return CANVAS; + case CIRCLE_VALUE: + return CIRCLE; + case CLIP_PATH_VALUE: + return CLIP_PATH; + case ELLIPSE_VALUE: + return ELLIPSE; + case GROUP_VALUE: + return GROUP; + case IMAGE_VALUE: + return IMAGE; + case LINE_VALUE: + return LINE; + case MARKER_VALUE: + return MARKER; + case PATH_VALUE: + return PATH; + case POLYGON_VALUE: + return POLYGON; + case POLYLINE_VALUE: + return POLYLINE; + case RECTANGLE_VALUE: + return RECTANGLE; + case TEXT_VALUE: + return TEXT; + case USE_VALUE: + return USE; + } + return null; + } + + /** + * <!-- begin-user-doc --> <!-- end-user-doc --> + * + * @generated + */ + private final int value; + + /** + * <!-- begin-user-doc --> <!-- end-user-doc --> + * + * @generated + */ + private final String name; + + /** + * <!-- begin-user-doc --> <!-- end-user-doc --> + * + * @generated + */ + private final String literal; + + /** + * Only this class can construct instances. <!-- begin-user-doc --> <!-- + * end-user-doc --> + * + * @generated + */ + private ElementKind(int value, String name, String literal) { + this.value = value; + this.name = name; + this.literal = literal; + } + + /** + * <!-- begin-user-doc --> <!-- end-user-doc --> + * + * @generated + */ + public int getValue() { + return value; + } + + /** + * <!-- begin-user-doc --> <!-- end-user-doc --> + * + * @generated + */ + public String getName() { + return name; + } + + /** + * <!-- begin-user-doc --> <!-- end-user-doc --> + * + * @generated + */ + public String getLiteral() { + return literal; + } + + /** + * Returns the literal value of the enumerator, which is its string + * representation. <!-- begin-user-doc --> <!-- end-user-doc --> + * + * @generated + */ + @Override + public String toString() { + return literal; + } + +} // ElementKind diff --git a/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/EllipticalCurveTo.java b/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/EllipticalArcTo.java index 958aeeee478..a94a420d1bc 100644 --- a/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/EllipticalCurveTo.java +++ b/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/EllipticalArcTo.java @@ -16,56 +16,29 @@ import org.eclipse.papyrus.dd.dc.Point; /** * <!-- begin-user-doc --> A representation of the model object ' - * <em><b>Elliptical Curve To</b></em>'. <!-- end-user-doc --> + * <em><b>Elliptical Arc To</b></em>'. <!-- end-user-doc --> * * <p> * The following features are supported: * <ul> - * <li>{@link org.eclipse.papyrus.dd.dg.EllipticalCurveTo#getPoint <em>Point + * <li>{@link org.eclipse.papyrus.dd.dg.EllipticalArcTo#getRadii <em>Radii</em>} + * </li> + * <li>{@link org.eclipse.papyrus.dd.dg.EllipticalArcTo#getRotation <em>Rotation * </em>}</li> - * <li>{@link org.eclipse.papyrus.dd.dg.EllipticalCurveTo#getRadii <em>Radii - * </em>}</li> - * <li>{@link org.eclipse.papyrus.dd.dg.EllipticalCurveTo#getRotation <em> - * Rotation</em>}</li> - * <li>{@link org.eclipse.papyrus.dd.dg.EllipticalCurveTo#isLargeArc <em>Is - * Large Arc</em>}</li> - * <li>{@link org.eclipse.papyrus.dd.dg.EllipticalCurveTo#isSweep <em>Is Sweep + * <li>{@link org.eclipse.papyrus.dd.dg.EllipticalArcTo#isLargeArc <em>Is Large + * Arc</em>}</li> + * <li>{@link org.eclipse.papyrus.dd.dg.EllipticalArcTo#isSweep <em>Is Sweep * </em>}</li> + * <li>{@link org.eclipse.papyrus.dd.dg.EllipticalArcTo#getPoint <em>Point</em>} + * </li> * </ul> * </p> * - * @see org.eclipse.papyrus.dd.dg.DGPackage#getEllipticalCurveTo() + * @see org.eclipse.papyrus.dd.dg.DGPackage#getEllipticalArcTo() * @model * @generated */ -public interface EllipticalCurveTo extends PathCommand { - /** - * Returns the value of the '<em><b>Point</b></em>' containment reference. - * <!-- begin-user-doc --> <!-- end-user-doc --> <!-- begin-model-doc --> a - * point to draw an elliptical arc to from the current point in the - * coordinate system. <!-- end-model-doc --> - * - * @return the value of the '<em>Point</em>' containment reference. - * @see #setPoint(Point) - * @see org.eclipse.papyrus.dd.dg.DGPackage#getEllipticalCurveTo_Point() - * @model containment="true" required="true" ordered="false" - * @generated - */ - Point getPoint(); - - /** - * Sets the value of the ' - * {@link org.eclipse.papyrus.dd.dg.EllipticalCurveTo#getPoint - * <em>Point</em>}' containment reference. <!-- begin-user-doc --> <!-- - * end-user-doc --> - * - * @param value - * the new value of the '<em>Point</em>' containment reference. - * @see #getPoint() - * @generated - */ - void setPoint(Point value); - +public interface EllipticalArcTo extends PathCommand { /** * Returns the value of the '<em><b>Radii</b></em>' containment reference. * <!-- begin-user-doc --> <!-- end-user-doc --> <!-- begin-model-doc --> @@ -74,7 +47,7 @@ public interface EllipticalCurveTo extends PathCommand { * * @return the value of the '<em>Radii</em>' containment reference. * @see #setRadii(Dimension) - * @see org.eclipse.papyrus.dd.dg.DGPackage#getEllipticalCurveTo_Radii() + * @see org.eclipse.papyrus.dd.dg.DGPackage#getEllipticalArcTo_Radii() * @model containment="true" required="true" ordered="false" * @generated */ @@ -82,9 +55,8 @@ public interface EllipticalCurveTo extends PathCommand { /** * Sets the value of the ' - * {@link org.eclipse.papyrus.dd.dg.EllipticalCurveTo#getRadii - * <em>Radii</em>}' containment reference. <!-- begin-user-doc --> <!-- - * end-user-doc --> + * {@link org.eclipse.papyrus.dd.dg.EllipticalArcTo#getRadii <em>Radii</em>} + * ' containment reference. <!-- begin-user-doc --> <!-- end-user-doc --> * * @param value * the new value of the '<em>Radii</em>' containment reference. @@ -101,7 +73,7 @@ public interface EllipticalCurveTo extends PathCommand { * * @return the value of the '<em>Rotation</em>' attribute. * @see #setRotation(double) - * @see org.eclipse.papyrus.dd.dg.DGPackage#getEllipticalCurveTo_Rotation() + * @see org.eclipse.papyrus.dd.dg.DGPackage#getEllipticalArcTo_Rotation() * @model dataType="org.eclipse.papyrus.dd.dc.Real" required="true" * ordered="false" * @generated @@ -110,7 +82,7 @@ public interface EllipticalCurveTo extends PathCommand { /** * Sets the value of the ' - * {@link org.eclipse.papyrus.dd.dg.EllipticalCurveTo#getRotation + * {@link org.eclipse.papyrus.dd.dg.EllipticalArcTo#getRotation * <em>Rotation</em>}' attribute. <!-- begin-user-doc --> <!-- end-user-doc * --> * @@ -129,7 +101,7 @@ public interface EllipticalCurveTo extends PathCommand { * * @return the value of the '<em>Is Large Arc</em>' attribute. * @see #setIsLargeArc(boolean) - * @see org.eclipse.papyrus.dd.dg.DGPackage#getEllipticalCurveTo_IsLargeArc() + * @see org.eclipse.papyrus.dd.dg.DGPackage#getEllipticalArcTo_IsLargeArc() * @model dataType="org.eclipse.papyrus.dd.dc.Boolean" required="true" * ordered="false" * @generated @@ -138,7 +110,7 @@ public interface EllipticalCurveTo extends PathCommand { /** * Sets the value of the ' - * {@link org.eclipse.papyrus.dd.dg.EllipticalCurveTo#isLargeArc + * {@link org.eclipse.papyrus.dd.dg.EllipticalArcTo#isLargeArc * <em>Is Large Arc</em>}' attribute. <!-- begin-user-doc --> <!-- * end-user-doc --> * @@ -156,7 +128,7 @@ public interface EllipticalCurveTo extends PathCommand { * * @return the value of the '<em>Is Sweep</em>' attribute. * @see #setIsSweep(boolean) - * @see org.eclipse.papyrus.dd.dg.DGPackage#getEllipticalCurveTo_IsSweep() + * @see org.eclipse.papyrus.dd.dg.DGPackage#getEllipticalArcTo_IsSweep() * @model dataType="org.eclipse.papyrus.dd.dc.Boolean" required="true" * ordered="false" * @generated @@ -165,7 +137,7 @@ public interface EllipticalCurveTo extends PathCommand { /** * Sets the value of the ' - * {@link org.eclipse.papyrus.dd.dg.EllipticalCurveTo#isSweep + * {@link org.eclipse.papyrus.dd.dg.EllipticalArcTo#isSweep * <em>Is Sweep</em>}' attribute. <!-- begin-user-doc --> <!-- end-user-doc * --> * @@ -176,4 +148,30 @@ public interface EllipticalCurveTo extends PathCommand { */ void setIsSweep(boolean value); -} // EllipticalCurveTo + /** + * Returns the value of the '<em><b>Point</b></em>' containment reference. + * <!-- begin-user-doc --> <!-- end-user-doc --> <!-- begin-model-doc --> a + * point to draw an elliptical arc to from the current point in the + * coordinate system. <!-- end-model-doc --> + * + * @return the value of the '<em>Point</em>' containment reference. + * @see #setPoint(Point) + * @see org.eclipse.papyrus.dd.dg.DGPackage#getEllipticalArcTo_Point() + * @model containment="true" required="true" ordered="false" + * @generated + */ + Point getPoint(); + + /** + * Sets the value of the ' + * {@link org.eclipse.papyrus.dd.dg.EllipticalArcTo#getPoint <em>Point</em>} + * ' containment reference. <!-- begin-user-doc --> <!-- end-user-doc --> + * + * @param value + * the new value of the '<em>Point</em>' containment reference. + * @see #getPoint() + * @generated + */ + void setPoint(Point value); + +} // EllipticalArcTo diff --git a/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/Gradient.java b/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/Gradient.java index 057a468221a..f230538246c 100644 --- a/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/Gradient.java +++ b/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/Gradient.java @@ -24,7 +24,7 @@ import org.eclipse.emf.common.util.EList; * <p> * The following features are supported: * <ul> - * <li>{@link org.eclipse.papyrus.dd.dg.Gradient#getStop <em>Stop</em>}</li> + * <li>{@link org.eclipse.papyrus.dd.dg.Gradient#getStops <em>Stop</em>}</li> * </ul> * </p> * @@ -46,6 +46,6 @@ public interface Gradient extends PaintServer { * @model containment="true" lower="2" * @generated */ - EList<GradientStop> getStop(); + EList<GradientStop> getStops(); } // Gradient diff --git a/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/GradientStop.java b/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/GradientStop.java index c542c2eb39e..35d8c87c8f2 100644 --- a/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/GradientStop.java +++ b/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/GradientStop.java @@ -47,9 +47,11 @@ public interface GradientStop extends EObject { * color to use at this gradient stop. <!-- end-model-doc --> * * @return the value of the '<em>Color</em>' attribute. + * @see #isSetColor() + * @see #unsetColor() * @see #setColor(Color) * @see org.eclipse.papyrus.dd.dg.DGPackage#getGradientStop_Color() - * @model dataType="org.eclipse.papyrus.dd.dc.Color" required="true" + * @model unsettable="true" dataType="org.eclipse.papyrus.dd.dc.Color" * ordered="false" * @generated */ @@ -62,12 +64,39 @@ public interface GradientStop extends EObject { * * @param value * the new value of the '<em>Color</em>' attribute. + * @see #isSetColor() + * @see #unsetColor() * @see #getColor() * @generated */ void setColor(Color value); /** + * Unsets the value of the ' + * {@link org.eclipse.papyrus.dd.dg.GradientStop#getColor <em>Color</em>}' + * attribute. <!-- begin-user-doc --> <!-- end-user-doc --> + * + * @see #isSetColor() + * @see #getColor() + * @see #setColor(Color) + * @generated + */ + void unsetColor(); + + /** + * Returns whether the value of the ' + * {@link org.eclipse.papyrus.dd.dg.GradientStop#getColor <em>Color</em>}' + * attribute is set. <!-- begin-user-doc --> <!-- end-user-doc --> + * + * @return whether the value of the '<em>Color</em>' attribute is set. + * @see #unsetColor() + * @see #getColor() + * @see #setColor(Color) + * @generated + */ + boolean isSetColor(); + + /** * Returns the value of the '<em><b>Offset</b></em>' attribute. <!-- * begin-user-doc --> <!-- end-user-doc --> <!-- begin-model-doc --> an * offset of this gradient stop represented as a percentage of the distance @@ -75,9 +104,11 @@ public interface GradientStop extends EObject { * axes. <!-- end-model-doc --> * * @return the value of the '<em>Offset</em>' attribute. + * @see #isSetOffset() + * @see #unsetOffset() * @see #setOffset(double) * @see org.eclipse.papyrus.dd.dg.DGPackage#getGradientStop_Offset() - * @model dataType="org.eclipse.papyrus.dd.dc.Real" required="true" + * @model unsettable="true" dataType="org.eclipse.papyrus.dd.dc.Real" * ordered="false" * @generated */ @@ -90,23 +121,52 @@ public interface GradientStop extends EObject { * * @param value * the new value of the '<em>Offset</em>' attribute. + * @see #isSetOffset() + * @see #unsetOffset() * @see #getOffset() * @generated */ void setOffset(double value); /** - * Returns the value of the '<em><b>Opacity</b></em>' attribute. The default - * value is <code>"1"</code>. <!-- begin-user-doc --> <!-- end-user-doc --> - * <!-- begin-model-doc --> a real number (>=0 and<=1) representing the - * opacity of the color at the stop. A value of 0 means totally transparent, - * while a value of 1 means totally opaque. <!-- end-model-doc --> + * Unsets the value of the ' + * {@link org.eclipse.papyrus.dd.dg.GradientStop#getOffset <em>Offset</em>}' + * attribute. <!-- begin-user-doc --> <!-- end-user-doc --> + * + * @see #isSetOffset() + * @see #getOffset() + * @see #setOffset(double) + * @generated + */ + void unsetOffset(); + + /** + * Returns whether the value of the ' + * {@link org.eclipse.papyrus.dd.dg.GradientStop#getOffset <em>Offset</em>}' + * attribute is set. <!-- begin-user-doc --> <!-- end-user-doc --> + * + * @return whether the value of the '<em>Offset</em>' attribute is set. + * @see #unsetOffset() + * @see #getOffset() + * @see #setOffset(double) + * @generated + */ + boolean isSetOffset(); + + /** + * Returns the value of the '<em><b>Opacity</b></em>' attribute. <!-- + * begin-user-doc --> <!-- end-user-doc --> <!-- begin-model-doc --> a real + * number (>=0 and<=1) representing the opacity of the color at the stop. A + * value of 0 means totally transparent, while a value of 1 means totally + * opaque. <!-- end-model-doc --> * * @return the value of the '<em>Opacity</em>' attribute. + * @see #isSetOpacity() + * @see #unsetOpacity() * @see #setOpacity(double) * @see org.eclipse.papyrus.dd.dg.DGPackage#getGradientStop_Opacity() - * @model default="1" dataType="org.eclipse.papyrus.dd.dc.Real" - * required="true" ordered="false" + * @model unsettable="true" dataType="org.eclipse.papyrus.dd.dc.Real" + * ordered="false" * @generated */ double getOpacity(); @@ -119,12 +179,41 @@ public interface GradientStop extends EObject { * * @param value * the new value of the '<em>Opacity</em>' attribute. + * @see #isSetOpacity() + * @see #unsetOpacity() * @see #getOpacity() * @generated */ void setOpacity(double value); /** + * Unsets the value of the ' + * {@link org.eclipse.papyrus.dd.dg.GradientStop#getOpacity + * <em>Opacity</em>}' attribute. <!-- begin-user-doc --> <!-- end-user-doc + * --> + * + * @see #isSetOpacity() + * @see #getOpacity() + * @see #setOpacity(double) + * @generated + */ + void unsetOpacity(); + + /** + * Returns whether the value of the ' + * {@link org.eclipse.papyrus.dd.dg.GradientStop#getOpacity + * <em>Opacity</em>}' attribute is set. <!-- begin-user-doc --> <!-- + * end-user-doc --> + * + * @return whether the value of the '<em>Opacity</em>' attribute is set. + * @see #unsetOpacity() + * @see #getOpacity() + * @see #setOpacity(double) + * @generated + */ + boolean isSetOpacity(); + + /** * <!-- begin-user-doc --> <!-- end-user-doc --> <!-- begin-model-doc --> * the offset must be between 0 and 1. * diff --git a/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/GraphicalElement.java b/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/GraphicalElement.java index 65942eada34..493a52a8de9 100644 --- a/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/GraphicalElement.java +++ b/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/GraphicalElement.java @@ -11,6 +11,8 @@ */ package org.eclipse.papyrus.dd.dg; +import java.util.Map; +import org.eclipse.emf.common.util.DiagnosticChain; import org.eclipse.emf.common.util.EList; /** @@ -27,11 +29,11 @@ import org.eclipse.emf.common.util.EList; * Path</em>}</li> * <li>{@link org.eclipse.papyrus.dd.dg.GraphicalElement#getGroup <em>Group * </em>}</li> - * <li>{@link org.eclipse.papyrus.dd.dg.GraphicalElement#getKeyword <em>Keyword + * <li>{@link org.eclipse.papyrus.dd.dg.GraphicalElement#getClasses <em>Class * </em>}</li> * <li>{@link org.eclipse.papyrus.dd.dg.GraphicalElement#getStyle <em>Style * </em>}</li> - * <li>{@link org.eclipse.papyrus.dd.dg.GraphicalElement#getTransform <em> + * <li>{@link org.eclipse.papyrus.dd.dg.GraphicalElement#getTransforms <em> * Transform</em>}</li> * </ul> * </p> @@ -71,14 +73,14 @@ public interface GraphicalElement extends Definition { /** * Returns the value of the '<em><b>Group</b></em>' container reference. It * is bidirectional and its opposite is ' - * {@link org.eclipse.papyrus.dd.dg.Group#getMember <em>Member</em>}'. <!-- + * {@link org.eclipse.papyrus.dd.dg.Group#getMembers <em>Member</em>}'. <!-- * begin-user-doc --> <!-- end-user-doc --> <!-- begin-model-doc --> The * group that owns this graphical element. <!-- end-model-doc --> * * @return the value of the '<em>Group</em>' container reference. * @see #setGroup(Group) * @see org.eclipse.papyrus.dd.dg.DGPackage#getGraphicalElement_Group() - * @see org.eclipse.papyrus.dd.dg.Group#getMember + * @see org.eclipse.papyrus.dd.dg.Group#getMembers * @model opposite="member" transient="false" ordered="false" * @generated */ @@ -98,17 +100,17 @@ public interface GraphicalElement extends Definition { void setGroup(Group value); /** - * Returns the value of the '<em><b>Keyword</b></em>' attribute list. The - * list contents are of type {@link java.lang.String}. <!-- begin-user-doc - * --> <!-- end-user-doc --> <!-- begin-model-doc --> A list of strings - * representing keywords of the graphical element. <!-- end-model-doc --> + * Returns the value of the '<em><b>Class</b></em>' attribute list. The list + * contents are of type {@link java.lang.String}. <!-- begin-user-doc --> + * <!-- end-user-doc --> <!-- begin-model-doc --> A list of strings + * representing classes of the graphical element. <!-- end-model-doc --> * - * @return the value of the '<em>Keyword</em>' attribute list. - * @see org.eclipse.papyrus.dd.dg.DGPackage#getGraphicalElement_Keyword() + * @return the value of the '<em>Class</em>' attribute list. + * @see org.eclipse.papyrus.dd.dg.DGPackage#getGraphicalElement_Class() * @model dataType="org.eclipse.papyrus.dd.dc.String" * @generated */ - EList<String> getKeyword(); + EList<String> getClasses(); /** * Returns the value of the '<em><b>Style</b></em>' containment reference. @@ -149,6 +151,21 @@ public interface GraphicalElement extends Definition { * @model containment="true" * @generated */ - EList<Transform> getTransform(); + EList<Transform> getTransforms(); + + /** + * <!-- begin-user-doc --> <!-- end-user-doc --> <!-- begin-model-doc --> + * + * @param diagnostics + * The chain of diagnostics to which problems are to be appended. + * @param context + * The cache of context-specific information. <!-- end-model-doc + * --> + * @model annotation= + * "http://www.eclipse.org/emf/2002/Ecore/OCL body='clipPath->notEmpty() implies clipPath.id->notEmpty()'" + * @generated + */ + boolean referencedClippathHasId(DiagnosticChain diagnostics, + Map<Object, Object> context); } // GraphicalElement diff --git a/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/Group.java b/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/Group.java index 6e6d64fcb37..d4e82076cda 100644 --- a/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/Group.java +++ b/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/Group.java @@ -23,7 +23,7 @@ import org.eclipse.emf.common.util.EList; * <p> * The following features are supported: * <ul> - * <li>{@link org.eclipse.papyrus.dd.dg.Group#getMember <em>Member</em>}</li> + * <li>{@link org.eclipse.papyrus.dd.dg.Group#getMembers <em>Member</em>}</li> * </ul> * </p> * @@ -48,6 +48,6 @@ public interface Group extends GraphicalElement { * @model opposite="group" containment="true" * @generated */ - EList<GraphicalElement> getMember(); + EList<GraphicalElement> getMembers(); } // Group diff --git a/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/Image.java b/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/Image.java index d74e6371853..c0b6cd73b76 100644 --- a/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/Image.java +++ b/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/Image.java @@ -11,6 +11,8 @@ */ package org.eclipse.papyrus.dd.dg; +import java.util.Map; +import org.eclipse.emf.common.util.DiagnosticChain; import org.eclipse.papyrus.dd.dc.Bounds; /** @@ -117,4 +119,19 @@ public interface Image extends GraphicalElement { */ void setIsAspectRatioPreserved(boolean value); + /** + * <!-- begin-user-doc --> <!-- end-user-doc --> <!-- begin-model-doc --> + * + * @param diagnostics + * The chain of diagnostics to which problems are to be appended. + * @param context + * The cache of context-specific information. <!-- end-model-doc + * --> + * @model annotation= + * "http://www.eclipse.org/emf/2002/Ecore/OCL body='source->notEmpty() implies source.size() > 0'" + * @generated + */ + boolean sourceCannotBeEmpty(DiagnosticChain diagnostics, + Map<Object, Object> context); + } // Image diff --git a/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/MarkedElement.java b/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/MarkedElement.java index adcd12b8a68..8cade9a0e96 100644 --- a/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/MarkedElement.java +++ b/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/MarkedElement.java @@ -11,6 +11,9 @@ */ package org.eclipse.papyrus.dd.dg; +import java.util.Map; +import org.eclipse.emf.common.util.DiagnosticChain; + /** * <!-- begin-user-doc --> A representation of the model object ' * <em><b>Marked Element</b></em>'. <!-- end-user-doc --> @@ -117,4 +120,49 @@ public interface MarkedElement extends GraphicalElement { */ void setStartMarker(Marker value); + /** + * <!-- begin-user-doc --> <!-- end-user-doc --> <!-- begin-model-doc --> + * + * @param diagnostics + * The chain of diagnostics to which problems are to be appended. + * @param context + * The cache of context-specific information. <!-- end-model-doc + * --> + * @model annotation= + * "http://www.eclipse.org/emf/2002/Ecore/OCL body='startMarker->notEmpty() implies startMarker.id->notEmpty()'" + * @generated + */ + boolean referencedStartMarkerHasId(DiagnosticChain diagnostics, + Map<Object, Object> context); + + /** + * <!-- begin-user-doc --> <!-- end-user-doc --> <!-- begin-model-doc --> + * + * @param diagnostics + * The chain of diagnostics to which problems are to be appended. + * @param context + * The cache of context-specific information. <!-- end-model-doc + * --> + * @model annotation= + * "http://www.eclipse.org/emf/2002/Ecore/OCL body='midMarker->notEmpty() implies midMarker.id->notEmpty()'" + * @generated + */ + boolean referencedMidMarkerHasId(DiagnosticChain diagnostics, + Map<Object, Object> context); + + /** + * <!-- begin-user-doc --> <!-- end-user-doc --> <!-- begin-model-doc --> + * + * @param diagnostics + * The chain of diagnostics to which problems are to be appended. + * @param context + * The cache of context-specific information. <!-- end-model-doc + * --> + * @model annotation= + * "http://www.eclipse.org/emf/2002/Ecore/OCL body='endMarker->notEmpty() implies endMarker.id->notEmpty()'" + * @generated + */ + boolean referencedEndMarkerHasId(DiagnosticChain diagnostics, + Map<Object, Object> context); + } // MarkedElement diff --git a/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/Paint.java b/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/Paint.java index ea7dd58f143..c3312a82680 100644 --- a/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/Paint.java +++ b/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/Paint.java @@ -13,6 +13,8 @@ package org.eclipse.papyrus.dd.dg; import java.awt.Color; +import java.util.Map; +import org.eclipse.emf.common.util.DiagnosticChain; import org.eclipse.emf.ecore.EObject; /** @@ -83,4 +85,19 @@ public interface Paint extends EObject { */ void setPaintServer(PaintServer value); + /** + * <!-- begin-user-doc --> <!-- end-user-doc --> <!-- begin-model-doc --> + * + * @param diagnostics + * The chain of diagnostics to which problems are to be appended. + * @param context + * The cache of context-specific information. <!-- end-model-doc + * --> + * @model annotation= + * "http://www.eclipse.org/emf/2002/Ecore/OCL body='paintServer->notEmpty() implies paintServer.id->notEmpty()'" + * @generated + */ + boolean referencedPaintServerHasId(DiagnosticChain diagnostics, + Map<Object, Object> context); + } // Paint diff --git a/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/PaintServer.java b/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/PaintServer.java index 65d5c7a8f43..2ed36d090b5 100644 --- a/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/PaintServer.java +++ b/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/PaintServer.java @@ -23,7 +23,7 @@ import org.eclipse.emf.common.util.EList; * <p> * The following features are supported: * <ul> - * <li>{@link org.eclipse.papyrus.dd.dg.PaintServer#getTransform <em>Transform + * <li>{@link org.eclipse.papyrus.dd.dg.PaintServer#getTransforms <em>Transform * </em>}</li> * </ul> * </p> @@ -45,6 +45,6 @@ public interface PaintServer extends Definition { * @model containment="true" * @generated */ - EList<Transform> getTransform(); + EList<Transform> getTransforms(); } // PaintServer diff --git a/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/Path.java b/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/Path.java index ada43845524..3ff54bc6a3c 100644 --- a/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/Path.java +++ b/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/Path.java @@ -11,6 +11,8 @@ */ package org.eclipse.papyrus.dd.dg; +import java.util.Map; +import org.eclipse.emf.common.util.DiagnosticChain; import org.eclipse.emf.common.util.EList; /** @@ -24,7 +26,7 @@ import org.eclipse.emf.common.util.EList; * <p> * The following features are supported: * <ul> - * <li>{@link org.eclipse.papyrus.dd.dg.Path#getCommand <em>Command</em>}</li> + * <li>{@link org.eclipse.papyrus.dd.dg.Path#getCommands <em>Command</em>}</li> * </ul> * </p> * @@ -42,9 +44,24 @@ public interface Path extends MarkedElement { * * @return the value of the '<em>Command</em>' containment reference list. * @see org.eclipse.papyrus.dd.dg.DGPackage#getPath_Command() - * @model containment="true" + * @model containment="true" required="true" * @generated */ - EList<PathCommand> getCommand(); + EList<PathCommand> getCommands(); + + /** + * <!-- begin-user-doc --> <!-- end-user-doc --> <!-- begin-model-doc --> + * + * @param diagnostics + * The chain of diagnostics to which problems are to be appended. + * @param context + * The cache of context-specific information. <!-- end-model-doc + * --> + * @model annotation= + * "http://www.eclipse.org/emf/2002/Ecore/OCL body='command->first().oclIsKindOf(MoveTo)'" + * @generated + */ + boolean firstCommandMustBeMove(DiagnosticChain diagnostics, + Map<Object, Object> context); } // Path diff --git a/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/Polygon.java b/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/Polygon.java index 1951de528dd..8557101bd98 100644 --- a/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/Polygon.java +++ b/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/Polygon.java @@ -26,7 +26,7 @@ import org.eclipse.papyrus.dd.dc.Point; * <p> * The following features are supported: * <ul> - * <li>{@link org.eclipse.papyrus.dd.dg.Polygon#getPoint <em>Point</em>}</li> + * <li>{@link org.eclipse.papyrus.dd.dg.Polygon#getPoints <em>Point</em>}</li> * </ul> * </p> * @@ -47,6 +47,6 @@ public interface Polygon extends MarkedElement { * @model containment="true" lower="3" * @generated */ - EList<Point> getPoint(); + EList<Point> getPoints(); } // Polygon diff --git a/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/Polyline.java b/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/Polyline.java index 7d8e41e12a9..35031deaff3 100644 --- a/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/Polyline.java +++ b/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/Polyline.java @@ -26,7 +26,7 @@ import org.eclipse.papyrus.dd.dc.Point; * <p> * The following features are supported: * <ul> - * <li>{@link org.eclipse.papyrus.dd.dg.Polyline#getPoint <em>Point</em>}</li> + * <li>{@link org.eclipse.papyrus.dd.dg.Polyline#getPoints <em>Point</em>}</li> * </ul> * </p> * @@ -47,6 +47,6 @@ public interface Polyline extends MarkedElement { * @model containment="true" lower="2" * @generated */ - EList<Point> getPoint(); + EList<Point> getPoints(); } // Polyline diff --git a/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/QuadraticCurveTo.java b/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/QuadraticCurveTo.java index a571b11bb03..f5b0a138e0c 100644 --- a/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/QuadraticCurveTo.java +++ b/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/QuadraticCurveTo.java @@ -26,10 +26,10 @@ import org.eclipse.papyrus.dd.dc.Point; * <p> * The following features are supported: * <ul> - * <li>{@link org.eclipse.papyrus.dd.dg.QuadraticCurveTo#getPoint <em>Point - * </em>}</li> * <li>{@link org.eclipse.papyrus.dd.dg.QuadraticCurveTo#getControl <em>Control * </em>}</li> + * <li>{@link org.eclipse.papyrus.dd.dg.QuadraticCurveTo#getPoint <em>Point + * </em>}</li> * </ul> * </p> * diff --git a/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/Rectangle.java b/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/Rectangle.java index a25159a70b1..2f7e4c5d5cd 100644 --- a/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/Rectangle.java +++ b/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/Rectangle.java @@ -11,6 +11,8 @@ */ package org.eclipse.papyrus.dd.dg; +import java.util.Map; +import org.eclipse.emf.common.util.DiagnosticChain; import org.eclipse.papyrus.dd.dc.Bounds; /** @@ -69,10 +71,12 @@ public interface Rectangle extends GraphicalElement { * corners. <!-- end-model-doc --> * * @return the value of the '<em>Corner Radius</em>' attribute. + * @see #isSetCornerRadius() + * @see #unsetCornerRadius() * @see #setCornerRadius(double) * @see org.eclipse.papyrus.dd.dg.DGPackage#getRectangle_CornerRadius() - * @model default="0" dataType="org.eclipse.papyrus.dd.dc.Real" - * required="true" ordered="false" + * @model default="0" unsettable="true" + * dataType="org.eclipse.papyrus.dd.dc.Real" ordered="false" * @generated */ double getCornerRadius(); @@ -85,9 +89,54 @@ public interface Rectangle extends GraphicalElement { * * @param value * the new value of the '<em>Corner Radius</em>' attribute. + * @see #isSetCornerRadius() + * @see #unsetCornerRadius() * @see #getCornerRadius() * @generated */ void setCornerRadius(double value); + /** + * Unsets the value of the ' + * {@link org.eclipse.papyrus.dd.dg.Rectangle#getCornerRadius + * <em>Corner Radius</em>}' attribute. <!-- begin-user-doc --> <!-- + * end-user-doc --> + * + * @see #isSetCornerRadius() + * @see #getCornerRadius() + * @see #setCornerRadius(double) + * @generated + */ + void unsetCornerRadius(); + + /** + * Returns whether the value of the ' + * {@link org.eclipse.papyrus.dd.dg.Rectangle#getCornerRadius + * <em>Corner Radius</em>}' attribute is set. <!-- begin-user-doc --> <!-- + * end-user-doc --> + * + * @return whether the value of the '<em>Corner Radius</em>' attribute is + * set. + * @see #unsetCornerRadius() + * @see #getCornerRadius() + * @see #setCornerRadius(double) + * @generated + */ + boolean isSetCornerRadius(); + + /** + * <!-- begin-user-doc --> <!-- end-user-doc --> <!-- begin-model-doc --> + * + * @param diagnostics + * The chain of diagnostics to which problems are to be appended. + * @param context + * The cache of context-specific information. <!-- end-model-doc + * --> + * @model annotation= + * "http://www.eclipse.org/emf/2002/Ecore/OCL body='cornerRadius >= 0'" + * @generated + */ + boolean nonNegativeCornerRadius(DiagnosticChain diagnostics, + Map<Object, Object> context); + } // Rectangle diff --git a/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/RootCanvas.java b/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/RootCanvas.java index bf3df515c5f..1d55d9a2d4c 100644 --- a/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/RootCanvas.java +++ b/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/RootCanvas.java @@ -30,8 +30,8 @@ import org.eclipse.emf.common.util.EList; * Background Color</em>}</li> * <li>{@link org.eclipse.papyrus.dd.dg.RootCanvas#getDefinitions <em> * Definitions</em>}</li> - * <li>{@link org.eclipse.papyrus.dd.dg.RootCanvas#getStyleSheet <em>Style Sheet - * </em>}</li> + * <li>{@link org.eclipse.papyrus.dd.dg.RootCanvas#getExternalStyleSheets <em> + * External Style Sheet</em>}</li> * </ul> * </p> * @@ -128,17 +128,17 @@ public interface RootCanvas extends Canvas { void setDefinitions(Definitions value); /** - * Returns the value of the '<em><b>Style Sheet</b></em>' reference list. - * The list contents are of type + * Returns the value of the '<em><b>External Style Sheet</b></em>' reference + * list. The list contents are of type * {@link org.eclipse.papyrus.dd.dg.StyleSheet}. <!-- begin-user-doc --> * <!-- end-user-doc --> <!-- begin-model-doc --> A list of external style * sheets that are imported by the canvas. <!-- end-model-doc --> * - * @return the value of the '<em>Style Sheet</em>' reference list. - * @see org.eclipse.papyrus.dd.dg.DGPackage#getRootCanvas_StyleSheet() + * @return the value of the '<em>External Style Sheet</em>' reference list. + * @see org.eclipse.papyrus.dd.dg.DGPackage#getRootCanvas_ExternalStyleSheet() * @model * @generated */ - EList<StyleSheet> getStyleSheet(); + EList<StyleSheet> getExternalStyleSheets(); } // RootCanvas diff --git a/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/Style.java b/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/Style.java index 73540be691f..7f7f74a2a34 100644 --- a/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/Style.java +++ b/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/Style.java @@ -36,7 +36,7 @@ import org.eclipse.emf.ecore.EObject; * </em>}</li> * <li>{@link org.eclipse.papyrus.dd.dg.Style#getStrokeOpacity <em>Stroke * Opacity</em>}</li> - * <li>{@link org.eclipse.papyrus.dd.dg.Style#getStrokeDashLength <em>Stroke + * <li>{@link org.eclipse.papyrus.dd.dg.Style#getStrokeDashLengths <em>Stroke * Dash Length</em>}</li> * <li>{@link org.eclipse.papyrus.dd.dg.Style#getFontSize <em>Font Size</em>}</li> * <li>{@link org.eclipse.papyrus.dd.dg.Style#getFontName <em>Font Name</em>}</li> @@ -361,40 +361,40 @@ public interface Style extends EObject { * <!-- end-model-doc --> * * @return the value of the '<em>Stroke Dash Length</em>' attribute list. - * @see #isSetStrokeDashLength() - * @see #unsetStrokeDashLength() + * @see #isSetStrokeDashLengths() + * @see #unsetStrokeDashLengths() * @see org.eclipse.papyrus.dd.dg.DGPackage#getStyle_StrokeDashLength() * @model unique="false" unsettable="true" * dataType="org.eclipse.papyrus.dd.dc.Real" * @generated */ - EList<Double> getStrokeDashLength(); + EList<Double> getStrokeDashLengths(); /** * Unsets the value of the ' - * {@link org.eclipse.papyrus.dd.dg.Style#getStrokeDashLength + * {@link org.eclipse.papyrus.dd.dg.Style#getStrokeDashLengths * <em>Stroke Dash Length</em>}' attribute list. <!-- begin-user-doc --> * <!-- end-user-doc --> * - * @see #isSetStrokeDashLength() - * @see #getStrokeDashLength() + * @see #isSetStrokeDashLengths() + * @see #getStrokeDashLengths() * @generated */ - void unsetStrokeDashLength(); + void unsetStrokeDashLengths(); /** * Returns whether the value of the ' - * {@link org.eclipse.papyrus.dd.dg.Style#getStrokeDashLength + * {@link org.eclipse.papyrus.dd.dg.Style#getStrokeDashLengths * <em>Stroke Dash Length</em>}' attribute list is set. <!-- begin-user-doc * --> <!-- end-user-doc --> * * @return whether the value of the '<em>Stroke Dash Length</em>' attribute * list is set. - * @see #unsetStrokeDashLength() - * @see #getStrokeDashLength() + * @see #unsetStrokeDashLengths() + * @see #getStrokeDashLengths() * @generated */ - boolean isSetStrokeDashLength(); + boolean isSetStrokeDashLengths(); /** * Returns the value of the '<em><b>Font Size</b></em>' attribute. <!-- diff --git a/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/StyleRule.java b/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/StyleRule.java index 249e61e6c2b..b578f2f4520 100644 --- a/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/StyleRule.java +++ b/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/StyleRule.java @@ -22,8 +22,8 @@ import org.eclipse.emf.ecore.EObject; * <p> * The following features are supported: * <ul> - * <li>{@link org.eclipse.papyrus.dd.dg.StyleRule#getSelector <em>Selector</em>} - * </li> + * <li>{@link org.eclipse.papyrus.dd.dg.StyleRule#getSelectors <em>Selector + * </em>}</li> * <li>{@link org.eclipse.papyrus.dd.dg.StyleRule#getStyle <em>Style</em>}</li> * </ul> * </p> @@ -45,7 +45,7 @@ public interface StyleRule extends EObject { * @model containment="true" required="true" * @generated */ - EList<StyleSelector> getSelector(); + EList<StyleSelector> getSelectors(); /** * Returns the value of the '<em><b>Style</b></em>' containment reference. diff --git a/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/StyleSelector.java b/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/StyleSelector.java index da895bb3b9f..a659fe231ba 100644 --- a/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/StyleSelector.java +++ b/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/StyleSelector.java @@ -12,8 +12,6 @@ package org.eclipse.papyrus.dd.dg; import org.eclipse.emf.common.util.EList; - -import org.eclipse.emf.ecore.EClass; import org.eclipse.emf.ecore.EObject; /** @@ -23,9 +21,9 @@ import org.eclipse.emf.ecore.EObject; * <p> * The following features are supported: * <ul> - * <li>{@link org.eclipse.papyrus.dd.dg.StyleSelector#getType <em>Type</em>}</li> - * <li>{@link org.eclipse.papyrus.dd.dg.StyleSelector#getKeyword <em>Keyword - * </em>}</li> + * <li>{@link org.eclipse.papyrus.dd.dg.StyleSelector#getKind <em>Kind</em>}</li> + * <li>{@link org.eclipse.papyrus.dd.dg.StyleSelector#getClasses <em>Class</em>} + * </li> * </ul> * </p> * @@ -35,43 +33,74 @@ import org.eclipse.emf.ecore.EObject; */ public interface StyleSelector extends EObject { /** - * Returns the value of the '<em><b>Type</b></em>' reference. <!-- - * begin-user-doc --> <!-- end-user-doc --> <!-- begin-model-doc --> A - * non-abstract type that is a subtype of GraphicalElement. Elements having - * this type are selected. <!-- end-model-doc --> + * Returns the value of the '<em><b>Kind</b></em>' attribute. The literals + * are from the enumeration {@link org.eclipse.papyrus.dd.dg.ElementKind}. + * <!-- begin-user-doc --> <!-- end-user-doc --> <!-- begin-model-doc --> + * The kind of graphical element to select. <!-- end-model-doc --> * - * @return the value of the '<em>Type</em>' reference. - * @see #setType(EClass) - * @see org.eclipse.papyrus.dd.dg.DGPackage#getStyleSelector_Type() - * @model ordered="false" + * @return the value of the '<em>Kind</em>' attribute. + * @see org.eclipse.papyrus.dd.dg.ElementKind + * @see #isSetKind() + * @see #unsetKind() + * @see #setKind(ElementKind) + * @see org.eclipse.papyrus.dd.dg.DGPackage#getStyleSelector_Kind() + * @model unsettable="true" ordered="false" * @generated */ - EClass getType(); + ElementKind getKind(); /** * Sets the value of the ' - * {@link org.eclipse.papyrus.dd.dg.StyleSelector#getType <em>Type</em>}' - * reference. <!-- begin-user-doc --> <!-- end-user-doc --> + * {@link org.eclipse.papyrus.dd.dg.StyleSelector#getKind <em>Kind</em>}' + * attribute. <!-- begin-user-doc --> <!-- end-user-doc --> * * @param value - * the new value of the '<em>Type</em>' reference. - * @see #getType() + * the new value of the '<em>Kind</em>' attribute. + * @see org.eclipse.papyrus.dd.dg.ElementKind + * @see #isSetKind() + * @see #unsetKind() + * @see #getKind() + * @generated + */ + void setKind(ElementKind value); + + /** + * Unsets the value of the ' + * {@link org.eclipse.papyrus.dd.dg.StyleSelector#getKind <em>Kind</em>}' + * attribute. <!-- begin-user-doc --> <!-- end-user-doc --> + * + * @see #isSetKind() + * @see #getKind() + * @see #setKind(ElementKind) + * @generated + */ + void unsetKind(); + + /** + * Returns whether the value of the ' + * {@link org.eclipse.papyrus.dd.dg.StyleSelector#getKind <em>Kind</em>}' + * attribute is set. <!-- begin-user-doc --> <!-- end-user-doc --> + * + * @return whether the value of the '<em>Kind</em>' attribute is set. + * @see #unsetKind() + * @see #getKind() + * @see #setKind(ElementKind) * @generated */ - void setType(EClass value); + boolean isSetKind(); /** - * Returns the value of the '<em><b>Keyword</b></em>' attribute list. The - * list contents are of type {@link java.lang.String}. <!-- begin-user-doc - * --> <!-- end-user-doc --> <!-- begin-model-doc --> A list of strings - * representing keywords of graphical elements. Elements having these - * keywords are selected. <!-- end-model-doc --> + * Returns the value of the '<em><b>Class</b></em>' attribute list. The list + * contents are of type {@link java.lang.String}. <!-- begin-user-doc --> + * <!-- end-user-doc --> <!-- begin-model-doc --> A set of strings + * representing classes of graphical elements to select. Selected elements + * must have all those classes. <!-- end-model-doc --> * - * @return the value of the '<em>Keyword</em>' attribute list. - * @see org.eclipse.papyrus.dd.dg.DGPackage#getStyleSelector_Keyword() + * @return the value of the '<em>Class</em>' attribute list. + * @see org.eclipse.papyrus.dd.dg.DGPackage#getStyleSelector_Class() * @model dataType="org.eclipse.papyrus.dd.dc.String" * @generated */ - EList<String> getKeyword(); + EList<String> getClasses(); } // StyleSelector diff --git a/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/StyleSheet.java b/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/StyleSheet.java index 502e86b107a..447bfc2c38a 100644 --- a/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/StyleSheet.java +++ b/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/StyleSheet.java @@ -22,7 +22,7 @@ import org.eclipse.emf.ecore.EObject; * <p> * The following features are supported: * <ul> - * <li>{@link org.eclipse.papyrus.dd.dg.StyleSheet#getRule <em>Rule</em>}</li> + * <li>{@link org.eclipse.papyrus.dd.dg.StyleSheet#getRules <em>Rule</em>}</li> * </ul> * </p> * @@ -43,6 +43,6 @@ public interface StyleSheet extends EObject { * @model containment="true" * @generated */ - EList<StyleRule> getRule(); + EList<StyleRule> getRules(); } // StyleSheet diff --git a/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/Text.java b/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/Text.java index 8b4ed0e2155..39288d4c021 100644 --- a/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/Text.java +++ b/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/Text.java @@ -11,6 +11,8 @@ */ package org.eclipse.papyrus.dd.dg; +import java.util.Map; +import org.eclipse.emf.common.util.DiagnosticChain; import org.eclipse.papyrus.dd.dc.Point; /** @@ -85,4 +87,19 @@ public interface Text extends GraphicalElement { */ void setPosition(Point value); + /** + * <!-- begin-user-doc --> <!-- end-user-doc --> <!-- begin-model-doc --> + * + * @param diagnostics + * The chain of diagnostics to which problems are to be appended. + * @param context + * The cache of context-specific information. <!-- end-model-doc + * --> + * @model annotation= + * "http://www.eclipse.org/emf/2002/Ecore/OCL body='data->notEmpty() implies data.size() > 0'" + * @generated + */ + boolean dataCannotBeEmpty(DiagnosticChain diagnostics, + Map<Object, Object> context); + } // Text diff --git a/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/Use.java b/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/Use.java index 6fe6b6b1ad1..f27e2d20ce8 100644 --- a/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/Use.java +++ b/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/Use.java @@ -11,6 +11,8 @@ */ package org.eclipse.papyrus.dd.dg; +import java.util.Map; +import org.eclipse.emf.common.util.DiagnosticChain; import org.eclipse.papyrus.dd.dc.Bounds; /** @@ -25,6 +27,8 @@ import org.eclipse.papyrus.dd.dc.Bounds; * The following features are supported: * <ul> * <li>{@link org.eclipse.papyrus.dd.dg.Use#getBounds <em>Bounds</em>}</li> + * <li>{@link org.eclipse.papyrus.dd.dg.Use#getReferencedElement <em>Referenced + * Element</em>}</li> * </ul> * </p> * @@ -42,7 +46,7 @@ public interface Use extends GraphicalElement { * @return the value of the '<em>Bounds</em>' containment reference. * @see #setBounds(Bounds) * @see org.eclipse.papyrus.dd.dg.DGPackage#getUse_Bounds() - * @model containment="true" required="true" ordered="false" + * @model containment="true" ordered="false" * @generated */ Bounds getBounds(); @@ -59,4 +63,46 @@ public interface Use extends GraphicalElement { */ void setBounds(Bounds value); + /** + * Returns the value of the '<em><b>Referenced Element</b></em>' reference. + * <!-- begin-user-doc --> <!-- end-user-doc --> <!-- begin-model-doc --> A + * list of graphical elements that are members of this group. <!-- + * end-model-doc --> + * + * @return the value of the '<em>Referenced Element</em>' reference. + * @see #setReferencedElement(GraphicalElement) + * @see org.eclipse.papyrus.dd.dg.DGPackage#getUse_ReferencedElement() + * @model required="true" + * @generated + */ + GraphicalElement getReferencedElement(); + + /** + * Sets the value of the ' + * {@link org.eclipse.papyrus.dd.dg.Use#getReferencedElement + * <em>Referenced Element</em>}' reference. <!-- begin-user-doc --> <!-- + * end-user-doc --> + * + * @param value + * the new value of the '<em>Referenced Element</em>' reference. + * @see #getReferencedElement() + * @generated + */ + void setReferencedElement(GraphicalElement value); + + /** + * <!-- begin-user-doc --> <!-- end-user-doc --> <!-- begin-model-doc --> + * + * @param diagnostics + * The chain of diagnostics to which problems are to be appended. + * @param context + * The cache of context-specific information. <!-- end-model-doc + * --> + * @model annotation= + * "http://www.eclipse.org/emf/2002/Ecore/OCL body='referencedElement->notEmpty() implies referencedElement.id->notEmpty()'" + * @generated + */ + boolean referencedElementHasId(DiagnosticChain diagnostics, + Map<Object, Object> context); + } // Use diff --git a/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/impl/CanvasImpl.java b/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/impl/CanvasImpl.java index ee99b2222b0..aabe46debc6 100644 --- a/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/impl/CanvasImpl.java +++ b/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/impl/CanvasImpl.java @@ -11,9 +11,14 @@ */ package org.eclipse.papyrus.dd.dg.impl; +import java.lang.reflect.InvocationTargetException; +import java.util.Map; import org.eclipse.emf.common.notify.Notification; import org.eclipse.emf.common.notify.NotificationChain; +import org.eclipse.emf.common.util.Diagnostic; +import org.eclipse.emf.common.util.DiagnosticChain; +import org.eclipse.emf.common.util.EList; import org.eclipse.emf.ecore.EClass; import org.eclipse.emf.ecore.InternalEObject; @@ -23,6 +28,7 @@ import org.eclipse.papyrus.dd.dc.Bounds; import org.eclipse.papyrus.dd.dg.Canvas; import org.eclipse.papyrus.dd.dg.DGPackage; +import org.eclipse.papyrus.dd.dg.util.DGValidator; /** * <!-- begin-user-doc --> An implementation of the model object ' @@ -122,6 +128,39 @@ public class CanvasImpl extends GroupImpl implements Canvas { } /** + * The cached validation expression for the ' + * {@link #canvasCannotHaveTransforms(org.eclipse.emf.common.util.DiagnosticChain, java.util.Map) + * <em>Canvas Cannot Have Transforms</em>}' invariant operation. <!-- + * begin-user-doc --> <!-- end-user-doc --> + * + * @see #canvasCannotHaveTransforms(org.eclipse.emf.common.util.DiagnosticChain, + * java.util.Map) + * @generated + * @ordered + */ + protected static final String CANVAS_CANNOT_HAVE_TRANSFORMS_DIAGNOSTIC_CHAIN_MAP__EEXPRESSION = "transform->isEmpty()"; + + /** + * <!-- begin-user-doc --> <!-- end-user-doc --> + * + * @generated + */ + public boolean canvasCannotHaveTransforms(DiagnosticChain diagnostics, + Map<Object, Object> context) { + return DGValidator + .validate( + DGPackage.Literals.CANVAS, + this, + diagnostics, + context, + "http://www.eclipse.org/emf/2002/Ecore/OCL", + DGPackage.Literals.CANVAS___CANVAS_CANNOT_HAVE_TRANSFORMS__DIAGNOSTICCHAIN_MAP, + CANVAS_CANNOT_HAVE_TRANSFORMS_DIAGNOSTIC_CHAIN_MAP__EEXPRESSION, + Diagnostic.ERROR, DGValidator.DIAGNOSTIC_SOURCE, + DGValidator.CANVAS__CANVAS_CANNOT_HAVE_TRANSFORMS); + } + + /** * <!-- begin-user-doc --> <!-- end-user-doc --> * * @generated @@ -194,4 +233,22 @@ public class CanvasImpl extends GroupImpl implements Canvas { return super.eIsSet(featureID); } + /** + * <!-- begin-user-doc --> <!-- end-user-doc --> + * + * @generated + */ + @Override + @SuppressWarnings("unchecked") + public Object eInvoke(int operationID, EList<?> arguments) + throws InvocationTargetException { + switch (operationID) { + case DGPackage.CANVAS___CANVAS_CANNOT_HAVE_TRANSFORMS__DIAGNOSTICCHAIN_MAP: + return canvasCannotHaveTransforms( + (DiagnosticChain) arguments.get(0), + (Map<Object, Object>) arguments.get(1)); + } + return super.eInvoke(operationID, arguments); + } + } // CanvasImpl diff --git a/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/impl/CubicCurveToImpl.java b/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/impl/CubicCurveToImpl.java index f18d3cccdd0..75162e62f87 100644 --- a/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/impl/CubicCurveToImpl.java +++ b/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/impl/CubicCurveToImpl.java @@ -30,12 +30,12 @@ import org.eclipse.papyrus.dd.dg.DGPackage; * <p> * The following features are implemented: * <ul> - * <li>{@link org.eclipse.papyrus.dd.dg.impl.CubicCurveToImpl#getPoint <em>Point - * </em>}</li> * <li>{@link org.eclipse.papyrus.dd.dg.impl.CubicCurveToImpl#getStartControl * <em>Start Control</em>}</li> * <li>{@link org.eclipse.papyrus.dd.dg.impl.CubicCurveToImpl#getEndControl <em> * End Control</em>}</li> + * <li>{@link org.eclipse.papyrus.dd.dg.impl.CubicCurveToImpl#getPoint <em>Point + * </em>}</li> * </ul> * </p> * @@ -43,16 +43,6 @@ import org.eclipse.papyrus.dd.dg.DGPackage; */ public class CubicCurveToImpl extends PathCommandImpl implements CubicCurveTo { /** - * The cached value of the '{@link #getPoint() <em>Point</em>}' containment - * reference. <!-- begin-user-doc --> <!-- end-user-doc --> - * - * @see #getPoint() - * @generated - * @ordered - */ - protected Point point; - - /** * The cached value of the '{@link #getStartControl() * <em>Start Control</em>}' containment reference. <!-- begin-user-doc --> * <!-- end-user-doc --> @@ -74,6 +64,16 @@ public class CubicCurveToImpl extends PathCommandImpl implements CubicCurveTo { protected Point endControl; /** + * The cached value of the '{@link #getPoint() <em>Point</em>}' containment + * reference. <!-- begin-user-doc --> <!-- end-user-doc --> + * + * @see #getPoint() + * @generated + * @ordered + */ + protected Point point; + + /** * <!-- begin-user-doc --> <!-- end-user-doc --> * * @generated @@ -269,12 +269,12 @@ public class CubicCurveToImpl extends PathCommandImpl implements CubicCurveTo { public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) { switch (featureID) { - case DGPackage.CUBIC_CURVE_TO__POINT: - return basicSetPoint(null, msgs); case DGPackage.CUBIC_CURVE_TO__START_CONTROL: return basicSetStartControl(null, msgs); case DGPackage.CUBIC_CURVE_TO__END_CONTROL: return basicSetEndControl(null, msgs); + case DGPackage.CUBIC_CURVE_TO__POINT: + return basicSetPoint(null, msgs); } return super.eInverseRemove(otherEnd, featureID, msgs); } @@ -287,12 +287,12 @@ public class CubicCurveToImpl extends PathCommandImpl implements CubicCurveTo { @Override public Object eGet(int featureID, boolean resolve, boolean coreType) { switch (featureID) { - case DGPackage.CUBIC_CURVE_TO__POINT: - return getPoint(); case DGPackage.CUBIC_CURVE_TO__START_CONTROL: return getStartControl(); case DGPackage.CUBIC_CURVE_TO__END_CONTROL: return getEndControl(); + case DGPackage.CUBIC_CURVE_TO__POINT: + return getPoint(); } return super.eGet(featureID, resolve, coreType); } @@ -305,15 +305,15 @@ public class CubicCurveToImpl extends PathCommandImpl implements CubicCurveTo { @Override public void eSet(int featureID, Object newValue) { switch (featureID) { - case DGPackage.CUBIC_CURVE_TO__POINT: - setPoint((Point) newValue); - return; case DGPackage.CUBIC_CURVE_TO__START_CONTROL: setStartControl((Point) newValue); return; case DGPackage.CUBIC_CURVE_TO__END_CONTROL: setEndControl((Point) newValue); return; + case DGPackage.CUBIC_CURVE_TO__POINT: + setPoint((Point) newValue); + return; } super.eSet(featureID, newValue); } @@ -326,15 +326,15 @@ public class CubicCurveToImpl extends PathCommandImpl implements CubicCurveTo { @Override public void eUnset(int featureID) { switch (featureID) { - case DGPackage.CUBIC_CURVE_TO__POINT: - setPoint((Point) null); - return; case DGPackage.CUBIC_CURVE_TO__START_CONTROL: setStartControl((Point) null); return; case DGPackage.CUBIC_CURVE_TO__END_CONTROL: setEndControl((Point) null); return; + case DGPackage.CUBIC_CURVE_TO__POINT: + setPoint((Point) null); + return; } super.eUnset(featureID); } @@ -347,12 +347,12 @@ public class CubicCurveToImpl extends PathCommandImpl implements CubicCurveTo { @Override public boolean eIsSet(int featureID) { switch (featureID) { - case DGPackage.CUBIC_CURVE_TO__POINT: - return point != null; case DGPackage.CUBIC_CURVE_TO__START_CONTROL: return startControl != null; case DGPackage.CUBIC_CURVE_TO__END_CONTROL: return endControl != null; + case DGPackage.CUBIC_CURVE_TO__POINT: + return point != null; } return super.eIsSet(featureID); } diff --git a/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/impl/DGFactoryImpl.java b/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/impl/DGFactoryImpl.java index 08fc64aec30..2a27fb3c500 100644 --- a/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/impl/DGFactoryImpl.java +++ b/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/impl/DGFactoryImpl.java @@ -94,8 +94,8 @@ public class DGFactoryImpl extends EFactoryImpl implements DGFactory { return createStyleSelector(); case DGPackage.ELLIPSE: return createEllipse(); - case DGPackage.ELLIPTICAL_CURVE_TO: - return createEllipticalCurveTo(); + case DGPackage.ELLIPTICAL_ARC_TO: + return createEllipticalArcTo(); case DGPackage.QUADRATIC_CURVE_TO: return createQuadraticCurveTo(); case DGPackage.GRADIENT_STOP: @@ -154,6 +154,8 @@ public class DGFactoryImpl extends EFactoryImpl implements DGFactory { switch (eDataType.getClassifierID()) { case DGPackage.FONT_DECORATION: return createFontDecorationFromString(eDataType, initialValue); + case DGPackage.ELEMENT_KIND: + return createElementKindFromString(eDataType, initialValue); default: throw new IllegalArgumentException("The datatype '" + eDataType.getName() + "' is not a valid classifier"); @@ -170,6 +172,8 @@ public class DGFactoryImpl extends EFactoryImpl implements DGFactory { switch (eDataType.getClassifierID()) { case DGPackage.FONT_DECORATION: return convertFontDecorationToString(eDataType, instanceValue); + case DGPackage.ELEMENT_KIND: + return convertElementKindToString(eDataType, instanceValue); default: throw new IllegalArgumentException("The datatype '" + eDataType.getName() + "' is not a valid classifier"); @@ -321,9 +325,9 @@ public class DGFactoryImpl extends EFactoryImpl implements DGFactory { * * @generated */ - public EllipticalCurveTo createEllipticalCurveTo() { - EllipticalCurveToImpl ellipticalCurveTo = new EllipticalCurveToImpl(); - return ellipticalCurveTo; + public EllipticalArcTo createEllipticalArcTo() { + EllipticalArcToImpl ellipticalArcTo = new EllipticalArcToImpl(); + return ellipticalArcTo; } /** @@ -566,6 +570,31 @@ public class DGFactoryImpl extends EFactoryImpl implements DGFactory { * * @generated */ + public ElementKind createElementKindFromString(EDataType eDataType, + String initialValue) { + ElementKind result = ElementKind.get(initialValue); + if (result == null) + throw new IllegalArgumentException("The value '" + initialValue + + "' is not a valid enumerator of '" + eDataType.getName() + + "'"); + return result; + } + + /** + * <!-- begin-user-doc --> <!-- end-user-doc --> + * + * @generated + */ + public String convertElementKindToString(EDataType eDataType, + Object instanceValue) { + return instanceValue == null ? null : instanceValue.toString(); + } + + /** + * <!-- begin-user-doc --> <!-- end-user-doc --> + * + * @generated + */ public DGPackage getDGPackage() { return (DGPackage) getEPackage(); } diff --git a/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/impl/DGPackageImpl.java b/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/impl/DGPackageImpl.java index b8b2c648020..2cdb70e594e 100644 --- a/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/impl/DGPackageImpl.java +++ b/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/impl/DGPackageImpl.java @@ -19,12 +19,8 @@ import org.eclipse.emf.ecore.EOperation; import org.eclipse.emf.ecore.EPackage; import org.eclipse.emf.ecore.EReference; import org.eclipse.emf.ecore.EValidator; -import org.eclipse.emf.ecore.EcorePackage; - import org.eclipse.emf.ecore.impl.EPackageImpl; - import org.eclipse.papyrus.dd.dc.DCPackage; - import org.eclipse.papyrus.dd.dg.Canvas; import org.eclipse.papyrus.dd.dg.Circle; import org.eclipse.papyrus.dd.dg.ClipPath; @@ -34,8 +30,9 @@ import org.eclipse.papyrus.dd.dg.DGFactory; import org.eclipse.papyrus.dd.dg.DGPackage; import org.eclipse.papyrus.dd.dg.Definition; import org.eclipse.papyrus.dd.dg.Definitions; +import org.eclipse.papyrus.dd.dg.ElementKind; import org.eclipse.papyrus.dd.dg.Ellipse; -import org.eclipse.papyrus.dd.dg.EllipticalCurveTo; +import org.eclipse.papyrus.dd.dg.EllipticalArcTo; import org.eclipse.papyrus.dd.dg.FontDecoration; import org.eclipse.papyrus.dd.dg.Gradient; import org.eclipse.papyrus.dd.dg.GradientStop; @@ -71,7 +68,6 @@ import org.eclipse.papyrus.dd.dg.Text; import org.eclipse.papyrus.dd.dg.Transform; import org.eclipse.papyrus.dd.dg.Translate; import org.eclipse.papyrus.dd.dg.Use; - import org.eclipse.papyrus.dd.dg.util.DGValidator; /** @@ -219,7 +215,7 @@ public class DGPackageImpl extends EPackageImpl implements DGPackage { * * @generated */ - private EClass ellipticalCurveToEClass = null; + private EClass ellipticalArcToEClass = null; /** * <!-- begin-user-doc --> <!-- end-user-doc --> @@ -390,6 +386,13 @@ public class DGPackageImpl extends EPackageImpl implements DGPackage { private EEnum fontDecorationEEnum = null; /** + * <!-- begin-user-doc --> <!-- end-user-doc --> + * + * @generated + */ + private EEnum elementKindEEnum = null; + + /** * Creates an instance of the model <b>Package</b>, registered with * {@link org.eclipse.emf.ecore.EPackage.Registry EPackage.Registry} by the * package package URI value. @@ -444,7 +447,6 @@ public class DGPackageImpl extends EPackageImpl implements DGPackage { // Initialize simple dependencies DCPackage.eINSTANCE.eClass(); - EcorePackage.eINSTANCE.eClass(); // Create package meta-data objects theDGPackage.createPackageContents(); @@ -491,6 +493,15 @@ public class DGPackageImpl extends EPackageImpl implements DGPackage { * * @generated */ + public EOperation getCanvas__CanvasCannotHaveTransforms__DiagnosticChain_Map() { + return canvasEClass.getEOperations().get(0); + } + + /** + * <!-- begin-user-doc --> <!-- end-user-doc --> + * + * @generated + */ public EClass getGroup() { return groupEClass; } @@ -538,7 +549,7 @@ public class DGPackageImpl extends EPackageImpl implements DGPackage { * * @generated */ - public EAttribute getGraphicalElement_Keyword() { + public EAttribute getGraphicalElement_Class() { return (EAttribute) graphicalElementEClass.getEStructuralFeatures() .get(2); } @@ -568,6 +579,15 @@ public class DGPackageImpl extends EPackageImpl implements DGPackage { * * @generated */ + public EOperation getGraphicalElement__ReferencedClippathHasId__DiagnosticChain_Map() { + return graphicalElementEClass.getEOperations().get(0); + } + + /** + * <!-- begin-user-doc --> <!-- end-user-doc --> + * + * @generated + */ public EClass getDefinition() { return definitionEClass; } @@ -586,6 +606,15 @@ public class DGPackageImpl extends EPackageImpl implements DGPackage { * * @generated */ + public EOperation getDefinition__IdCannotBeEmpty__DiagnosticChain_Map() { + return definitionEClass.getEOperations().get(0); + } + + /** + * <!-- begin-user-doc --> <!-- end-user-doc --> + * + * @generated + */ public EClass getMoveTo() { return moveToEClass; } @@ -811,6 +840,15 @@ public class DGPackageImpl extends EPackageImpl implements DGPackage { * * @generated */ + public EOperation getPaint__ReferencedPaintServerHasId__DiagnosticChain_Map() { + return paintEClass.getEOperations().get(0); + } + + /** + * <!-- begin-user-doc --> <!-- end-user-doc --> + * + * @generated + */ public EClass getPaintServer() { return paintServerEClass; } @@ -893,7 +931,7 @@ public class DGPackageImpl extends EPackageImpl implements DGPackage { * @generated */ public EReference getCubicCurveTo_Point() { - return (EReference) cubicCurveToEClass.getEStructuralFeatures().get(0); + return (EReference) cubicCurveToEClass.getEStructuralFeatures().get(2); } /** @@ -902,7 +940,7 @@ public class DGPackageImpl extends EPackageImpl implements DGPackage { * @generated */ public EReference getCubicCurveTo_StartControl() { - return (EReference) cubicCurveToEClass.getEStructuralFeatures().get(1); + return (EReference) cubicCurveToEClass.getEStructuralFeatures().get(0); } /** @@ -911,7 +949,7 @@ public class DGPackageImpl extends EPackageImpl implements DGPackage { * @generated */ public EReference getCubicCurveTo_EndControl() { - return (EReference) cubicCurveToEClass.getEStructuralFeatures().get(2); + return (EReference) cubicCurveToEClass.getEStructuralFeatures().get(1); } /** @@ -1000,8 +1038,8 @@ public class DGPackageImpl extends EPackageImpl implements DGPackage { * * @generated */ - public EReference getStyleSelector_Type() { - return (EReference) styleSelectorEClass.getEStructuralFeatures().get(0); + public EAttribute getStyleSelector_Kind() { + return (EAttribute) styleSelectorEClass.getEStructuralFeatures().get(0); } /** @@ -1009,7 +1047,7 @@ public class DGPackageImpl extends EPackageImpl implements DGPackage { * * @generated */ - public EAttribute getStyleSelector_Keyword() { + public EAttribute getStyleSelector_Class() { return (EAttribute) styleSelectorEClass.getEStructuralFeatures().get(1); } @@ -1045,8 +1083,8 @@ public class DGPackageImpl extends EPackageImpl implements DGPackage { * * @generated */ - public EClass getEllipticalCurveTo() { - return ellipticalCurveToEClass; + public EClass getEllipticalArcTo() { + return ellipticalArcToEClass; } /** @@ -1054,9 +1092,9 @@ public class DGPackageImpl extends EPackageImpl implements DGPackage { * * @generated */ - public EReference getEllipticalCurveTo_Point() { - return (EReference) ellipticalCurveToEClass.getEStructuralFeatures() - .get(0); + public EReference getEllipticalArcTo_Point() { + return (EReference) ellipticalArcToEClass.getEStructuralFeatures().get( + 4); } /** @@ -1064,9 +1102,9 @@ public class DGPackageImpl extends EPackageImpl implements DGPackage { * * @generated */ - public EReference getEllipticalCurveTo_Radii() { - return (EReference) ellipticalCurveToEClass.getEStructuralFeatures() - .get(1); + public EReference getEllipticalArcTo_Radii() { + return (EReference) ellipticalArcToEClass.getEStructuralFeatures().get( + 0); } /** @@ -1074,9 +1112,9 @@ public class DGPackageImpl extends EPackageImpl implements DGPackage { * * @generated */ - public EAttribute getEllipticalCurveTo_Rotation() { - return (EAttribute) ellipticalCurveToEClass.getEStructuralFeatures() - .get(2); + public EAttribute getEllipticalArcTo_Rotation() { + return (EAttribute) ellipticalArcToEClass.getEStructuralFeatures().get( + 1); } /** @@ -1084,9 +1122,9 @@ public class DGPackageImpl extends EPackageImpl implements DGPackage { * * @generated */ - public EAttribute getEllipticalCurveTo_IsLargeArc() { - return (EAttribute) ellipticalCurveToEClass.getEStructuralFeatures() - .get(3); + public EAttribute getEllipticalArcTo_IsLargeArc() { + return (EAttribute) ellipticalArcToEClass.getEStructuralFeatures().get( + 2); } /** @@ -1094,9 +1132,9 @@ public class DGPackageImpl extends EPackageImpl implements DGPackage { * * @generated */ - public EAttribute getEllipticalCurveTo_IsSweep() { - return (EAttribute) ellipticalCurveToEClass.getEStructuralFeatures() - .get(4); + public EAttribute getEllipticalArcTo_IsSweep() { + return (EAttribute) ellipticalArcToEClass.getEStructuralFeatures().get( + 3); } /** @@ -1115,7 +1153,7 @@ public class DGPackageImpl extends EPackageImpl implements DGPackage { */ public EReference getQuadraticCurveTo_Point() { return (EReference) quadraticCurveToEClass.getEStructuralFeatures() - .get(0); + .get(1); } /** @@ -1125,7 +1163,7 @@ public class DGPackageImpl extends EPackageImpl implements DGPackage { */ public EReference getQuadraticCurveTo_Control() { return (EReference) quadraticCurveToEClass.getEStructuralFeatures() - .get(1); + .get(0); } /** @@ -1241,6 +1279,15 @@ public class DGPackageImpl extends EPackageImpl implements DGPackage { * * @generated */ + public EOperation getImage__SourceCannotBeEmpty__DiagnosticChain_Map() { + return imageEClass.getEOperations().get(0); + } + + /** + * <!-- begin-user-doc --> <!-- end-user-doc --> + * + * @generated + */ public EClass getLine() { return lineEClass; } @@ -1304,6 +1351,33 @@ public class DGPackageImpl extends EPackageImpl implements DGPackage { * * @generated */ + public EOperation getMarkedElement__ReferencedStartMarkerHasId__DiagnosticChain_Map() { + return markedElementEClass.getEOperations().get(0); + } + + /** + * <!-- begin-user-doc --> <!-- end-user-doc --> + * + * @generated + */ + public EOperation getMarkedElement__ReferencedMidMarkerHasId__DiagnosticChain_Map() { + return markedElementEClass.getEOperations().get(1); + } + + /** + * <!-- begin-user-doc --> <!-- end-user-doc --> + * + * @generated + */ + public EOperation getMarkedElement__ReferencedEndMarkerHasId__DiagnosticChain_Map() { + return markedElementEClass.getEOperations().get(2); + } + + /** + * <!-- begin-user-doc --> <!-- end-user-doc --> + * + * @generated + */ public EClass getMarker() { return markerEClass; } @@ -1468,6 +1542,15 @@ public class DGPackageImpl extends EPackageImpl implements DGPackage { * * @generated */ + public EOperation getPath__FirstCommandMustBeMove__DiagnosticChain_Map() { + return pathEClass.getEOperations().get(0); + } + + /** + * <!-- begin-user-doc --> <!-- end-user-doc --> + * + * @generated + */ public EClass getPattern() { return patternEClass; } @@ -1624,6 +1707,15 @@ public class DGPackageImpl extends EPackageImpl implements DGPackage { * * @generated */ + public EOperation getRectangle__NonNegativeCornerRadius__DiagnosticChain_Map() { + return rectangleEClass.getEOperations().get(0); + } + + /** + * <!-- begin-user-doc --> <!-- end-user-doc --> + * + * @generated + */ public EClass getRootCanvas() { return rootCanvasEClass; } @@ -1651,7 +1743,7 @@ public class DGPackageImpl extends EPackageImpl implements DGPackage { * * @generated */ - public EReference getRootCanvas_StyleSheet() { + public EReference getRootCanvas_ExternalStyleSheet() { return (EReference) rootCanvasEClass.getEStructuralFeatures().get(2); } @@ -1777,6 +1869,15 @@ public class DGPackageImpl extends EPackageImpl implements DGPackage { * * @generated */ + public EOperation getText__DataCannotBeEmpty__DiagnosticChain_Map() { + return textEClass.getEOperations().get(0); + } + + /** + * <!-- begin-user-doc --> <!-- end-user-doc --> + * + * @generated + */ public EClass getTranslate() { return translateEClass; } @@ -1822,6 +1923,24 @@ public class DGPackageImpl extends EPackageImpl implements DGPackage { * * @generated */ + public EReference getUse_ReferencedElement() { + return (EReference) useEClass.getEStructuralFeatures().get(1); + } + + /** + * <!-- begin-user-doc --> <!-- end-user-doc --> + * + * @generated + */ + public EOperation getUse__ReferencedElementHasId__DiagnosticChain_Map() { + return useEClass.getEOperations().get(0); + } + + /** + * <!-- begin-user-doc --> <!-- end-user-doc --> + * + * @generated + */ public EEnum getFontDecoration() { return fontDecorationEEnum; } @@ -1831,6 +1950,15 @@ public class DGPackageImpl extends EPackageImpl implements DGPackage { * * @generated */ + public EEnum getElementKind() { + return elementKindEEnum; + } + + /** + * <!-- begin-user-doc --> <!-- end-user-doc --> + * + * @generated + */ public DGFactory getDGFactory() { return (DGFactory) getEFactoryInstance(); } @@ -1857,6 +1985,8 @@ public class DGPackageImpl extends EPackageImpl implements DGPackage { // Create classes and their features canvasEClass = createEClass(CANVAS); createEReference(canvasEClass, CANVAS__BOUNDS); + createEOperation(canvasEClass, + CANVAS___CANVAS_CANNOT_HAVE_TRANSFORMS__DIAGNOSTICCHAIN_MAP); groupEClass = createEClass(GROUP); createEReference(groupEClass, GROUP__MEMBER); @@ -1864,12 +1994,16 @@ public class DGPackageImpl extends EPackageImpl implements DGPackage { graphicalElementEClass = createEClass(GRAPHICAL_ELEMENT); createEReference(graphicalElementEClass, GRAPHICAL_ELEMENT__CLIP_PATH); createEReference(graphicalElementEClass, GRAPHICAL_ELEMENT__GROUP); - createEAttribute(graphicalElementEClass, GRAPHICAL_ELEMENT__KEYWORD); + createEAttribute(graphicalElementEClass, GRAPHICAL_ELEMENT__CLASS); createEReference(graphicalElementEClass, GRAPHICAL_ELEMENT__STYLE); createEReference(graphicalElementEClass, GRAPHICAL_ELEMENT__TRANSFORM); + createEOperation(graphicalElementEClass, + GRAPHICAL_ELEMENT___REFERENCED_CLIPPATH_HAS_ID__DIAGNOSTICCHAIN_MAP); definitionEClass = createEClass(DEFINITION); createEAttribute(definitionEClass, DEFINITION__ID); + createEOperation(definitionEClass, + DEFINITION___ID_CANNOT_BE_EMPTY__DIAGNOSTICCHAIN_MAP); moveToEClass = createEClass(MOVE_TO); createEReference(moveToEClass, MOVE_TO__POINT); @@ -1905,6 +2039,8 @@ public class DGPackageImpl extends EPackageImpl implements DGPackage { paintEClass = createEClass(PAINT); createEAttribute(paintEClass, PAINT__COLOR); createEReference(paintEClass, PAINT__PAINT_SERVER); + createEOperation(paintEClass, + PAINT___REFERENCED_PAINT_SERVER_HAS_ID__DIAGNOSTICCHAIN_MAP); paintServerEClass = createEClass(PAINT_SERVER); createEReference(paintServerEClass, PAINT_SERVER__TRANSFORM); @@ -1920,9 +2056,9 @@ public class DGPackageImpl extends EPackageImpl implements DGPackage { closePathEClass = createEClass(CLOSE_PATH); cubicCurveToEClass = createEClass(CUBIC_CURVE_TO); - createEReference(cubicCurveToEClass, CUBIC_CURVE_TO__POINT); createEReference(cubicCurveToEClass, CUBIC_CURVE_TO__START_CONTROL); createEReference(cubicCurveToEClass, CUBIC_CURVE_TO__END_CONTROL); + createEReference(cubicCurveToEClass, CUBIC_CURVE_TO__POINT); definitionsEClass = createEClass(DEFINITIONS); createEReference(definitionsEClass, DEFINITIONS__DEFNITION); @@ -1936,24 +2072,23 @@ public class DGPackageImpl extends EPackageImpl implements DGPackage { createEReference(styleRuleEClass, STYLE_RULE__STYLE); styleSelectorEClass = createEClass(STYLE_SELECTOR); - createEReference(styleSelectorEClass, STYLE_SELECTOR__TYPE); - createEAttribute(styleSelectorEClass, STYLE_SELECTOR__KEYWORD); + createEAttribute(styleSelectorEClass, STYLE_SELECTOR__KIND); + createEAttribute(styleSelectorEClass, STYLE_SELECTOR__CLASS); ellipseEClass = createEClass(ELLIPSE); createEReference(ellipseEClass, ELLIPSE__CENTER); createEReference(ellipseEClass, ELLIPSE__RADII); - ellipticalCurveToEClass = createEClass(ELLIPTICAL_CURVE_TO); - createEReference(ellipticalCurveToEClass, ELLIPTICAL_CURVE_TO__POINT); - createEReference(ellipticalCurveToEClass, ELLIPTICAL_CURVE_TO__RADII); - createEAttribute(ellipticalCurveToEClass, ELLIPTICAL_CURVE_TO__ROTATION); - createEAttribute(ellipticalCurveToEClass, - ELLIPTICAL_CURVE_TO__IS_LARGE_ARC); - createEAttribute(ellipticalCurveToEClass, ELLIPTICAL_CURVE_TO__IS_SWEEP); + ellipticalArcToEClass = createEClass(ELLIPTICAL_ARC_TO); + createEReference(ellipticalArcToEClass, ELLIPTICAL_ARC_TO__RADII); + createEAttribute(ellipticalArcToEClass, ELLIPTICAL_ARC_TO__ROTATION); + createEAttribute(ellipticalArcToEClass, ELLIPTICAL_ARC_TO__IS_LARGE_ARC); + createEAttribute(ellipticalArcToEClass, ELLIPTICAL_ARC_TO__IS_SWEEP); + createEReference(ellipticalArcToEClass, ELLIPTICAL_ARC_TO__POINT); quadraticCurveToEClass = createEClass(QUADRATIC_CURVE_TO); - createEReference(quadraticCurveToEClass, QUADRATIC_CURVE_TO__POINT); createEReference(quadraticCurveToEClass, QUADRATIC_CURVE_TO__CONTROL); + createEReference(quadraticCurveToEClass, QUADRATIC_CURVE_TO__POINT); gradientEClass = createEClass(GRADIENT); createEReference(gradientEClass, GRADIENT__STOP); @@ -1971,6 +2106,8 @@ public class DGPackageImpl extends EPackageImpl implements DGPackage { createEAttribute(imageEClass, IMAGE__SOURCE); createEReference(imageEClass, IMAGE__BOUNDS); createEAttribute(imageEClass, IMAGE__IS_ASPECT_RATIO_PRESERVED); + createEOperation(imageEClass, + IMAGE___SOURCE_CANNOT_BE_EMPTY__DIAGNOSTICCHAIN_MAP); lineEClass = createEClass(LINE); createEReference(lineEClass, LINE__START); @@ -1980,6 +2117,12 @@ public class DGPackageImpl extends EPackageImpl implements DGPackage { createEReference(markedElementEClass, MARKED_ELEMENT__END_MARKER); createEReference(markedElementEClass, MARKED_ELEMENT__MID_MARKER); createEReference(markedElementEClass, MARKED_ELEMENT__START_MARKER); + createEOperation(markedElementEClass, + MARKED_ELEMENT___REFERENCED_START_MARKER_HAS_ID__DIAGNOSTICCHAIN_MAP); + createEOperation(markedElementEClass, + MARKED_ELEMENT___REFERENCED_MID_MARKER_HAS_ID__DIAGNOSTICCHAIN_MAP); + createEOperation(markedElementEClass, + MARKED_ELEMENT___REFERENCED_END_MARKER_HAS_ID__DIAGNOSTICCHAIN_MAP); markerEClass = createEClass(MARKER); createEReference(markerEClass, MARKER__SIZE); @@ -2004,6 +2147,8 @@ public class DGPackageImpl extends EPackageImpl implements DGPackage { pathEClass = createEClass(PATH); createEReference(pathEClass, PATH__COMMAND); + createEOperation(pathEClass, + PATH___FIRST_COMMAND_MUST_BE_MOVE__DIAGNOSTICCHAIN_MAP); patternEClass = createEClass(PATTERN); createEReference(patternEClass, PATTERN__BOUNDS); @@ -2029,11 +2174,13 @@ public class DGPackageImpl extends EPackageImpl implements DGPackage { rectangleEClass = createEClass(RECTANGLE); createEReference(rectangleEClass, RECTANGLE__BOUNDS); createEAttribute(rectangleEClass, RECTANGLE__CORNER_RADIUS); + createEOperation(rectangleEClass, + RECTANGLE___NON_NEGATIVE_CORNER_RADIUS__DIAGNOSTICCHAIN_MAP); rootCanvasEClass = createEClass(ROOT_CANVAS); createEAttribute(rootCanvasEClass, ROOT_CANVAS__BACKGROUND_COLOR); createEReference(rootCanvasEClass, ROOT_CANVAS__DEFINITIONS); - createEReference(rootCanvasEClass, ROOT_CANVAS__STYLE_SHEET); + createEReference(rootCanvasEClass, ROOT_CANVAS__EXTERNAL_STYLE_SHEET); rotateEClass = createEClass(ROTATE); createEAttribute(rotateEClass, ROTATE__ANGLE); @@ -2052,6 +2199,8 @@ public class DGPackageImpl extends EPackageImpl implements DGPackage { textEClass = createEClass(TEXT); createEAttribute(textEClass, TEXT__DATA); createEReference(textEClass, TEXT__POSITION); + createEOperation(textEClass, + TEXT___DATA_CANNOT_BE_EMPTY__DIAGNOSTICCHAIN_MAP); translateEClass = createEClass(TRANSLATE); createEAttribute(translateEClass, TRANSLATE__DELTA_X); @@ -2059,9 +2208,13 @@ public class DGPackageImpl extends EPackageImpl implements DGPackage { useEClass = createEClass(USE); createEReference(useEClass, USE__BOUNDS); + createEReference(useEClass, USE__REFERENCED_ELEMENT); + createEOperation(useEClass, + USE___REFERENCED_ELEMENT_HAS_ID__DIAGNOSTICCHAIN_MAP); // Create enums fontDecorationEEnum = createEEnum(FONT_DECORATION); + elementKindEEnum = createEEnum(ELEMENT_KIND); } /** @@ -2091,8 +2244,6 @@ public class DGPackageImpl extends EPackageImpl implements DGPackage { // Obtain other dependent packages DCPackage theDCPackage = (DCPackage) EPackage.Registry.INSTANCE .getEPackage(DCPackage.eNS_URI); - EcorePackage theEcorePackage = (EcorePackage) EPackage.Registry.INSTANCE - .getEPackage(EcorePackage.eNS_URI); // Create type parameters @@ -2109,7 +2260,7 @@ public class DGPackageImpl extends EPackageImpl implements DGPackage { closePathEClass.getESuperTypes().add(this.getPathCommand()); cubicCurveToEClass.getESuperTypes().add(this.getPathCommand()); ellipseEClass.getESuperTypes().add(this.getGraphicalElement()); - ellipticalCurveToEClass.getESuperTypes().add(this.getPathCommand()); + ellipticalArcToEClass.getESuperTypes().add(this.getPathCommand()); quadraticCurveToEClass.getESuperTypes().add(this.getPathCommand()); gradientEClass.getESuperTypes().add(this.getPaintServer()); imageEClass.getESuperTypes().add(this.getGraphicalElement()); @@ -2137,10 +2288,23 @@ public class DGPackageImpl extends EPackageImpl implements DGPackage { initEClass(canvasEClass, Canvas.class, "Canvas", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); initEReference(getCanvas_Bounds(), theDCPackage.getBounds(), null, - "bounds", null, 1, 1, Canvas.class, !IS_TRANSIENT, + "bounds", null, 0, 1, Canvas.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, !IS_ORDERED); + EOperation op = initEOperation( + getCanvas__CanvasCannotHaveTransforms__DiagnosticChain_Map(), + ecorePackage.getEBoolean(), "canvasCannotHaveTransforms", 0, 1, + IS_UNIQUE, IS_ORDERED); + addEParameter(op, ecorePackage.getEDiagnosticChain(), "diagnostics", 0, + 1, IS_UNIQUE, IS_ORDERED); + EGenericType g1 = createEGenericType(ecorePackage.getEMap()); + EGenericType g2 = createEGenericType(ecorePackage.getEJavaObject()); + g1.getETypeArguments().add(g2); + g2 = createEGenericType(ecorePackage.getEJavaObject()); + g1.getETypeArguments().add(g2); + addEParameter(op, g1, "context", 0, 1, IS_UNIQUE, IS_ORDERED); + initEClass(groupEClass, Group.class, "Group", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); initEReference(getGroup_Member(), this.getGraphicalElement(), @@ -2162,8 +2326,8 @@ public class DGPackageImpl extends EPackageImpl implements DGPackage { GraphicalElement.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, !IS_ORDERED); - initEAttribute(getGraphicalElement_Keyword(), theDCPackage.getString(), - "keyword", null, 0, -1, GraphicalElement.class, !IS_TRANSIENT, + initEAttribute(getGraphicalElement_Class(), theDCPackage.getString(), + "class", null, 0, -1, GraphicalElement.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); initEReference(getGraphicalElement_Style(), this.getStyle(), null, @@ -2176,13 +2340,39 @@ public class DGPackageImpl extends EPackageImpl implements DGPackage { !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); + op = initEOperation( + getGraphicalElement__ReferencedClippathHasId__DiagnosticChain_Map(), + ecorePackage.getEBoolean(), "referencedClippathHasId", 0, 1, + IS_UNIQUE, IS_ORDERED); + addEParameter(op, ecorePackage.getEDiagnosticChain(), "diagnostics", 0, + 1, IS_UNIQUE, IS_ORDERED); + g1 = createEGenericType(ecorePackage.getEMap()); + g2 = createEGenericType(ecorePackage.getEJavaObject()); + g1.getETypeArguments().add(g2); + g2 = createEGenericType(ecorePackage.getEJavaObject()); + g1.getETypeArguments().add(g2); + addEParameter(op, g1, "context", 0, 1, IS_UNIQUE, IS_ORDERED); + initEClass(definitionEClass, Definition.class, "Definition", IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); initEAttribute(getDefinition_Id(), theDCPackage.getString(), "id", - null, 1, 1, Definition.class, !IS_TRANSIENT, !IS_VOLATILE, + null, 0, 1, Definition.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, IS_ID, IS_UNIQUE, !IS_DERIVED, !IS_ORDERED); + op = initEOperation( + getDefinition__IdCannotBeEmpty__DiagnosticChain_Map(), + ecorePackage.getEBoolean(), "idCannotBeEmpty", 0, 1, IS_UNIQUE, + IS_ORDERED); + addEParameter(op, ecorePackage.getEDiagnosticChain(), "diagnostics", 0, + 1, IS_UNIQUE, IS_ORDERED); + g1 = createEGenericType(ecorePackage.getEMap()); + g2 = createEGenericType(ecorePackage.getEJavaObject()); + g1.getETypeArguments().add(g2); + g2 = createEGenericType(ecorePackage.getEJavaObject()); + g1.getETypeArguments().add(g2); + addEParameter(op, g1, "context", 0, 1, IS_UNIQUE, IS_ORDERED); + initEClass(moveToEClass, MoveTo.class, "MoveTo", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); initEReference(getMoveTo_Point(), theDCPackage.getPoint(), null, @@ -2247,14 +2437,13 @@ public class DGPackageImpl extends EPackageImpl implements DGPackage { !IS_VOLATILE, IS_CHANGEABLE, IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, !IS_ORDERED); - EOperation op = initEOperation( - getStyle__ValidFontSize__DiagnosticChain_Map(), + op = initEOperation(getStyle__ValidFontSize__DiagnosticChain_Map(), ecorePackage.getEBoolean(), "validFontSize", 0, 1, IS_UNIQUE, IS_ORDERED); addEParameter(op, ecorePackage.getEDiagnosticChain(), "diagnostics", 0, 1, IS_UNIQUE, IS_ORDERED); - EGenericType g1 = createEGenericType(ecorePackage.getEMap()); - EGenericType g2 = createEGenericType(ecorePackage.getEJavaObject()); + g1 = createEGenericType(ecorePackage.getEMap()); + g2 = createEGenericType(ecorePackage.getEJavaObject()); g1.getETypeArguments().add(g2); g2 = createEGenericType(ecorePackage.getEJavaObject()); g1.getETypeArguments().add(g2); @@ -2321,6 +2510,19 @@ public class DGPackageImpl extends EPackageImpl implements DGPackage { !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, !IS_ORDERED); + op = initEOperation( + getPaint__ReferencedPaintServerHasId__DiagnosticChain_Map(), + ecorePackage.getEBoolean(), "referencedPaintServerHasId", 0, 1, + IS_UNIQUE, IS_ORDERED); + addEParameter(op, ecorePackage.getEDiagnosticChain(), "diagnostics", 0, + 1, IS_UNIQUE, IS_ORDERED); + g1 = createEGenericType(ecorePackage.getEMap()); + g2 = createEGenericType(ecorePackage.getEJavaObject()); + g1.getETypeArguments().add(g2); + g2 = createEGenericType(ecorePackage.getEJavaObject()); + g1.getETypeArguments().add(g2); + addEParameter(op, g1, "context", 0, 1, IS_UNIQUE, IS_ORDERED); + initEClass(paintServerEClass, PaintServer.class, "PaintServer", IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); initEReference(getPaintServer_Transform(), this.getTransform(), null, @@ -2338,7 +2540,7 @@ public class DGPackageImpl extends EPackageImpl implements DGPackage { !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, !IS_ORDERED); initEAttribute(getCircle_Radius(), theDCPackage.getReal(), "radius", - null, 1, 1, Circle.class, !IS_TRANSIENT, !IS_VOLATILE, + "0", 1, 1, Circle.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, !IS_ORDERED); @@ -2360,10 +2562,6 @@ public class DGPackageImpl extends EPackageImpl implements DGPackage { initEClass(cubicCurveToEClass, CubicCurveTo.class, "CubicCurveTo", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); - initEReference(getCubicCurveTo_Point(), theDCPackage.getPoint(), null, - "point", null, 1, 1, CubicCurveTo.class, !IS_TRANSIENT, - !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, - !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, !IS_ORDERED); initEReference(getCubicCurveTo_StartControl(), theDCPackage.getPoint(), null, "startControl", null, 1, 1, CubicCurveTo.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, @@ -2374,6 +2572,10 @@ public class DGPackageImpl extends EPackageImpl implements DGPackage { !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, !IS_ORDERED); + initEReference(getCubicCurveTo_Point(), theDCPackage.getPoint(), null, + "point", null, 1, 1, CubicCurveTo.class, !IS_TRANSIENT, + !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, + !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, !IS_ORDERED); initEClass(definitionsEClass, Definitions.class, "Definitions", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); @@ -2406,12 +2608,12 @@ public class DGPackageImpl extends EPackageImpl implements DGPackage { initEClass(styleSelectorEClass, StyleSelector.class, "StyleSelector", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); - initEReference(getStyleSelector_Type(), theEcorePackage.getEClass(), - null, "type", null, 0, 1, StyleSelector.class, !IS_TRANSIENT, - !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, - !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, !IS_ORDERED); - initEAttribute(getStyleSelector_Keyword(), theDCPackage.getString(), - "keyword", null, 0, -1, StyleSelector.class, !IS_TRANSIENT, + initEAttribute(getStyleSelector_Kind(), this.getElementKind(), "kind", + null, 0, 1, StyleSelector.class, !IS_TRANSIENT, !IS_VOLATILE, + IS_CHANGEABLE, IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, + !IS_ORDERED); + initEAttribute(getStyleSelector_Class(), theDCPackage.getString(), + "class", null, 0, -1, StyleSelector.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); @@ -2426,44 +2628,43 @@ public class DGPackageImpl extends EPackageImpl implements DGPackage { !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, !IS_ORDERED); - initEClass(ellipticalCurveToEClass, EllipticalCurveTo.class, - "EllipticalCurveTo", !IS_ABSTRACT, !IS_INTERFACE, + initEClass(ellipticalArcToEClass, EllipticalArcTo.class, + "EllipticalArcTo", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); - initEReference(getEllipticalCurveTo_Point(), theDCPackage.getPoint(), - null, "point", null, 1, 1, EllipticalCurveTo.class, + initEReference(getEllipticalArcTo_Radii(), theDCPackage.getDimension(), + null, "radii", null, 1, 1, EllipticalArcTo.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, !IS_ORDERED); - initEReference(getEllipticalCurveTo_Radii(), - theDCPackage.getDimension(), null, "radii", null, 1, 1, - EllipticalCurveTo.class, !IS_TRANSIENT, !IS_VOLATILE, - IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, - !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, !IS_ORDERED); - initEAttribute(getEllipticalCurveTo_Rotation(), theDCPackage.getReal(), - "rotation", null, 1, 1, EllipticalCurveTo.class, !IS_TRANSIENT, + initEAttribute(getEllipticalArcTo_Rotation(), theDCPackage.getReal(), + "rotation", null, 1, 1, EllipticalArcTo.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, !IS_ORDERED); - initEAttribute(getEllipticalCurveTo_IsLargeArc(), + initEAttribute(getEllipticalArcTo_IsLargeArc(), theDCPackage.getBoolean(), "isLargeArc", null, 1, 1, - EllipticalCurveTo.class, !IS_TRANSIENT, !IS_VOLATILE, + EllipticalArcTo.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, !IS_ORDERED); - initEAttribute(getEllipticalCurveTo_IsSweep(), - theDCPackage.getBoolean(), "isSweep", null, 1, 1, - EllipticalCurveTo.class, !IS_TRANSIENT, !IS_VOLATILE, - IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, + initEAttribute(getEllipticalArcTo_IsSweep(), theDCPackage.getBoolean(), + "isSweep", null, 1, 1, EllipticalArcTo.class, !IS_TRANSIENT, + !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, + !IS_DERIVED, !IS_ORDERED); + initEReference(getEllipticalArcTo_Point(), theDCPackage.getPoint(), + null, "point", null, 1, 1, EllipticalArcTo.class, + !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, + !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, !IS_ORDERED); initEClass(quadraticCurveToEClass, QuadraticCurveTo.class, "QuadraticCurveTo", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); - initEReference(getQuadraticCurveTo_Point(), theDCPackage.getPoint(), - null, "point", null, 1, 1, QuadraticCurveTo.class, + initEReference(getQuadraticCurveTo_Control(), theDCPackage.getPoint(), + null, "control", null, 1, 1, QuadraticCurveTo.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, !IS_ORDERED); - initEReference(getQuadraticCurveTo_Control(), theDCPackage.getPoint(), - null, "control", null, 1, 1, QuadraticCurveTo.class, + initEReference(getQuadraticCurveTo_Point(), theDCPackage.getPoint(), + null, "point", null, 1, 1, QuadraticCurveTo.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, !IS_ORDERED); @@ -2478,16 +2679,16 @@ public class DGPackageImpl extends EPackageImpl implements DGPackage { initEClass(gradientStopEClass, GradientStop.class, "GradientStop", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); initEAttribute(getGradientStop_Color(), theDCPackage.getColor(), - "color", null, 1, 1, GradientStop.class, !IS_TRANSIENT, - !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, + "color", null, 0, 1, GradientStop.class, !IS_TRANSIENT, + !IS_VOLATILE, IS_CHANGEABLE, IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, !IS_ORDERED); initEAttribute(getGradientStop_Offset(), theDCPackage.getReal(), - "offset", null, 1, 1, GradientStop.class, !IS_TRANSIENT, - !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, + "offset", null, 0, 1, GradientStop.class, !IS_TRANSIENT, + !IS_VOLATILE, IS_CHANGEABLE, IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, !IS_ORDERED); initEAttribute(getGradientStop_Opacity(), theDCPackage.getReal(), - "opacity", "1", 1, 1, GradientStop.class, !IS_TRANSIENT, - !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, + "opacity", null, 0, 1, GradientStop.class, !IS_TRANSIENT, + !IS_VOLATILE, IS_CHANGEABLE, IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, !IS_ORDERED); op = initEOperation( @@ -2527,10 +2728,23 @@ public class DGPackageImpl extends EPackageImpl implements DGPackage { IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, !IS_ORDERED); initEAttribute(getImage_IsAspectRatioPreserved(), - theDCPackage.getBoolean(), "isAspectRatioPreserved", null, 1, - 1, Image.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, + theDCPackage.getBoolean(), "isAspectRatioPreserved", "false", + 1, 1, Image.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, !IS_ORDERED); + op = initEOperation( + getImage__SourceCannotBeEmpty__DiagnosticChain_Map(), + ecorePackage.getEBoolean(), "sourceCannotBeEmpty", 0, 1, + IS_UNIQUE, IS_ORDERED); + addEParameter(op, ecorePackage.getEDiagnosticChain(), "diagnostics", 0, + 1, IS_UNIQUE, IS_ORDERED); + g1 = createEGenericType(ecorePackage.getEMap()); + g2 = createEGenericType(ecorePackage.getEJavaObject()); + g1.getETypeArguments().add(g2); + g2 = createEGenericType(ecorePackage.getEJavaObject()); + g1.getETypeArguments().add(g2); + addEParameter(op, g1, "context", 0, 1, IS_UNIQUE, IS_ORDERED); + initEClass(lineEClass, Line.class, "Line", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); initEReference(getLine_Start(), theDCPackage.getPoint(), null, "start", @@ -2557,6 +2771,45 @@ public class DGPackageImpl extends EPackageImpl implements DGPackage { !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, !IS_ORDERED); + op = initEOperation( + getMarkedElement__ReferencedStartMarkerHasId__DiagnosticChain_Map(), + ecorePackage.getEBoolean(), "referencedStartMarkerHasId", 0, 1, + IS_UNIQUE, IS_ORDERED); + addEParameter(op, ecorePackage.getEDiagnosticChain(), "diagnostics", 0, + 1, IS_UNIQUE, IS_ORDERED); + g1 = createEGenericType(ecorePackage.getEMap()); + g2 = createEGenericType(ecorePackage.getEJavaObject()); + g1.getETypeArguments().add(g2); + g2 = createEGenericType(ecorePackage.getEJavaObject()); + g1.getETypeArguments().add(g2); + addEParameter(op, g1, "context", 0, 1, IS_UNIQUE, IS_ORDERED); + + op = initEOperation( + getMarkedElement__ReferencedMidMarkerHasId__DiagnosticChain_Map(), + ecorePackage.getEBoolean(), "referencedMidMarkerHasId", 0, 1, + IS_UNIQUE, IS_ORDERED); + addEParameter(op, ecorePackage.getEDiagnosticChain(), "diagnostics", 0, + 1, IS_UNIQUE, IS_ORDERED); + g1 = createEGenericType(ecorePackage.getEMap()); + g2 = createEGenericType(ecorePackage.getEJavaObject()); + g1.getETypeArguments().add(g2); + g2 = createEGenericType(ecorePackage.getEJavaObject()); + g1.getETypeArguments().add(g2); + addEParameter(op, g1, "context", 0, 1, IS_UNIQUE, IS_ORDERED); + + op = initEOperation( + getMarkedElement__ReferencedEndMarkerHasId__DiagnosticChain_Map(), + ecorePackage.getEBoolean(), "referencedEndMarkerHasId", 0, 1, + IS_UNIQUE, IS_ORDERED); + addEParameter(op, ecorePackage.getEDiagnosticChain(), "diagnostics", 0, + 1, IS_UNIQUE, IS_ORDERED); + g1 = createEGenericType(ecorePackage.getEMap()); + g2 = createEGenericType(ecorePackage.getEJavaObject()); + g1.getETypeArguments().add(g2); + g2 = createEGenericType(ecorePackage.getEJavaObject()); + g1.getETypeArguments().add(g2); + addEParameter(op, g1, "context", 0, 1, IS_UNIQUE, IS_ORDERED); + initEClass(markerEClass, Marker.class, "Marker", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); initEReference(getMarker_Size(), theDCPackage.getDimension(), null, @@ -2624,10 +2877,23 @@ public class DGPackageImpl extends EPackageImpl implements DGPackage { initEClass(pathEClass, Path.class, "Path", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); initEReference(getPath_Command(), this.getPathCommand(), null, - "command", null, 0, -1, Path.class, !IS_TRANSIENT, + "command", null, 1, -1, Path.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); + op = initEOperation( + getPath__FirstCommandMustBeMove__DiagnosticChain_Map(), + ecorePackage.getEBoolean(), "firstCommandMustBeMove", 0, 1, + IS_UNIQUE, IS_ORDERED); + addEParameter(op, ecorePackage.getEDiagnosticChain(), "diagnostics", 0, + 1, IS_UNIQUE, IS_ORDERED); + g1 = createEGenericType(ecorePackage.getEMap()); + g2 = createEGenericType(ecorePackage.getEJavaObject()); + g1.getETypeArguments().add(g2); + g2 = createEGenericType(ecorePackage.getEJavaObject()); + g1.getETypeArguments().add(g2); + addEParameter(op, g1, "context", 0, 1, IS_UNIQUE, IS_ORDERED); + initEClass(patternEClass, Pattern.class, "Pattern", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); initEReference(getPattern_Bounds(), theDCPackage.getBounds(), null, @@ -2716,10 +2982,23 @@ public class DGPackageImpl extends EPackageImpl implements DGPackage { !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, !IS_ORDERED); initEAttribute(getRectangle_CornerRadius(), theDCPackage.getReal(), - "cornerRadius", "0", 1, 1, Rectangle.class, !IS_TRANSIENT, - !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, + "cornerRadius", "0", 0, 1, Rectangle.class, !IS_TRANSIENT, + !IS_VOLATILE, IS_CHANGEABLE, IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, !IS_ORDERED); + op = initEOperation( + getRectangle__NonNegativeCornerRadius__DiagnosticChain_Map(), + ecorePackage.getEBoolean(), "nonNegativeCornerRadius", 0, 1, + IS_UNIQUE, IS_ORDERED); + addEParameter(op, ecorePackage.getEDiagnosticChain(), "diagnostics", 0, + 1, IS_UNIQUE, IS_ORDERED); + g1 = createEGenericType(ecorePackage.getEMap()); + g2 = createEGenericType(ecorePackage.getEJavaObject()); + g1.getETypeArguments().add(g2); + g2 = createEGenericType(ecorePackage.getEJavaObject()); + g1.getETypeArguments().add(g2); + addEParameter(op, g1, "context", 0, 1, IS_UNIQUE, IS_ORDERED); + initEClass(rootCanvasEClass, RootCanvas.class, "RootCanvas", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); initEAttribute(getRootCanvas_BackgroundColor(), @@ -2731,10 +3010,11 @@ public class DGPackageImpl extends EPackageImpl implements DGPackage { !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); - initEReference(getRootCanvas_StyleSheet(), this.getStyleSheet(), null, - "styleSheet", null, 0, -1, RootCanvas.class, !IS_TRANSIENT, - !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, - !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); + initEReference(getRootCanvas_ExternalStyleSheet(), + this.getStyleSheet(), null, "externalStyleSheet", null, 0, -1, + RootCanvas.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, + !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, + !IS_DERIVED, IS_ORDERED); initEClass(rotateEClass, Rotate.class, "Rotate", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); @@ -2791,6 +3071,18 @@ public class DGPackageImpl extends EPackageImpl implements DGPackage { !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, !IS_ORDERED); + op = initEOperation(getText__DataCannotBeEmpty__DiagnosticChain_Map(), + ecorePackage.getEBoolean(), "dataCannotBeEmpty", 0, 1, + IS_UNIQUE, IS_ORDERED); + addEParameter(op, ecorePackage.getEDiagnosticChain(), "diagnostics", 0, + 1, IS_UNIQUE, IS_ORDERED); + g1 = createEGenericType(ecorePackage.getEMap()); + g2 = createEGenericType(ecorePackage.getEJavaObject()); + g1.getETypeArguments().add(g2); + g2 = createEGenericType(ecorePackage.getEJavaObject()); + g1.getETypeArguments().add(g2); + addEParameter(op, g1, "context", 0, 1, IS_UNIQUE, IS_ORDERED); + initEClass(translateEClass, Translate.class, "Translate", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); initEAttribute(getTranslate_DeltaX(), theDCPackage.getReal(), "deltaX", @@ -2805,9 +3097,27 @@ public class DGPackageImpl extends EPackageImpl implements DGPackage { initEClass(useEClass, Use.class, "Use", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); initEReference(getUse_Bounds(), theDCPackage.getBounds(), null, - "bounds", null, 1, 1, Use.class, !IS_TRANSIENT, !IS_VOLATILE, + "bounds", null, 0, 1, Use.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, !IS_ORDERED); + initEReference(getUse_ReferencedElement(), this.getGraphicalElement(), + null, "referencedElement", null, 1, 1, Use.class, + !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, + IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, + IS_ORDERED); + + op = initEOperation( + getUse__ReferencedElementHasId__DiagnosticChain_Map(), + ecorePackage.getEBoolean(), "referencedElementHasId", 0, 1, + IS_UNIQUE, IS_ORDERED); + addEParameter(op, ecorePackage.getEDiagnosticChain(), "diagnostics", 0, + 1, IS_UNIQUE, IS_ORDERED); + g1 = createEGenericType(ecorePackage.getEMap()); + g2 = createEGenericType(ecorePackage.getEJavaObject()); + g1.getETypeArguments().add(g2); + g2 = createEGenericType(ecorePackage.getEJavaObject()); + g1.getETypeArguments().add(g2); + addEParameter(op, g1, "context", 0, 1, IS_UNIQUE, IS_ORDERED); // Initialize enums and add enum literals initEEnum(fontDecorationEEnum, FontDecoration.class, "FontDecoration"); @@ -2815,6 +3125,22 @@ public class DGPackageImpl extends EPackageImpl implements DGPackage { addEEnumLiteral(fontDecorationEEnum, FontDecoration.OVERLINE); addEEnumLiteral(fontDecorationEEnum, FontDecoration.LINE_THROUGH); + initEEnum(elementKindEEnum, ElementKind.class, "ElementKind"); + addEEnumLiteral(elementKindEEnum, ElementKind.CANVAS); + addEEnumLiteral(elementKindEEnum, ElementKind.CIRCLE); + addEEnumLiteral(elementKindEEnum, ElementKind.CLIP_PATH); + addEEnumLiteral(elementKindEEnum, ElementKind.ELLIPSE); + addEEnumLiteral(elementKindEEnum, ElementKind.GROUP); + addEEnumLiteral(elementKindEEnum, ElementKind.IMAGE); + addEEnumLiteral(elementKindEEnum, ElementKind.LINE); + addEEnumLiteral(elementKindEEnum, ElementKind.MARKER); + addEEnumLiteral(elementKindEEnum, ElementKind.PATH); + addEEnumLiteral(elementKindEEnum, ElementKind.POLYGON); + addEEnumLiteral(elementKindEEnum, ElementKind.POLYLINE); + addEEnumLiteral(elementKindEEnum, ElementKind.RECTANGLE); + addEEnumLiteral(elementKindEEnum, ElementKind.TEXT); + addEEnumLiteral(elementKindEEnum, ElementKind.USE); + // Create resource createResource(eNS_URI); @@ -2847,6 +3173,17 @@ public class DGPackageImpl extends EPackageImpl implements DGPackage { */ protected void createOCLAnnotations() { String source = "http://www.eclipse.org/emf/2002/Ecore/OCL"; + addAnnotation( + getCanvas__CanvasCannotHaveTransforms__DiagnosticChain_Map(), + source, new String[] { "body", "transform->isEmpty()" }); + addAnnotation( + getGraphicalElement__ReferencedClippathHasId__DiagnosticChain_Map(), + source, + new String[] { "body", + "clipPath->notEmpty() implies clipPath.id->notEmpty()" }); + addAnnotation(getDefinition__IdCannotBeEmpty__DiagnosticChain_Map(), + source, new String[] { "body", + "id->notEmpty() implies id.size() > 0" }); addAnnotation(getStyle__ValidFontSize__DiagnosticChain_Map(), source, new String[] { "body", "fontSize >= 0" }); addAnnotation(getStyle__ValidFillOpacity__DiagnosticChain_Map(), @@ -2860,18 +3197,44 @@ public class DGPackageImpl extends EPackageImpl implements DGPackage { addAnnotation(getStyle__ValidStrokeOpacity__DiagnosticChain_Map(), source, new String[] { "body", "strokeOpacity >= 0 and strokeOpacity <=1" }); + addAnnotation( + getPaint__ReferencedPaintServerHasId__DiagnosticChain_Map(), + source, + new String[] { "body", + "paintServer->notEmpty() implies paintServer.id->notEmpty()" }); addAnnotation(getCircle__NonNegativeRadius__DiagnosticChain_Map(), source, new String[] { "body", "radius >= 0" }); addAnnotation(getGradientStop__ValidOffset__DiagnosticChain_Map(), source, new String[] { "body", "offset>=0 and offset<=1" }); addAnnotation(getGradientStop__ValidOpacity__DiagnosticChain_Map(), source, new String[] { "body", "opacity>=0 and opacity<=1" }); + addAnnotation(getImage__SourceCannotBeEmpty__DiagnosticChain_Map(), + source, new String[] { "body", + "source->notEmpty() implies source.size() > 0" }); + addAnnotation( + getMarkedElement__ReferencedStartMarkerHasId__DiagnosticChain_Map(), + source, + new String[] { "body", + "startMarker->notEmpty() implies startMarker.id->notEmpty()" }); + addAnnotation( + getMarkedElement__ReferencedMidMarkerHasId__DiagnosticChain_Map(), + source, + new String[] { "body", + "midMarker->notEmpty() implies midMarker.id->notEmpty()" }); + addAnnotation( + getMarkedElement__ReferencedEndMarkerHasId__DiagnosticChain_Map(), + source, + new String[] { "body", + "endMarker->notEmpty() implies endMarker.id->notEmpty()" }); addAnnotation( getLinearGradient__ValidGradientVector__DiagnosticChain_Map(), source, new String[] { "body", "start.x>=0 and start.x<=1 and end.x>=0 and end.x<=1 and start.y>=0 and start.y<=1 and end.y>=0 and end.y<=1" }); + addAnnotation(getPath__FirstCommandMustBeMove__DiagnosticChain_Map(), + source, new String[] { "body", + "command->first().oclIsKindOf(MoveTo)" }); addAnnotation( getRadialGradient__ValidCenterPoint__DiagnosticChain_Map(), source, @@ -2883,8 +3246,19 @@ public class DGPackageImpl extends EPackageImpl implements DGPackage { "focusX>=0 and focusX<=1 and focusY>=0 and focusY<=1" }); addAnnotation(getRadialGradient__ValidRadius__DiagnosticChain_Map(), source, new String[] { "body", "radius>=0 and radius<=1" }); + addAnnotation( + getRectangle__NonNegativeCornerRadius__DiagnosticChain_Map(), + source, new String[] { "body", "cornerRadius >= 0" }); addAnnotation(getScale__Nonnegativescale__DiagnosticChain_Map(), source, new String[] { "body", "factorX>=0 and factorY>=0" }); + addAnnotation(getText__DataCannotBeEmpty__DiagnosticChain_Map(), + source, new String[] { "body", + "data->notEmpty() implies data.size() > 0" }); + addAnnotation( + getUse__ReferencedElementHasId__DiagnosticChain_Map(), + source, + new String[] { "body", + "referencedElement->notEmpty() implies referencedElement.id->notEmpty()" }); } } // DGPackageImpl diff --git a/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/impl/DefinitionImpl.java b/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/impl/DefinitionImpl.java index 15f9c3feb45..cf5e63c411d 100644 --- a/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/impl/DefinitionImpl.java +++ b/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/impl/DefinitionImpl.java @@ -11,8 +11,13 @@ */ package org.eclipse.papyrus.dd.dg.impl; +import java.lang.reflect.InvocationTargetException; +import java.util.Map; import org.eclipse.emf.common.notify.Notification; +import org.eclipse.emf.common.util.Diagnostic; +import org.eclipse.emf.common.util.DiagnosticChain; +import org.eclipse.emf.common.util.EList; import org.eclipse.emf.ecore.EClass; import org.eclipse.emf.ecore.impl.ENotificationImpl; @@ -20,6 +25,7 @@ import org.eclipse.emf.ecore.impl.MinimalEObjectImpl; import org.eclipse.papyrus.dd.dg.DGPackage; import org.eclipse.papyrus.dd.dg.Definition; +import org.eclipse.papyrus.dd.dg.util.DGValidator; /** * <!-- begin-user-doc --> An implementation of the model object ' @@ -97,6 +103,39 @@ public abstract class DefinitionImpl extends MinimalEObjectImpl.Container } /** + * The cached validation expression for the ' + * {@link #idCannotBeEmpty(org.eclipse.emf.common.util.DiagnosticChain, java.util.Map) + * <em>Id Cannot Be Empty</em>}' invariant operation. <!-- begin-user-doc + * --> <!-- end-user-doc --> + * + * @see #idCannotBeEmpty(org.eclipse.emf.common.util.DiagnosticChain, + * java.util.Map) + * @generated + * @ordered + */ + protected static final String ID_CANNOT_BE_EMPTY_DIAGNOSTIC_CHAIN_MAP__EEXPRESSION = "id->notEmpty() implies id.size() > 0"; + + /** + * <!-- begin-user-doc --> <!-- end-user-doc --> + * + * @generated + */ + public boolean idCannotBeEmpty(DiagnosticChain diagnostics, + Map<Object, Object> context) { + return DGValidator + .validate( + DGPackage.Literals.DEFINITION, + this, + diagnostics, + context, + "http://www.eclipse.org/emf/2002/Ecore/OCL", + DGPackage.Literals.DEFINITION___ID_CANNOT_BE_EMPTY__DIAGNOSTICCHAIN_MAP, + ID_CANNOT_BE_EMPTY_DIAGNOSTIC_CHAIN_MAP__EEXPRESSION, + Diagnostic.ERROR, DGValidator.DIAGNOSTIC_SOURCE, + DGValidator.DEFINITION__ID_CANNOT_BE_EMPTY); + } + + /** * <!-- begin-user-doc --> <!-- end-user-doc --> * * @generated @@ -160,6 +199,23 @@ public abstract class DefinitionImpl extends MinimalEObjectImpl.Container * @generated */ @Override + @SuppressWarnings("unchecked") + public Object eInvoke(int operationID, EList<?> arguments) + throws InvocationTargetException { + switch (operationID) { + case DGPackage.DEFINITION___ID_CANNOT_BE_EMPTY__DIAGNOSTICCHAIN_MAP: + return idCannotBeEmpty((DiagnosticChain) arguments.get(0), + (Map<Object, Object>) arguments.get(1)); + } + return super.eInvoke(operationID, arguments); + } + + /** + * <!-- begin-user-doc --> <!-- end-user-doc --> + * + * @generated + */ + @Override public String toString() { if (eIsProxy()) return super.toString(); diff --git a/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/impl/DefinitionsImpl.java b/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/impl/DefinitionsImpl.java index e32f3ffcd9c..e46b3c59200 100644 --- a/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/impl/DefinitionsImpl.java +++ b/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/impl/DefinitionsImpl.java @@ -38,7 +38,7 @@ import org.eclipse.papyrus.dd.dg.StyleSheet; * <p> * The following features are implemented: * <ul> - * <li>{@link org.eclipse.papyrus.dd.dg.impl.DefinitionsImpl#getDefnition <em> + * <li>{@link org.eclipse.papyrus.dd.dg.impl.DefinitionsImpl#getDefnitions <em> * Defnition</em>}</li> * <li>{@link org.eclipse.papyrus.dd.dg.impl.DefinitionsImpl#getStyleSheet <em> * Style Sheet</em>}</li> @@ -50,14 +50,14 @@ import org.eclipse.papyrus.dd.dg.StyleSheet; public class DefinitionsImpl extends MinimalEObjectImpl.Container implements Definitions { /** - * The cached value of the '{@link #getDefnition() <em>Defnition</em>}' + * The cached value of the '{@link #getDefnitions() <em>Defnition</em>}' * containment reference list. <!-- begin-user-doc --> <!-- end-user-doc --> * - * @see #getDefnition() + * @see #getDefnitions() * @generated * @ordered */ - protected EList<Definition> defnition; + protected EList<Definition> defnitions; /** * The cached value of the '{@link #getStyleSheet() <em>Style Sheet</em>}' @@ -93,12 +93,12 @@ public class DefinitionsImpl extends MinimalEObjectImpl.Container implements * * @generated */ - public EList<Definition> getDefnition() { - if (defnition == null) { - defnition = new EObjectContainmentEList<Definition>( + public EList<Definition> getDefnitions() { + if (defnitions == null) { + defnitions = new EObjectContainmentEList<Definition>( Definition.class, this, DGPackage.DEFINITIONS__DEFNITION); } - return defnition; + return defnitions; } /** @@ -168,7 +168,7 @@ public class DefinitionsImpl extends MinimalEObjectImpl.Container implements int featureID, NotificationChain msgs) { switch (featureID) { case DGPackage.DEFINITIONS__DEFNITION: - return ((InternalEList<?>) getDefnition()).basicRemove(otherEnd, + return ((InternalEList<?>) getDefnitions()).basicRemove(otherEnd, msgs); case DGPackage.DEFINITIONS__STYLE_SHEET: return basicSetStyleSheet(null, msgs); @@ -185,7 +185,7 @@ public class DefinitionsImpl extends MinimalEObjectImpl.Container implements public Object eGet(int featureID, boolean resolve, boolean coreType) { switch (featureID) { case DGPackage.DEFINITIONS__DEFNITION: - return getDefnition(); + return getDefnitions(); case DGPackage.DEFINITIONS__STYLE_SHEET: return getStyleSheet(); } @@ -202,8 +202,8 @@ public class DefinitionsImpl extends MinimalEObjectImpl.Container implements public void eSet(int featureID, Object newValue) { switch (featureID) { case DGPackage.DEFINITIONS__DEFNITION: - getDefnition().clear(); - getDefnition().addAll((Collection<? extends Definition>) newValue); + getDefnitions().clear(); + getDefnitions().addAll((Collection<? extends Definition>) newValue); return; case DGPackage.DEFINITIONS__STYLE_SHEET: setStyleSheet((StyleSheet) newValue); @@ -221,7 +221,7 @@ public class DefinitionsImpl extends MinimalEObjectImpl.Container implements public void eUnset(int featureID) { switch (featureID) { case DGPackage.DEFINITIONS__DEFNITION: - getDefnition().clear(); + getDefnitions().clear(); return; case DGPackage.DEFINITIONS__STYLE_SHEET: setStyleSheet((StyleSheet) null); @@ -239,7 +239,7 @@ public class DefinitionsImpl extends MinimalEObjectImpl.Container implements public boolean eIsSet(int featureID) { switch (featureID) { case DGPackage.DEFINITIONS__DEFNITION: - return defnition != null && !defnition.isEmpty(); + return defnitions != null && !defnitions.isEmpty(); case DGPackage.DEFINITIONS__STYLE_SHEET: return styleSheet != null; } diff --git a/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/impl/EllipticalCurveToImpl.java b/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/impl/EllipticalArcToImpl.java index 521d03a3238..d3289965e48 100644 --- a/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/impl/EllipticalCurveToImpl.java +++ b/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/impl/EllipticalArcToImpl.java @@ -23,41 +23,31 @@ import org.eclipse.papyrus.dd.dc.Dimension; import org.eclipse.papyrus.dd.dc.Point; import org.eclipse.papyrus.dd.dg.DGPackage; -import org.eclipse.papyrus.dd.dg.EllipticalCurveTo; +import org.eclipse.papyrus.dd.dg.EllipticalArcTo; /** * <!-- begin-user-doc --> An implementation of the model object ' - * <em><b>Elliptical Curve To</b></em>'. <!-- end-user-doc --> + * <em><b>Elliptical Arc To</b></em>'. <!-- end-user-doc --> * <p> * The following features are implemented: * <ul> - * <li>{@link org.eclipse.papyrus.dd.dg.impl.EllipticalCurveToImpl#getPoint <em> - * Point</em>}</li> - * <li>{@link org.eclipse.papyrus.dd.dg.impl.EllipticalCurveToImpl#getRadii <em> + * <li>{@link org.eclipse.papyrus.dd.dg.impl.EllipticalArcToImpl#getRadii <em> * Radii</em>}</li> - * <li>{@link org.eclipse.papyrus.dd.dg.impl.EllipticalCurveToImpl#getRotation + * <li>{@link org.eclipse.papyrus.dd.dg.impl.EllipticalArcToImpl#getRotation * <em>Rotation</em>}</li> - * <li>{@link org.eclipse.papyrus.dd.dg.impl.EllipticalCurveToImpl#isLargeArc - * <em>Is Large Arc</em>}</li> - * <li>{@link org.eclipse.papyrus.dd.dg.impl.EllipticalCurveToImpl#isSweep <em> - * Is Sweep</em>}</li> + * <li>{@link org.eclipse.papyrus.dd.dg.impl.EllipticalArcToImpl#isLargeArc <em> + * Is Large Arc</em>}</li> + * <li>{@link org.eclipse.papyrus.dd.dg.impl.EllipticalArcToImpl#isSweep <em>Is + * Sweep</em>}</li> + * <li>{@link org.eclipse.papyrus.dd.dg.impl.EllipticalArcToImpl#getPoint <em> + * Point</em>}</li> * </ul> * </p> * * @generated */ -public class EllipticalCurveToImpl extends PathCommandImpl implements - EllipticalCurveTo { - /** - * The cached value of the '{@link #getPoint() <em>Point</em>}' containment - * reference. <!-- begin-user-doc --> <!-- end-user-doc --> - * - * @see #getPoint() - * @generated - * @ordered - */ - protected Point point; - +public class EllipticalArcToImpl extends PathCommandImpl implements + EllipticalArcTo { /** * The cached value of the '{@link #getRadii() <em>Radii</em>}' containment * reference. <!-- begin-user-doc --> <!-- end-user-doc --> @@ -129,52 +119,22 @@ public class EllipticalCurveToImpl extends PathCommandImpl implements protected boolean isSweep = IS_SWEEP_EDEFAULT; /** - * <!-- begin-user-doc --> <!-- end-user-doc --> - * - * @generated - */ - protected EllipticalCurveToImpl() { - super(); - } - - /** - * <!-- begin-user-doc --> <!-- end-user-doc --> - * - * @generated - */ - @Override - protected EClass eStaticClass() { - return DGPackage.Literals.ELLIPTICAL_CURVE_TO; - } - - /** - * <!-- begin-user-doc --> <!-- end-user-doc --> + * The cached value of the '{@link #getPoint() <em>Point</em>}' containment + * reference. <!-- begin-user-doc --> <!-- end-user-doc --> * + * @see #getPoint() * @generated + * @ordered */ - public Point getPoint() { - return point; - } + protected Point point; /** * <!-- begin-user-doc --> <!-- end-user-doc --> * * @generated */ - public NotificationChain basicSetPoint(Point newPoint, - NotificationChain msgs) { - Point oldPoint = point; - point = newPoint; - if (eNotificationRequired()) { - ENotificationImpl notification = new ENotificationImpl(this, - Notification.SET, DGPackage.ELLIPTICAL_CURVE_TO__POINT, - oldPoint, newPoint); - if (msgs == null) - msgs = notification; - else - msgs.add(notification); - } - return msgs; + protected EllipticalArcToImpl() { + super(); } /** @@ -182,25 +142,9 @@ public class EllipticalCurveToImpl extends PathCommandImpl implements * * @generated */ - public void setPoint(Point newPoint) { - if (newPoint != point) { - NotificationChain msgs = null; - if (point != null) - msgs = ((InternalEObject) point).eInverseRemove(this, - EOPPOSITE_FEATURE_BASE - - DGPackage.ELLIPTICAL_CURVE_TO__POINT, null, - msgs); - if (newPoint != null) - msgs = ((InternalEObject) newPoint).eInverseAdd(this, - EOPPOSITE_FEATURE_BASE - - DGPackage.ELLIPTICAL_CURVE_TO__POINT, null, - msgs); - msgs = basicSetPoint(newPoint, msgs); - if (msgs != null) - msgs.dispatch(); - } else if (eNotificationRequired()) - eNotify(new ENotificationImpl(this, Notification.SET, - DGPackage.ELLIPTICAL_CURVE_TO__POINT, newPoint, newPoint)); + @Override + protected EClass eStaticClass() { + return DGPackage.Literals.ELLIPTICAL_ARC_TO; } /** @@ -223,7 +167,7 @@ public class EllipticalCurveToImpl extends PathCommandImpl implements radii = newRadii; if (eNotificationRequired()) { ENotificationImpl notification = new ENotificationImpl(this, - Notification.SET, DGPackage.ELLIPTICAL_CURVE_TO__RADII, + Notification.SET, DGPackage.ELLIPTICAL_ARC_TO__RADII, oldRadii, newRadii); if (msgs == null) msgs = notification; @@ -244,19 +188,19 @@ public class EllipticalCurveToImpl extends PathCommandImpl implements if (radii != null) msgs = ((InternalEObject) radii).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - - DGPackage.ELLIPTICAL_CURVE_TO__RADII, null, + - DGPackage.ELLIPTICAL_ARC_TO__RADII, null, msgs); if (newRadii != null) msgs = ((InternalEObject) newRadii).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - - DGPackage.ELLIPTICAL_CURVE_TO__RADII, null, + - DGPackage.ELLIPTICAL_ARC_TO__RADII, null, msgs); msgs = basicSetRadii(newRadii, msgs); if (msgs != null) msgs.dispatch(); } else if (eNotificationRequired()) eNotify(new ENotificationImpl(this, Notification.SET, - DGPackage.ELLIPTICAL_CURVE_TO__RADII, newRadii, newRadii)); + DGPackage.ELLIPTICAL_ARC_TO__RADII, newRadii, newRadii)); } /** @@ -278,7 +222,7 @@ public class EllipticalCurveToImpl extends PathCommandImpl implements rotation = newRotation; if (eNotificationRequired()) eNotify(new ENotificationImpl(this, Notification.SET, - DGPackage.ELLIPTICAL_CURVE_TO__ROTATION, oldRotation, + DGPackage.ELLIPTICAL_ARC_TO__ROTATION, oldRotation, rotation)); } @@ -301,7 +245,7 @@ public class EllipticalCurveToImpl extends PathCommandImpl implements isLargeArc = newIsLargeArc; if (eNotificationRequired()) eNotify(new ENotificationImpl(this, Notification.SET, - DGPackage.ELLIPTICAL_CURVE_TO__IS_LARGE_ARC, oldIsLargeArc, + DGPackage.ELLIPTICAL_ARC_TO__IS_LARGE_ARC, oldIsLargeArc, isLargeArc)); } @@ -324,8 +268,63 @@ public class EllipticalCurveToImpl extends PathCommandImpl implements isSweep = newIsSweep; if (eNotificationRequired()) eNotify(new ENotificationImpl(this, Notification.SET, - DGPackage.ELLIPTICAL_CURVE_TO__IS_SWEEP, oldIsSweep, - isSweep)); + DGPackage.ELLIPTICAL_ARC_TO__IS_SWEEP, oldIsSweep, isSweep)); + } + + /** + * <!-- begin-user-doc --> <!-- end-user-doc --> + * + * @generated + */ + public Point getPoint() { + return point; + } + + /** + * <!-- begin-user-doc --> <!-- end-user-doc --> + * + * @generated + */ + public NotificationChain basicSetPoint(Point newPoint, + NotificationChain msgs) { + Point oldPoint = point; + point = newPoint; + if (eNotificationRequired()) { + ENotificationImpl notification = new ENotificationImpl(this, + Notification.SET, DGPackage.ELLIPTICAL_ARC_TO__POINT, + oldPoint, newPoint); + if (msgs == null) + msgs = notification; + else + msgs.add(notification); + } + return msgs; + } + + /** + * <!-- begin-user-doc --> <!-- end-user-doc --> + * + * @generated + */ + public void setPoint(Point newPoint) { + if (newPoint != point) { + NotificationChain msgs = null; + if (point != null) + msgs = ((InternalEObject) point).eInverseRemove(this, + EOPPOSITE_FEATURE_BASE + - DGPackage.ELLIPTICAL_ARC_TO__POINT, null, + msgs); + if (newPoint != null) + msgs = ((InternalEObject) newPoint).eInverseAdd(this, + EOPPOSITE_FEATURE_BASE + - DGPackage.ELLIPTICAL_ARC_TO__POINT, null, + msgs); + msgs = basicSetPoint(newPoint, msgs); + if (msgs != null) + msgs.dispatch(); + } else if (eNotificationRequired()) + eNotify(new ENotificationImpl(this, Notification.SET, + DGPackage.ELLIPTICAL_ARC_TO__POINT, newPoint, newPoint)); } /** @@ -337,10 +336,10 @@ public class EllipticalCurveToImpl extends PathCommandImpl implements public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) { switch (featureID) { - case DGPackage.ELLIPTICAL_CURVE_TO__POINT: - return basicSetPoint(null, msgs); - case DGPackage.ELLIPTICAL_CURVE_TO__RADII: + case DGPackage.ELLIPTICAL_ARC_TO__RADII: return basicSetRadii(null, msgs); + case DGPackage.ELLIPTICAL_ARC_TO__POINT: + return basicSetPoint(null, msgs); } return super.eInverseRemove(otherEnd, featureID, msgs); } @@ -353,16 +352,16 @@ public class EllipticalCurveToImpl extends PathCommandImpl implements @Override public Object eGet(int featureID, boolean resolve, boolean coreType) { switch (featureID) { - case DGPackage.ELLIPTICAL_CURVE_TO__POINT: - return getPoint(); - case DGPackage.ELLIPTICAL_CURVE_TO__RADII: + case DGPackage.ELLIPTICAL_ARC_TO__RADII: return getRadii(); - case DGPackage.ELLIPTICAL_CURVE_TO__ROTATION: + case DGPackage.ELLIPTICAL_ARC_TO__ROTATION: return getRotation(); - case DGPackage.ELLIPTICAL_CURVE_TO__IS_LARGE_ARC: + case DGPackage.ELLIPTICAL_ARC_TO__IS_LARGE_ARC: return isLargeArc(); - case DGPackage.ELLIPTICAL_CURVE_TO__IS_SWEEP: + case DGPackage.ELLIPTICAL_ARC_TO__IS_SWEEP: return isSweep(); + case DGPackage.ELLIPTICAL_ARC_TO__POINT: + return getPoint(); } return super.eGet(featureID, resolve, coreType); } @@ -375,21 +374,21 @@ public class EllipticalCurveToImpl extends PathCommandImpl implements @Override public void eSet(int featureID, Object newValue) { switch (featureID) { - case DGPackage.ELLIPTICAL_CURVE_TO__POINT: - setPoint((Point) newValue); - return; - case DGPackage.ELLIPTICAL_CURVE_TO__RADII: + case DGPackage.ELLIPTICAL_ARC_TO__RADII: setRadii((Dimension) newValue); return; - case DGPackage.ELLIPTICAL_CURVE_TO__ROTATION: + case DGPackage.ELLIPTICAL_ARC_TO__ROTATION: setRotation((Double) newValue); return; - case DGPackage.ELLIPTICAL_CURVE_TO__IS_LARGE_ARC: + case DGPackage.ELLIPTICAL_ARC_TO__IS_LARGE_ARC: setIsLargeArc((Boolean) newValue); return; - case DGPackage.ELLIPTICAL_CURVE_TO__IS_SWEEP: + case DGPackage.ELLIPTICAL_ARC_TO__IS_SWEEP: setIsSweep((Boolean) newValue); return; + case DGPackage.ELLIPTICAL_ARC_TO__POINT: + setPoint((Point) newValue); + return; } super.eSet(featureID, newValue); } @@ -402,21 +401,21 @@ public class EllipticalCurveToImpl extends PathCommandImpl implements @Override public void eUnset(int featureID) { switch (featureID) { - case DGPackage.ELLIPTICAL_CURVE_TO__POINT: - setPoint((Point) null); - return; - case DGPackage.ELLIPTICAL_CURVE_TO__RADII: + case DGPackage.ELLIPTICAL_ARC_TO__RADII: setRadii((Dimension) null); return; - case DGPackage.ELLIPTICAL_CURVE_TO__ROTATION: + case DGPackage.ELLIPTICAL_ARC_TO__ROTATION: setRotation(ROTATION_EDEFAULT); return; - case DGPackage.ELLIPTICAL_CURVE_TO__IS_LARGE_ARC: + case DGPackage.ELLIPTICAL_ARC_TO__IS_LARGE_ARC: setIsLargeArc(IS_LARGE_ARC_EDEFAULT); return; - case DGPackage.ELLIPTICAL_CURVE_TO__IS_SWEEP: + case DGPackage.ELLIPTICAL_ARC_TO__IS_SWEEP: setIsSweep(IS_SWEEP_EDEFAULT); return; + case DGPackage.ELLIPTICAL_ARC_TO__POINT: + setPoint((Point) null); + return; } super.eUnset(featureID); } @@ -429,16 +428,16 @@ public class EllipticalCurveToImpl extends PathCommandImpl implements @Override public boolean eIsSet(int featureID) { switch (featureID) { - case DGPackage.ELLIPTICAL_CURVE_TO__POINT: - return point != null; - case DGPackage.ELLIPTICAL_CURVE_TO__RADII: + case DGPackage.ELLIPTICAL_ARC_TO__RADII: return radii != null; - case DGPackage.ELLIPTICAL_CURVE_TO__ROTATION: + case DGPackage.ELLIPTICAL_ARC_TO__ROTATION: return rotation != ROTATION_EDEFAULT; - case DGPackage.ELLIPTICAL_CURVE_TO__IS_LARGE_ARC: + case DGPackage.ELLIPTICAL_ARC_TO__IS_LARGE_ARC: return isLargeArc != IS_LARGE_ARC_EDEFAULT; - case DGPackage.ELLIPTICAL_CURVE_TO__IS_SWEEP: + case DGPackage.ELLIPTICAL_ARC_TO__IS_SWEEP: return isSweep != IS_SWEEP_EDEFAULT; + case DGPackage.ELLIPTICAL_ARC_TO__POINT: + return point != null; } return super.eIsSet(featureID); } @@ -464,4 +463,4 @@ public class EllipticalCurveToImpl extends PathCommandImpl implements return result.toString(); } -} // EllipticalCurveToImpl +} // EllipticalArcToImpl diff --git a/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/impl/GradientImpl.java b/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/impl/GradientImpl.java index a098541473e..2d929f7299c 100644 --- a/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/impl/GradientImpl.java +++ b/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/impl/GradientImpl.java @@ -28,8 +28,8 @@ import org.eclipse.papyrus.dd.dg.GradientStop; * <p> * The following features are implemented: * <ul> - * <li>{@link org.eclipse.papyrus.dd.dg.impl.GradientImpl#getStop <em>Stop</em>} - * </li> + * <li>{@link org.eclipse.papyrus.dd.dg.impl.GradientImpl#getStops <em>Stop + * </em>}</li> * </ul> * </p> * @@ -37,14 +37,14 @@ import org.eclipse.papyrus.dd.dg.GradientStop; */ public abstract class GradientImpl extends PaintServerImpl implements Gradient { /** - * The cached value of the '{@link #getStop() <em>Stop</em>}' containment + * The cached value of the '{@link #getStops() <em>Stop</em>}' containment * reference list. <!-- begin-user-doc --> <!-- end-user-doc --> * - * @see #getStop() + * @see #getStops() * @generated * @ordered */ - protected EList<GradientStop> stop; + protected EList<GradientStop> stops; /** * <!-- begin-user-doc --> <!-- end-user-doc --> @@ -70,12 +70,12 @@ public abstract class GradientImpl extends PaintServerImpl implements Gradient { * * @generated */ - public EList<GradientStop> getStop() { - if (stop == null) { - stop = new EObjectContainmentEList<GradientStop>( + public EList<GradientStop> getStops() { + if (stops == null) { + stops = new EObjectContainmentEList<GradientStop>( GradientStop.class, this, DGPackage.GRADIENT__STOP); } - return stop; + return stops; } /** @@ -88,7 +88,7 @@ public abstract class GradientImpl extends PaintServerImpl implements Gradient { int featureID, NotificationChain msgs) { switch (featureID) { case DGPackage.GRADIENT__STOP: - return ((InternalEList<?>) getStop()).basicRemove(otherEnd, msgs); + return ((InternalEList<?>) getStops()).basicRemove(otherEnd, msgs); } return super.eInverseRemove(otherEnd, featureID, msgs); } @@ -102,7 +102,7 @@ public abstract class GradientImpl extends PaintServerImpl implements Gradient { public Object eGet(int featureID, boolean resolve, boolean coreType) { switch (featureID) { case DGPackage.GRADIENT__STOP: - return getStop(); + return getStops(); } return super.eGet(featureID, resolve, coreType); } @@ -117,8 +117,8 @@ public abstract class GradientImpl extends PaintServerImpl implements Gradient { public void eSet(int featureID, Object newValue) { switch (featureID) { case DGPackage.GRADIENT__STOP: - getStop().clear(); - getStop().addAll((Collection<? extends GradientStop>) newValue); + getStops().clear(); + getStops().addAll((Collection<? extends GradientStop>) newValue); return; } super.eSet(featureID, newValue); @@ -133,7 +133,7 @@ public abstract class GradientImpl extends PaintServerImpl implements Gradient { public void eUnset(int featureID) { switch (featureID) { case DGPackage.GRADIENT__STOP: - getStop().clear(); + getStops().clear(); return; } super.eUnset(featureID); @@ -148,7 +148,7 @@ public abstract class GradientImpl extends PaintServerImpl implements Gradient { public boolean eIsSet(int featureID) { switch (featureID) { case DGPackage.GRADIENT__STOP: - return stop != null && !stop.isEmpty(); + return stops != null && !stops.isEmpty(); } return super.eIsSet(featureID); } diff --git a/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/impl/GradientStopImpl.java b/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/impl/GradientStopImpl.java index a6fae0a8d35..a80f8c9e7b7 100644 --- a/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/impl/GradientStopImpl.java +++ b/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/impl/GradientStopImpl.java @@ -73,6 +73,15 @@ public class GradientStopImpl extends MinimalEObjectImpl.Container implements protected Color color = COLOR_EDEFAULT; /** + * This is true if the Color attribute has been set. <!-- begin-user-doc --> + * <!-- end-user-doc --> + * + * @generated + * @ordered + */ + protected boolean colorESet; + + /** * The default value of the '{@link #getOffset() <em>Offset</em>}' * attribute. <!-- begin-user-doc --> <!-- end-user-doc --> * @@ -93,6 +102,15 @@ public class GradientStopImpl extends MinimalEObjectImpl.Container implements protected double offset = OFFSET_EDEFAULT; /** + * This is true if the Offset attribute has been set. <!-- begin-user-doc + * --> <!-- end-user-doc --> + * + * @generated + * @ordered + */ + protected boolean offsetESet; + + /** * The default value of the '{@link #getOpacity() <em>Opacity</em>}' * attribute. <!-- begin-user-doc --> <!-- end-user-doc --> * @@ -100,7 +118,7 @@ public class GradientStopImpl extends MinimalEObjectImpl.Container implements * @generated * @ordered */ - protected static final double OPACITY_EDEFAULT = 1.0; + protected static final double OPACITY_EDEFAULT = 0.0; /** * The cached value of the '{@link #getOpacity() <em>Opacity</em>}' @@ -113,6 +131,15 @@ public class GradientStopImpl extends MinimalEObjectImpl.Container implements protected double opacity = OPACITY_EDEFAULT; /** + * This is true if the Opacity attribute has been set. <!-- begin-user-doc + * --> <!-- end-user-doc --> + * + * @generated + * @ordered + */ + protected boolean opacityESet; + + /** * <!-- begin-user-doc --> <!-- end-user-doc --> * * @generated @@ -148,9 +175,37 @@ public class GradientStopImpl extends MinimalEObjectImpl.Container implements public void setColor(Color newColor) { Color oldColor = color; color = newColor; + boolean oldColorESet = colorESet; + colorESet = true; if (eNotificationRequired()) eNotify(new ENotificationImpl(this, Notification.SET, - DGPackage.GRADIENT_STOP__COLOR, oldColor, color)); + DGPackage.GRADIENT_STOP__COLOR, oldColor, color, + !oldColorESet)); + } + + /** + * <!-- begin-user-doc --> <!-- end-user-doc --> + * + * @generated + */ + public void unsetColor() { + Color oldColor = color; + boolean oldColorESet = colorESet; + color = COLOR_EDEFAULT; + colorESet = false; + if (eNotificationRequired()) + eNotify(new ENotificationImpl(this, Notification.UNSET, + DGPackage.GRADIENT_STOP__COLOR, oldColor, COLOR_EDEFAULT, + oldColorESet)); + } + + /** + * <!-- begin-user-doc --> <!-- end-user-doc --> + * + * @generated + */ + public boolean isSetColor() { + return colorESet; } /** @@ -170,9 +225,37 @@ public class GradientStopImpl extends MinimalEObjectImpl.Container implements public void setOffset(double newOffset) { double oldOffset = offset; offset = newOffset; + boolean oldOffsetESet = offsetESet; + offsetESet = true; if (eNotificationRequired()) eNotify(new ENotificationImpl(this, Notification.SET, - DGPackage.GRADIENT_STOP__OFFSET, oldOffset, offset)); + DGPackage.GRADIENT_STOP__OFFSET, oldOffset, offset, + !oldOffsetESet)); + } + + /** + * <!-- begin-user-doc --> <!-- end-user-doc --> + * + * @generated + */ + public void unsetOffset() { + double oldOffset = offset; + boolean oldOffsetESet = offsetESet; + offset = OFFSET_EDEFAULT; + offsetESet = false; + if (eNotificationRequired()) + eNotify(new ENotificationImpl(this, Notification.UNSET, + DGPackage.GRADIENT_STOP__OFFSET, oldOffset, + OFFSET_EDEFAULT, oldOffsetESet)); + } + + /** + * <!-- begin-user-doc --> <!-- end-user-doc --> + * + * @generated + */ + public boolean isSetOffset() { + return offsetESet; } /** @@ -192,9 +275,37 @@ public class GradientStopImpl extends MinimalEObjectImpl.Container implements public void setOpacity(double newOpacity) { double oldOpacity = opacity; opacity = newOpacity; + boolean oldOpacityESet = opacityESet; + opacityESet = true; if (eNotificationRequired()) eNotify(new ENotificationImpl(this, Notification.SET, - DGPackage.GRADIENT_STOP__OPACITY, oldOpacity, opacity)); + DGPackage.GRADIENT_STOP__OPACITY, oldOpacity, opacity, + !oldOpacityESet)); + } + + /** + * <!-- begin-user-doc --> <!-- end-user-doc --> + * + * @generated + */ + public void unsetOpacity() { + double oldOpacity = opacity; + boolean oldOpacityESet = opacityESet; + opacity = OPACITY_EDEFAULT; + opacityESet = false; + if (eNotificationRequired()) + eNotify(new ENotificationImpl(this, Notification.UNSET, + DGPackage.GRADIENT_STOP__OPACITY, oldOpacity, + OPACITY_EDEFAULT, oldOpacityESet)); + } + + /** + * <!-- begin-user-doc --> <!-- end-user-doc --> + * + * @generated + */ + public boolean isSetOpacity() { + return opacityESet; } /** @@ -311,13 +422,13 @@ public class GradientStopImpl extends MinimalEObjectImpl.Container implements public void eUnset(int featureID) { switch (featureID) { case DGPackage.GRADIENT_STOP__COLOR: - setColor(COLOR_EDEFAULT); + unsetColor(); return; case DGPackage.GRADIENT_STOP__OFFSET: - setOffset(OFFSET_EDEFAULT); + unsetOffset(); return; case DGPackage.GRADIENT_STOP__OPACITY: - setOpacity(OPACITY_EDEFAULT); + unsetOpacity(); return; } super.eUnset(featureID); @@ -332,12 +443,11 @@ public class GradientStopImpl extends MinimalEObjectImpl.Container implements public boolean eIsSet(int featureID) { switch (featureID) { case DGPackage.GRADIENT_STOP__COLOR: - return COLOR_EDEFAULT == null ? color != null : !COLOR_EDEFAULT - .equals(color); + return isSetColor(); case DGPackage.GRADIENT_STOP__OFFSET: - return offset != OFFSET_EDEFAULT; + return isSetOffset(); case DGPackage.GRADIENT_STOP__OPACITY: - return opacity != OPACITY_EDEFAULT; + return isSetOpacity(); } return super.eIsSet(featureID); } @@ -374,11 +484,20 @@ public class GradientStopImpl extends MinimalEObjectImpl.Container implements StringBuffer result = new StringBuffer(super.toString()); result.append(" (color: "); - result.append(color); + if (colorESet) + result.append(color); + else + result.append("<unset>"); result.append(", offset: "); - result.append(offset); + if (offsetESet) + result.append(offset); + else + result.append("<unset>"); result.append(", opacity: "); - result.append(opacity); + if (opacityESet) + result.append(opacity); + else + result.append("<unset>"); result.append(')'); return result.toString(); } diff --git a/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/impl/GraphicalElementImpl.java b/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/impl/GraphicalElementImpl.java index ab9813a2a3a..79583e6f7a6 100644 --- a/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/impl/GraphicalElementImpl.java +++ b/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/impl/GraphicalElementImpl.java @@ -11,29 +11,28 @@ */ package org.eclipse.papyrus.dd.dg.impl; +import java.lang.reflect.InvocationTargetException; import java.util.Collection; - +import java.util.Map; import org.eclipse.emf.common.notify.Notification; import org.eclipse.emf.common.notify.NotificationChain; - +import org.eclipse.emf.common.util.Diagnostic; +import org.eclipse.emf.common.util.DiagnosticChain; import org.eclipse.emf.common.util.EList; - import org.eclipse.emf.ecore.EClass; import org.eclipse.emf.ecore.InternalEObject; - import org.eclipse.emf.ecore.impl.ENotificationImpl; - import org.eclipse.emf.ecore.util.EDataTypeUniqueEList; import org.eclipse.emf.ecore.util.EObjectContainmentEList; import org.eclipse.emf.ecore.util.EcoreUtil; import org.eclipse.emf.ecore.util.InternalEList; - import org.eclipse.papyrus.dd.dg.ClipPath; import org.eclipse.papyrus.dd.dg.DGPackage; import org.eclipse.papyrus.dd.dg.GraphicalElement; import org.eclipse.papyrus.dd.dg.Group; import org.eclipse.papyrus.dd.dg.Style; import org.eclipse.papyrus.dd.dg.Transform; +import org.eclipse.papyrus.dd.dg.util.DGValidator; /** * <!-- begin-user-doc --> An implementation of the model object ' @@ -45,11 +44,11 @@ import org.eclipse.papyrus.dd.dg.Transform; * <em>Clip Path</em>}</li> * <li>{@link org.eclipse.papyrus.dd.dg.impl.GraphicalElementImpl#getGroup <em> * Group</em>}</li> - * <li>{@link org.eclipse.papyrus.dd.dg.impl.GraphicalElementImpl#getKeyword - * <em>Keyword</em>}</li> + * <li>{@link org.eclipse.papyrus.dd.dg.impl.GraphicalElementImpl#getClasses + * <em>Class</em>}</li> * <li>{@link org.eclipse.papyrus.dd.dg.impl.GraphicalElementImpl#getStyle <em> * Style</em>}</li> - * <li>{@link org.eclipse.papyrus.dd.dg.impl.GraphicalElementImpl#getTransform + * <li>{@link org.eclipse.papyrus.dd.dg.impl.GraphicalElementImpl#getTransforms * <em>Transform</em>}</li> * </ul> * </p> @@ -69,14 +68,14 @@ public abstract class GraphicalElementImpl extends DefinitionImpl implements protected ClipPath clipPath; /** - * The cached value of the '{@link #getKeyword() <em>Keyword</em>}' - * attribute list. <!-- begin-user-doc --> <!-- end-user-doc --> + * The cached value of the '{@link #getClasses() <em>Class</em>}' attribute + * list. <!-- begin-user-doc --> <!-- end-user-doc --> * - * @see #getKeyword() + * @see #getClasses() * @generated * @ordered */ - protected EList<String> keyword; + protected EList<String> classes; /** * The cached value of the '{@link #getStyle() <em>Style</em>}' containment @@ -89,14 +88,14 @@ public abstract class GraphicalElementImpl extends DefinitionImpl implements protected Style style; /** - * The cached value of the '{@link #getTransform() <em>Transform</em>}' + * The cached value of the '{@link #getTransforms() <em>Transform</em>}' * containment reference list. <!-- begin-user-doc --> <!-- end-user-doc --> * - * @see #getTransform() + * @see #getTransforms() * @generated * @ordered */ - protected EList<Transform> transform; + protected EList<Transform> transforms; /** * <!-- begin-user-doc --> <!-- end-user-doc --> @@ -212,12 +211,12 @@ public abstract class GraphicalElementImpl extends DefinitionImpl implements * * @generated */ - public EList<String> getKeyword() { - if (keyword == null) { - keyword = new EDataTypeUniqueEList<String>(String.class, this, - DGPackage.GRAPHICAL_ELEMENT__KEYWORD); + public EList<String> getClasses() { + if (classes == null) { + classes = new EDataTypeUniqueEList<String>(String.class, this, + DGPackage.GRAPHICAL_ELEMENT__CLASS); } - return keyword; + return classes; } /** @@ -281,12 +280,47 @@ public abstract class GraphicalElementImpl extends DefinitionImpl implements * * @generated */ - public EList<Transform> getTransform() { - if (transform == null) { - transform = new EObjectContainmentEList<Transform>(Transform.class, - this, DGPackage.GRAPHICAL_ELEMENT__TRANSFORM); + public EList<Transform> getTransforms() { + if (transforms == null) { + transforms = new EObjectContainmentEList<Transform>( + Transform.class, this, + DGPackage.GRAPHICAL_ELEMENT__TRANSFORM); } - return transform; + return transforms; + } + + /** + * The cached validation expression for the ' + * {@link #referencedClippathHasId(org.eclipse.emf.common.util.DiagnosticChain, java.util.Map) + * <em>Referenced Clippath Has Id</em>}' invariant operation. <!-- + * begin-user-doc --> <!-- end-user-doc --> + * + * @see #referencedClippathHasId(org.eclipse.emf.common.util.DiagnosticChain, + * java.util.Map) + * @generated + * @ordered + */ + protected static final String REFERENCED_CLIPPATH_HAS_ID_DIAGNOSTIC_CHAIN_MAP__EEXPRESSION = "clipPath->notEmpty() implies clipPath.id->notEmpty()"; + + /** + * <!-- begin-user-doc --> <!-- end-user-doc --> + * + * @generated + */ + public boolean referencedClippathHasId(DiagnosticChain diagnostics, + Map<Object, Object> context) { + return DGValidator + .validate( + DGPackage.Literals.GRAPHICAL_ELEMENT, + this, + diagnostics, + context, + "http://www.eclipse.org/emf/2002/Ecore/OCL", + DGPackage.Literals.GRAPHICAL_ELEMENT___REFERENCED_CLIPPATH_HAS_ID__DIAGNOSTICCHAIN_MAP, + REFERENCED_CLIPPATH_HAS_ID_DIAGNOSTIC_CHAIN_MAP__EEXPRESSION, + Diagnostic.ERROR, + DGValidator.DIAGNOSTIC_SOURCE, + DGValidator.GRAPHICAL_ELEMENT__REFERENCED_CLIPPATH_HAS_ID); } /** @@ -320,7 +354,7 @@ public abstract class GraphicalElementImpl extends DefinitionImpl implements case DGPackage.GRAPHICAL_ELEMENT__STYLE: return basicSetStyle(null, msgs); case DGPackage.GRAPHICAL_ELEMENT__TRANSFORM: - return ((InternalEList<?>) getTransform()).basicRemove(otherEnd, + return ((InternalEList<?>) getTransforms()).basicRemove(otherEnd, msgs); } return super.eInverseRemove(otherEnd, featureID, msgs); @@ -356,12 +390,12 @@ public abstract class GraphicalElementImpl extends DefinitionImpl implements return basicGetClipPath(); case DGPackage.GRAPHICAL_ELEMENT__GROUP: return getGroup(); - case DGPackage.GRAPHICAL_ELEMENT__KEYWORD: - return getKeyword(); + case DGPackage.GRAPHICAL_ELEMENT__CLASS: + return getClasses(); case DGPackage.GRAPHICAL_ELEMENT__STYLE: return getStyle(); case DGPackage.GRAPHICAL_ELEMENT__TRANSFORM: - return getTransform(); + return getTransforms(); } return super.eGet(featureID, resolve, coreType); } @@ -381,16 +415,16 @@ public abstract class GraphicalElementImpl extends DefinitionImpl implements case DGPackage.GRAPHICAL_ELEMENT__GROUP: setGroup((Group) newValue); return; - case DGPackage.GRAPHICAL_ELEMENT__KEYWORD: - getKeyword().clear(); - getKeyword().addAll((Collection<? extends String>) newValue); + case DGPackage.GRAPHICAL_ELEMENT__CLASS: + getClasses().clear(); + getClasses().addAll((Collection<? extends String>) newValue); return; case DGPackage.GRAPHICAL_ELEMENT__STYLE: setStyle((Style) newValue); return; case DGPackage.GRAPHICAL_ELEMENT__TRANSFORM: - getTransform().clear(); - getTransform().addAll((Collection<? extends Transform>) newValue); + getTransforms().clear(); + getTransforms().addAll((Collection<? extends Transform>) newValue); return; } super.eSet(featureID, newValue); @@ -410,14 +444,14 @@ public abstract class GraphicalElementImpl extends DefinitionImpl implements case DGPackage.GRAPHICAL_ELEMENT__GROUP: setGroup((Group) null); return; - case DGPackage.GRAPHICAL_ELEMENT__KEYWORD: - getKeyword().clear(); + case DGPackage.GRAPHICAL_ELEMENT__CLASS: + getClasses().clear(); return; case DGPackage.GRAPHICAL_ELEMENT__STYLE: setStyle((Style) null); return; case DGPackage.GRAPHICAL_ELEMENT__TRANSFORM: - getTransform().clear(); + getTransforms().clear(); return; } super.eUnset(featureID); @@ -435,12 +469,12 @@ public abstract class GraphicalElementImpl extends DefinitionImpl implements return clipPath != null; case DGPackage.GRAPHICAL_ELEMENT__GROUP: return getGroup() != null; - case DGPackage.GRAPHICAL_ELEMENT__KEYWORD: - return keyword != null && !keyword.isEmpty(); + case DGPackage.GRAPHICAL_ELEMENT__CLASS: + return classes != null && !classes.isEmpty(); case DGPackage.GRAPHICAL_ELEMENT__STYLE: return style != null; case DGPackage.GRAPHICAL_ELEMENT__TRANSFORM: - return transform != null && !transform.isEmpty(); + return transforms != null && !transforms.isEmpty(); } return super.eIsSet(featureID); } @@ -451,13 +485,30 @@ public abstract class GraphicalElementImpl extends DefinitionImpl implements * @generated */ @Override + @SuppressWarnings("unchecked") + public Object eInvoke(int operationID, EList<?> arguments) + throws InvocationTargetException { + switch (operationID) { + case DGPackage.GRAPHICAL_ELEMENT___REFERENCED_CLIPPATH_HAS_ID__DIAGNOSTICCHAIN_MAP: + return referencedClippathHasId((DiagnosticChain) arguments.get(0), + (Map<Object, Object>) arguments.get(1)); + } + return super.eInvoke(operationID, arguments); + } + + /** + * <!-- begin-user-doc --> <!-- end-user-doc --> + * + * @generated + */ + @Override public String toString() { if (eIsProxy()) return super.toString(); StringBuffer result = new StringBuffer(super.toString()); - result.append(" (keyword: "); - result.append(keyword); + result.append(" (class: "); + result.append(classes); result.append(')'); return result.toString(); } diff --git a/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/impl/GroupImpl.java b/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/impl/GroupImpl.java index 75571f2dabb..ca7ac6928ba 100644 --- a/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/impl/GroupImpl.java +++ b/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/impl/GroupImpl.java @@ -33,7 +33,7 @@ import org.eclipse.papyrus.dd.dg.Group; * <p> * The following features are implemented: * <ul> - * <li>{@link org.eclipse.papyrus.dd.dg.impl.GroupImpl#getMember <em>Member + * <li>{@link org.eclipse.papyrus.dd.dg.impl.GroupImpl#getMembers <em>Member * </em>}</li> * </ul> * </p> @@ -42,14 +42,14 @@ import org.eclipse.papyrus.dd.dg.Group; */ public class GroupImpl extends GraphicalElementImpl implements Group { /** - * The cached value of the '{@link #getMember() <em>Member</em>}' + * The cached value of the '{@link #getMembers() <em>Member</em>}' * containment reference list. <!-- begin-user-doc --> <!-- end-user-doc --> * - * @see #getMember() + * @see #getMembers() * @generated * @ordered */ - protected EList<GraphicalElement> member; + protected EList<GraphicalElement> members; /** * <!-- begin-user-doc --> <!-- end-user-doc --> @@ -75,13 +75,13 @@ public class GroupImpl extends GraphicalElementImpl implements Group { * * @generated */ - public EList<GraphicalElement> getMember() { - if (member == null) { - member = new EObjectContainmentWithInverseEList<GraphicalElement>( + public EList<GraphicalElement> getMembers() { + if (members == null) { + members = new EObjectContainmentWithInverseEList<GraphicalElement>( GraphicalElement.class, this, DGPackage.GROUP__MEMBER, DGPackage.GRAPHICAL_ELEMENT__GROUP); } - return member; + return members; } /** @@ -95,7 +95,7 @@ public class GroupImpl extends GraphicalElementImpl implements Group { int featureID, NotificationChain msgs) { switch (featureID) { case DGPackage.GROUP__MEMBER: - return ((InternalEList<InternalEObject>) (InternalEList<?>) getMember()) + return ((InternalEList<InternalEObject>) (InternalEList<?>) getMembers()) .basicAdd(otherEnd, msgs); } return super.eInverseAdd(otherEnd, featureID, msgs); @@ -111,7 +111,8 @@ public class GroupImpl extends GraphicalElementImpl implements Group { int featureID, NotificationChain msgs) { switch (featureID) { case DGPackage.GROUP__MEMBER: - return ((InternalEList<?>) getMember()).basicRemove(otherEnd, msgs); + return ((InternalEList<?>) getMembers()) + .basicRemove(otherEnd, msgs); } return super.eInverseRemove(otherEnd, featureID, msgs); } @@ -125,7 +126,7 @@ public class GroupImpl extends GraphicalElementImpl implements Group { public Object eGet(int featureID, boolean resolve, boolean coreType) { switch (featureID) { case DGPackage.GROUP__MEMBER: - return getMember(); + return getMembers(); } return super.eGet(featureID, resolve, coreType); } @@ -140,8 +141,8 @@ public class GroupImpl extends GraphicalElementImpl implements Group { public void eSet(int featureID, Object newValue) { switch (featureID) { case DGPackage.GROUP__MEMBER: - getMember().clear(); - getMember().addAll( + getMembers().clear(); + getMembers().addAll( (Collection<? extends GraphicalElement>) newValue); return; } @@ -157,7 +158,7 @@ public class GroupImpl extends GraphicalElementImpl implements Group { public void eUnset(int featureID) { switch (featureID) { case DGPackage.GROUP__MEMBER: - getMember().clear(); + getMembers().clear(); return; } super.eUnset(featureID); @@ -172,7 +173,7 @@ public class GroupImpl extends GraphicalElementImpl implements Group { public boolean eIsSet(int featureID) { switch (featureID) { case DGPackage.GROUP__MEMBER: - return member != null && !member.isEmpty(); + return members != null && !members.isEmpty(); } return super.eIsSet(featureID); } diff --git a/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/impl/ImageImpl.java b/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/impl/ImageImpl.java index c2e793529a9..e5315f39819 100644 --- a/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/impl/ImageImpl.java +++ b/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/impl/ImageImpl.java @@ -11,9 +11,14 @@ */ package org.eclipse.papyrus.dd.dg.impl; +import java.lang.reflect.InvocationTargetException; +import java.util.Map; import org.eclipse.emf.common.notify.Notification; import org.eclipse.emf.common.notify.NotificationChain; +import org.eclipse.emf.common.util.Diagnostic; +import org.eclipse.emf.common.util.DiagnosticChain; +import org.eclipse.emf.common.util.EList; import org.eclipse.emf.ecore.EClass; import org.eclipse.emf.ecore.InternalEObject; @@ -23,6 +28,7 @@ import org.eclipse.papyrus.dd.dc.Bounds; import org.eclipse.papyrus.dd.dg.DGPackage; import org.eclipse.papyrus.dd.dg.Image; +import org.eclipse.papyrus.dd.dg.util.DGValidator; /** * <!-- begin-user-doc --> An implementation of the model object ' @@ -213,6 +219,39 @@ public class ImageImpl extends GraphicalElementImpl implements Image { } /** + * The cached validation expression for the ' + * {@link #sourceCannotBeEmpty(org.eclipse.emf.common.util.DiagnosticChain, java.util.Map) + * <em>Source Cannot Be Empty</em>}' invariant operation. <!-- + * begin-user-doc --> <!-- end-user-doc --> + * + * @see #sourceCannotBeEmpty(org.eclipse.emf.common.util.DiagnosticChain, + * java.util.Map) + * @generated + * @ordered + */ + protected static final String SOURCE_CANNOT_BE_EMPTY_DIAGNOSTIC_CHAIN_MAP__EEXPRESSION = "source->notEmpty() implies source.size() > 0"; + + /** + * <!-- begin-user-doc --> <!-- end-user-doc --> + * + * @generated + */ + public boolean sourceCannotBeEmpty(DiagnosticChain diagnostics, + Map<Object, Object> context) { + return DGValidator + .validate( + DGPackage.Literals.IMAGE, + this, + diagnostics, + context, + "http://www.eclipse.org/emf/2002/Ecore/OCL", + DGPackage.Literals.IMAGE___SOURCE_CANNOT_BE_EMPTY__DIAGNOSTICCHAIN_MAP, + SOURCE_CANNOT_BE_EMPTY_DIAGNOSTIC_CHAIN_MAP__EEXPRESSION, + Diagnostic.ERROR, DGValidator.DIAGNOSTIC_SOURCE, + DGValidator.IMAGE__SOURCE_CANNOT_BE_EMPTY); + } + + /** * <!-- begin-user-doc --> <!-- end-user-doc --> * * @generated @@ -312,6 +351,23 @@ public class ImageImpl extends GraphicalElementImpl implements Image { * @generated */ @Override + @SuppressWarnings("unchecked") + public Object eInvoke(int operationID, EList<?> arguments) + throws InvocationTargetException { + switch (operationID) { + case DGPackage.IMAGE___SOURCE_CANNOT_BE_EMPTY__DIAGNOSTICCHAIN_MAP: + return sourceCannotBeEmpty((DiagnosticChain) arguments.get(0), + (Map<Object, Object>) arguments.get(1)); + } + return super.eInvoke(operationID, arguments); + } + + /** + * <!-- begin-user-doc --> <!-- end-user-doc --> + * + * @generated + */ + @Override public String toString() { if (eIsProxy()) return super.toString(); diff --git a/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/impl/MarkedElementImpl.java b/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/impl/MarkedElementImpl.java index 07f7adf09c9..c1a5ae3f588 100644 --- a/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/impl/MarkedElementImpl.java +++ b/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/impl/MarkedElementImpl.java @@ -11,8 +11,13 @@ */ package org.eclipse.papyrus.dd.dg.impl; +import java.lang.reflect.InvocationTargetException; +import java.util.Map; import org.eclipse.emf.common.notify.Notification; +import org.eclipse.emf.common.util.Diagnostic; +import org.eclipse.emf.common.util.DiagnosticChain; +import org.eclipse.emf.common.util.EList; import org.eclipse.emf.ecore.EClass; import org.eclipse.emf.ecore.InternalEObject; @@ -21,6 +26,7 @@ import org.eclipse.emf.ecore.impl.ENotificationImpl; import org.eclipse.papyrus.dd.dg.DGPackage; import org.eclipse.papyrus.dd.dg.MarkedElement; import org.eclipse.papyrus.dd.dg.Marker; +import org.eclipse.papyrus.dd.dg.util.DGValidator; /** * <!-- begin-user-doc --> An implementation of the model object ' @@ -217,6 +223,108 @@ public abstract class MarkedElementImpl extends GraphicalElementImpl implements } /** + * The cached validation expression for the ' + * {@link #referencedStartMarkerHasId(org.eclipse.emf.common.util.DiagnosticChain, java.util.Map) + * <em>Referenced Start Marker Has Id</em>}' invariant operation. <!-- + * begin-user-doc --> <!-- end-user-doc --> + * + * @see #referencedStartMarkerHasId(org.eclipse.emf.common.util.DiagnosticChain, + * java.util.Map) + * @generated + * @ordered + */ + protected static final String REFERENCED_START_MARKER_HAS_ID_DIAGNOSTIC_CHAIN_MAP__EEXPRESSION = "startMarker->notEmpty() implies startMarker.id->notEmpty()"; + + /** + * <!-- begin-user-doc --> <!-- end-user-doc --> + * + * @generated + */ + public boolean referencedStartMarkerHasId(DiagnosticChain diagnostics, + Map<Object, Object> context) { + return DGValidator + .validate( + DGPackage.Literals.MARKED_ELEMENT, + this, + diagnostics, + context, + "http://www.eclipse.org/emf/2002/Ecore/OCL", + DGPackage.Literals.MARKED_ELEMENT___REFERENCED_START_MARKER_HAS_ID__DIAGNOSTICCHAIN_MAP, + REFERENCED_START_MARKER_HAS_ID_DIAGNOSTIC_CHAIN_MAP__EEXPRESSION, + Diagnostic.ERROR, + DGValidator.DIAGNOSTIC_SOURCE, + DGValidator.MARKED_ELEMENT__REFERENCED_START_MARKER_HAS_ID); + } + + /** + * The cached validation expression for the ' + * {@link #referencedMidMarkerHasId(org.eclipse.emf.common.util.DiagnosticChain, java.util.Map) + * <em>Referenced Mid Marker Has Id</em>}' invariant operation. <!-- + * begin-user-doc --> <!-- end-user-doc --> + * + * @see #referencedMidMarkerHasId(org.eclipse.emf.common.util.DiagnosticChain, + * java.util.Map) + * @generated + * @ordered + */ + protected static final String REFERENCED_MID_MARKER_HAS_ID_DIAGNOSTIC_CHAIN_MAP__EEXPRESSION = "midMarker->notEmpty() implies midMarker.id->notEmpty()"; + + /** + * <!-- begin-user-doc --> <!-- end-user-doc --> + * + * @generated + */ + public boolean referencedMidMarkerHasId(DiagnosticChain diagnostics, + Map<Object, Object> context) { + return DGValidator + .validate( + DGPackage.Literals.MARKED_ELEMENT, + this, + diagnostics, + context, + "http://www.eclipse.org/emf/2002/Ecore/OCL", + DGPackage.Literals.MARKED_ELEMENT___REFERENCED_MID_MARKER_HAS_ID__DIAGNOSTICCHAIN_MAP, + REFERENCED_MID_MARKER_HAS_ID_DIAGNOSTIC_CHAIN_MAP__EEXPRESSION, + Diagnostic.ERROR, + DGValidator.DIAGNOSTIC_SOURCE, + DGValidator.MARKED_ELEMENT__REFERENCED_MID_MARKER_HAS_ID); + } + + /** + * The cached validation expression for the ' + * {@link #referencedEndMarkerHasId(org.eclipse.emf.common.util.DiagnosticChain, java.util.Map) + * <em>Referenced End Marker Has Id</em>}' invariant operation. <!-- + * begin-user-doc --> <!-- end-user-doc --> + * + * @see #referencedEndMarkerHasId(org.eclipse.emf.common.util.DiagnosticChain, + * java.util.Map) + * @generated + * @ordered + */ + protected static final String REFERENCED_END_MARKER_HAS_ID_DIAGNOSTIC_CHAIN_MAP__EEXPRESSION = "endMarker->notEmpty() implies endMarker.id->notEmpty()"; + + /** + * <!-- begin-user-doc --> <!-- end-user-doc --> + * + * @generated + */ + public boolean referencedEndMarkerHasId(DiagnosticChain diagnostics, + Map<Object, Object> context) { + return DGValidator + .validate( + DGPackage.Literals.MARKED_ELEMENT, + this, + diagnostics, + context, + "http://www.eclipse.org/emf/2002/Ecore/OCL", + DGPackage.Literals.MARKED_ELEMENT___REFERENCED_END_MARKER_HAS_ID__DIAGNOSTICCHAIN_MAP, + REFERENCED_END_MARKER_HAS_ID_DIAGNOSTIC_CHAIN_MAP__EEXPRESSION, + Diagnostic.ERROR, + DGValidator.DIAGNOSTIC_SOURCE, + DGValidator.MARKED_ELEMENT__REFERENCED_END_MARKER_HAS_ID); + } + + /** * <!-- begin-user-doc --> <!-- end-user-doc --> * * @generated @@ -300,4 +408,28 @@ public abstract class MarkedElementImpl extends GraphicalElementImpl implements return super.eIsSet(featureID); } + /** + * <!-- begin-user-doc --> <!-- end-user-doc --> + * + * @generated + */ + @Override + @SuppressWarnings("unchecked") + public Object eInvoke(int operationID, EList<?> arguments) + throws InvocationTargetException { + switch (operationID) { + case DGPackage.MARKED_ELEMENT___REFERENCED_START_MARKER_HAS_ID__DIAGNOSTICCHAIN_MAP: + return referencedStartMarkerHasId( + (DiagnosticChain) arguments.get(0), + (Map<Object, Object>) arguments.get(1)); + case DGPackage.MARKED_ELEMENT___REFERENCED_MID_MARKER_HAS_ID__DIAGNOSTICCHAIN_MAP: + return referencedMidMarkerHasId((DiagnosticChain) arguments.get(0), + (Map<Object, Object>) arguments.get(1)); + case DGPackage.MARKED_ELEMENT___REFERENCED_END_MARKER_HAS_ID__DIAGNOSTICCHAIN_MAP: + return referencedEndMarkerHasId((DiagnosticChain) arguments.get(0), + (Map<Object, Object>) arguments.get(1)); + } + return super.eInvoke(operationID, arguments); + } + } // MarkedElementImpl diff --git a/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/impl/PaintImpl.java b/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/impl/PaintImpl.java index 1aa599efbbb..6cb0c90062a 100644 --- a/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/impl/PaintImpl.java +++ b/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/impl/PaintImpl.java @@ -13,8 +13,13 @@ package org.eclipse.papyrus.dd.dg.impl; import java.awt.Color; +import java.lang.reflect.InvocationTargetException; +import java.util.Map; import org.eclipse.emf.common.notify.Notification; +import org.eclipse.emf.common.util.Diagnostic; +import org.eclipse.emf.common.util.DiagnosticChain; +import org.eclipse.emf.common.util.EList; import org.eclipse.emf.ecore.EClass; import org.eclipse.emf.ecore.InternalEObject; @@ -24,6 +29,7 @@ import org.eclipse.emf.ecore.impl.MinimalEObjectImpl; import org.eclipse.papyrus.dd.dg.DGPackage; import org.eclipse.papyrus.dd.dg.Paint; import org.eclipse.papyrus.dd.dg.PaintServer; +import org.eclipse.papyrus.dd.dg.util.DGValidator; /** * <!-- begin-user-doc --> An implementation of the model object ' @@ -153,6 +159,39 @@ public class PaintImpl extends MinimalEObjectImpl.Container implements Paint { } /** + * The cached validation expression for the ' + * {@link #referencedPaintServerHasId(org.eclipse.emf.common.util.DiagnosticChain, java.util.Map) + * <em>Referenced Paint Server Has Id</em>}' invariant operation. <!-- + * begin-user-doc --> <!-- end-user-doc --> + * + * @see #referencedPaintServerHasId(org.eclipse.emf.common.util.DiagnosticChain, + * java.util.Map) + * @generated + * @ordered + */ + protected static final String REFERENCED_PAINT_SERVER_HAS_ID_DIAGNOSTIC_CHAIN_MAP__EEXPRESSION = "paintServer->notEmpty() implies paintServer.id->notEmpty()"; + + /** + * <!-- begin-user-doc --> <!-- end-user-doc --> + * + * @generated + */ + public boolean referencedPaintServerHasId(DiagnosticChain diagnostics, + Map<Object, Object> context) { + return DGValidator + .validate( + DGPackage.Literals.PAINT, + this, + diagnostics, + context, + "http://www.eclipse.org/emf/2002/Ecore/OCL", + DGPackage.Literals.PAINT___REFERENCED_PAINT_SERVER_HAS_ID__DIAGNOSTICCHAIN_MAP, + REFERENCED_PAINT_SERVER_HAS_ID_DIAGNOSTIC_CHAIN_MAP__EEXPRESSION, + Diagnostic.ERROR, DGValidator.DIAGNOSTIC_SOURCE, + DGValidator.PAINT__REFERENCED_PAINT_SERVER_HAS_ID); + } + + /** * <!-- begin-user-doc --> <!-- end-user-doc --> * * @generated @@ -229,6 +268,24 @@ public class PaintImpl extends MinimalEObjectImpl.Container implements Paint { * @generated */ @Override + @SuppressWarnings("unchecked") + public Object eInvoke(int operationID, EList<?> arguments) + throws InvocationTargetException { + switch (operationID) { + case DGPackage.PAINT___REFERENCED_PAINT_SERVER_HAS_ID__DIAGNOSTICCHAIN_MAP: + return referencedPaintServerHasId( + (DiagnosticChain) arguments.get(0), + (Map<Object, Object>) arguments.get(1)); + } + return super.eInvoke(operationID, arguments); + } + + /** + * <!-- begin-user-doc --> <!-- end-user-doc --> + * + * @generated + */ + @Override public String toString() { if (eIsProxy()) return super.toString(); diff --git a/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/impl/PaintServerImpl.java b/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/impl/PaintServerImpl.java index cc76414e15e..6d5b9cfabdc 100644 --- a/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/impl/PaintServerImpl.java +++ b/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/impl/PaintServerImpl.java @@ -33,7 +33,7 @@ import org.eclipse.papyrus.dd.dg.Transform; * <p> * The following features are implemented: * <ul> - * <li>{@link org.eclipse.papyrus.dd.dg.impl.PaintServerImpl#getTransform <em> + * <li>{@link org.eclipse.papyrus.dd.dg.impl.PaintServerImpl#getTransforms <em> * Transform</em>}</li> * </ul> * </p> @@ -43,14 +43,14 @@ import org.eclipse.papyrus.dd.dg.Transform; public abstract class PaintServerImpl extends DefinitionImpl implements PaintServer { /** - * The cached value of the '{@link #getTransform() <em>Transform</em>}' + * The cached value of the '{@link #getTransforms() <em>Transform</em>}' * containment reference list. <!-- begin-user-doc --> <!-- end-user-doc --> * - * @see #getTransform() + * @see #getTransforms() * @generated * @ordered */ - protected EList<Transform> transform; + protected EList<Transform> transforms; /** * <!-- begin-user-doc --> <!-- end-user-doc --> @@ -76,12 +76,12 @@ public abstract class PaintServerImpl extends DefinitionImpl implements * * @generated */ - public EList<Transform> getTransform() { - if (transform == null) { - transform = new EObjectContainmentEList<Transform>(Transform.class, - this, DGPackage.PAINT_SERVER__TRANSFORM); + public EList<Transform> getTransforms() { + if (transforms == null) { + transforms = new EObjectContainmentEList<Transform>( + Transform.class, this, DGPackage.PAINT_SERVER__TRANSFORM); } - return transform; + return transforms; } /** @@ -94,7 +94,7 @@ public abstract class PaintServerImpl extends DefinitionImpl implements int featureID, NotificationChain msgs) { switch (featureID) { case DGPackage.PAINT_SERVER__TRANSFORM: - return ((InternalEList<?>) getTransform()).basicRemove(otherEnd, + return ((InternalEList<?>) getTransforms()).basicRemove(otherEnd, msgs); } return super.eInverseRemove(otherEnd, featureID, msgs); @@ -109,7 +109,7 @@ public abstract class PaintServerImpl extends DefinitionImpl implements public Object eGet(int featureID, boolean resolve, boolean coreType) { switch (featureID) { case DGPackage.PAINT_SERVER__TRANSFORM: - return getTransform(); + return getTransforms(); } return super.eGet(featureID, resolve, coreType); } @@ -124,8 +124,8 @@ public abstract class PaintServerImpl extends DefinitionImpl implements public void eSet(int featureID, Object newValue) { switch (featureID) { case DGPackage.PAINT_SERVER__TRANSFORM: - getTransform().clear(); - getTransform().addAll((Collection<? extends Transform>) newValue); + getTransforms().clear(); + getTransforms().addAll((Collection<? extends Transform>) newValue); return; } super.eSet(featureID, newValue); @@ -140,7 +140,7 @@ public abstract class PaintServerImpl extends DefinitionImpl implements public void eUnset(int featureID) { switch (featureID) { case DGPackage.PAINT_SERVER__TRANSFORM: - getTransform().clear(); + getTransforms().clear(); return; } super.eUnset(featureID); @@ -155,7 +155,7 @@ public abstract class PaintServerImpl extends DefinitionImpl implements public boolean eIsSet(int featureID) { switch (featureID) { case DGPackage.PAINT_SERVER__TRANSFORM: - return transform != null && !transform.isEmpty(); + return transforms != null && !transforms.isEmpty(); } return super.eIsSet(featureID); } diff --git a/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/impl/PathImpl.java b/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/impl/PathImpl.java index 9d0e0d016eb..e7cfcabf7fb 100644 --- a/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/impl/PathImpl.java +++ b/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/impl/PathImpl.java @@ -11,10 +11,14 @@ */ package org.eclipse.papyrus.dd.dg.impl; +import java.lang.reflect.InvocationTargetException; import java.util.Collection; +import java.util.Map; import org.eclipse.emf.common.notify.NotificationChain; +import org.eclipse.emf.common.util.Diagnostic; +import org.eclipse.emf.common.util.DiagnosticChain; import org.eclipse.emf.common.util.EList; import org.eclipse.emf.ecore.EClass; @@ -26,6 +30,7 @@ import org.eclipse.emf.ecore.util.InternalEList; import org.eclipse.papyrus.dd.dg.DGPackage; import org.eclipse.papyrus.dd.dg.Path; import org.eclipse.papyrus.dd.dg.PathCommand; +import org.eclipse.papyrus.dd.dg.util.DGValidator; /** * <!-- begin-user-doc --> An implementation of the model object ' @@ -33,7 +38,7 @@ import org.eclipse.papyrus.dd.dg.PathCommand; * <p> * The following features are implemented: * <ul> - * <li>{@link org.eclipse.papyrus.dd.dg.impl.PathImpl#getCommand <em>Command + * <li>{@link org.eclipse.papyrus.dd.dg.impl.PathImpl#getCommands <em>Command * </em>}</li> * </ul> * </p> @@ -42,14 +47,14 @@ import org.eclipse.papyrus.dd.dg.PathCommand; */ public class PathImpl extends MarkedElementImpl implements Path { /** - * The cached value of the '{@link #getCommand() <em>Command</em>}' + * The cached value of the '{@link #getCommands() <em>Command</em>}' * containment reference list. <!-- begin-user-doc --> <!-- end-user-doc --> * - * @see #getCommand() + * @see #getCommands() * @generated * @ordered */ - protected EList<PathCommand> command; + protected EList<PathCommand> commands; /** * <!-- begin-user-doc --> <!-- end-user-doc --> @@ -75,12 +80,45 @@ public class PathImpl extends MarkedElementImpl implements Path { * * @generated */ - public EList<PathCommand> getCommand() { - if (command == null) { - command = new EObjectContainmentEList<PathCommand>( + public EList<PathCommand> getCommands() { + if (commands == null) { + commands = new EObjectContainmentEList<PathCommand>( PathCommand.class, this, DGPackage.PATH__COMMAND); } - return command; + return commands; + } + + /** + * The cached validation expression for the ' + * {@link #firstCommandMustBeMove(org.eclipse.emf.common.util.DiagnosticChain, java.util.Map) + * <em>First Command Must Be Move</em>}' invariant operation. <!-- + * begin-user-doc --> <!-- end-user-doc --> + * + * @see #firstCommandMustBeMove(org.eclipse.emf.common.util.DiagnosticChain, + * java.util.Map) + * @generated + * @ordered + */ + protected static final String FIRST_COMMAND_MUST_BE_MOVE_DIAGNOSTIC_CHAIN_MAP__EEXPRESSION = "command->first().oclIsKindOf(MoveTo)"; + + /** + * <!-- begin-user-doc --> <!-- end-user-doc --> + * + * @generated + */ + public boolean firstCommandMustBeMove(DiagnosticChain diagnostics, + Map<Object, Object> context) { + return DGValidator + .validate( + DGPackage.Literals.PATH, + this, + diagnostics, + context, + "http://www.eclipse.org/emf/2002/Ecore/OCL", + DGPackage.Literals.PATH___FIRST_COMMAND_MUST_BE_MOVE__DIAGNOSTICCHAIN_MAP, + FIRST_COMMAND_MUST_BE_MOVE_DIAGNOSTIC_CHAIN_MAP__EEXPRESSION, + Diagnostic.ERROR, DGValidator.DIAGNOSTIC_SOURCE, + DGValidator.PATH__FIRST_COMMAND_MUST_BE_MOVE); } /** @@ -93,8 +131,8 @@ public class PathImpl extends MarkedElementImpl implements Path { int featureID, NotificationChain msgs) { switch (featureID) { case DGPackage.PATH__COMMAND: - return ((InternalEList<?>) getCommand()) - .basicRemove(otherEnd, msgs); + return ((InternalEList<?>) getCommands()).basicRemove(otherEnd, + msgs); } return super.eInverseRemove(otherEnd, featureID, msgs); } @@ -108,7 +146,7 @@ public class PathImpl extends MarkedElementImpl implements Path { public Object eGet(int featureID, boolean resolve, boolean coreType) { switch (featureID) { case DGPackage.PATH__COMMAND: - return getCommand(); + return getCommands(); } return super.eGet(featureID, resolve, coreType); } @@ -123,8 +161,8 @@ public class PathImpl extends MarkedElementImpl implements Path { public void eSet(int featureID, Object newValue) { switch (featureID) { case DGPackage.PATH__COMMAND: - getCommand().clear(); - getCommand().addAll((Collection<? extends PathCommand>) newValue); + getCommands().clear(); + getCommands().addAll((Collection<? extends PathCommand>) newValue); return; } super.eSet(featureID, newValue); @@ -139,7 +177,7 @@ public class PathImpl extends MarkedElementImpl implements Path { public void eUnset(int featureID) { switch (featureID) { case DGPackage.PATH__COMMAND: - getCommand().clear(); + getCommands().clear(); return; } super.eUnset(featureID); @@ -154,9 +192,26 @@ public class PathImpl extends MarkedElementImpl implements Path { public boolean eIsSet(int featureID) { switch (featureID) { case DGPackage.PATH__COMMAND: - return command != null && !command.isEmpty(); + return commands != null && !commands.isEmpty(); } return super.eIsSet(featureID); } + /** + * <!-- begin-user-doc --> <!-- end-user-doc --> + * + * @generated + */ + @Override + @SuppressWarnings("unchecked") + public Object eInvoke(int operationID, EList<?> arguments) + throws InvocationTargetException { + switch (operationID) { + case DGPackage.PATH___FIRST_COMMAND_MUST_BE_MOVE__DIAGNOSTICCHAIN_MAP: + return firstCommandMustBeMove((DiagnosticChain) arguments.get(0), + (Map<Object, Object>) arguments.get(1)); + } + return super.eInvoke(operationID, arguments); + } + } // PathImpl diff --git a/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/impl/PolygonImpl.java b/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/impl/PolygonImpl.java index 75c7fc15afb..6d57c528441 100644 --- a/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/impl/PolygonImpl.java +++ b/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/impl/PolygonImpl.java @@ -34,7 +34,7 @@ import org.eclipse.papyrus.dd.dg.Polygon; * <p> * The following features are implemented: * <ul> - * <li>{@link org.eclipse.papyrus.dd.dg.impl.PolygonImpl#getPoint <em>Point + * <li>{@link org.eclipse.papyrus.dd.dg.impl.PolygonImpl#getPoints <em>Point * </em>}</li> * </ul> * </p> @@ -43,14 +43,14 @@ import org.eclipse.papyrus.dd.dg.Polygon; */ public class PolygonImpl extends MarkedElementImpl implements Polygon { /** - * The cached value of the '{@link #getPoint() <em>Point</em>}' containment + * The cached value of the '{@link #getPoints() <em>Point</em>}' containment * reference list. <!-- begin-user-doc --> <!-- end-user-doc --> * - * @see #getPoint() + * @see #getPoints() * @generated * @ordered */ - protected EList<Point> point; + protected EList<Point> points; /** * <!-- begin-user-doc --> <!-- end-user-doc --> @@ -76,12 +76,12 @@ public class PolygonImpl extends MarkedElementImpl implements Polygon { * * @generated */ - public EList<Point> getPoint() { - if (point == null) { - point = new EObjectContainmentEList<Point>(Point.class, this, + public EList<Point> getPoints() { + if (points == null) { + points = new EObjectContainmentEList<Point>(Point.class, this, DGPackage.POLYGON__POINT); } - return point; + return points; } /** @@ -94,7 +94,7 @@ public class PolygonImpl extends MarkedElementImpl implements Polygon { int featureID, NotificationChain msgs) { switch (featureID) { case DGPackage.POLYGON__POINT: - return ((InternalEList<?>) getPoint()).basicRemove(otherEnd, msgs); + return ((InternalEList<?>) getPoints()).basicRemove(otherEnd, msgs); } return super.eInverseRemove(otherEnd, featureID, msgs); } @@ -108,7 +108,7 @@ public class PolygonImpl extends MarkedElementImpl implements Polygon { public Object eGet(int featureID, boolean resolve, boolean coreType) { switch (featureID) { case DGPackage.POLYGON__POINT: - return getPoint(); + return getPoints(); } return super.eGet(featureID, resolve, coreType); } @@ -123,8 +123,8 @@ public class PolygonImpl extends MarkedElementImpl implements Polygon { public void eSet(int featureID, Object newValue) { switch (featureID) { case DGPackage.POLYGON__POINT: - getPoint().clear(); - getPoint().addAll((Collection<? extends Point>) newValue); + getPoints().clear(); + getPoints().addAll((Collection<? extends Point>) newValue); return; } super.eSet(featureID, newValue); @@ -139,7 +139,7 @@ public class PolygonImpl extends MarkedElementImpl implements Polygon { public void eUnset(int featureID) { switch (featureID) { case DGPackage.POLYGON__POINT: - getPoint().clear(); + getPoints().clear(); return; } super.eUnset(featureID); @@ -154,7 +154,7 @@ public class PolygonImpl extends MarkedElementImpl implements Polygon { public boolean eIsSet(int featureID) { switch (featureID) { case DGPackage.POLYGON__POINT: - return point != null && !point.isEmpty(); + return points != null && !points.isEmpty(); } return super.eIsSet(featureID); } diff --git a/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/impl/PolylineImpl.java b/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/impl/PolylineImpl.java index eafe33e43f9..cce07850fcd 100644 --- a/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/impl/PolylineImpl.java +++ b/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/impl/PolylineImpl.java @@ -34,7 +34,7 @@ import org.eclipse.papyrus.dd.dg.Polyline; * <p> * The following features are implemented: * <ul> - * <li>{@link org.eclipse.papyrus.dd.dg.impl.PolylineImpl#getPoint <em>Point + * <li>{@link org.eclipse.papyrus.dd.dg.impl.PolylineImpl#getPoints <em>Point * </em>}</li> * </ul> * </p> @@ -43,14 +43,14 @@ import org.eclipse.papyrus.dd.dg.Polyline; */ public class PolylineImpl extends MarkedElementImpl implements Polyline { /** - * The cached value of the '{@link #getPoint() <em>Point</em>}' containment + * The cached value of the '{@link #getPoints() <em>Point</em>}' containment * reference list. <!-- begin-user-doc --> <!-- end-user-doc --> * - * @see #getPoint() + * @see #getPoints() * @generated * @ordered */ - protected EList<Point> point; + protected EList<Point> points; /** * <!-- begin-user-doc --> <!-- end-user-doc --> @@ -76,12 +76,12 @@ public class PolylineImpl extends MarkedElementImpl implements Polyline { * * @generated */ - public EList<Point> getPoint() { - if (point == null) { - point = new EObjectContainmentEList<Point>(Point.class, this, + public EList<Point> getPoints() { + if (points == null) { + points = new EObjectContainmentEList<Point>(Point.class, this, DGPackage.POLYLINE__POINT); } - return point; + return points; } /** @@ -94,7 +94,7 @@ public class PolylineImpl extends MarkedElementImpl implements Polyline { int featureID, NotificationChain msgs) { switch (featureID) { case DGPackage.POLYLINE__POINT: - return ((InternalEList<?>) getPoint()).basicRemove(otherEnd, msgs); + return ((InternalEList<?>) getPoints()).basicRemove(otherEnd, msgs); } return super.eInverseRemove(otherEnd, featureID, msgs); } @@ -108,7 +108,7 @@ public class PolylineImpl extends MarkedElementImpl implements Polyline { public Object eGet(int featureID, boolean resolve, boolean coreType) { switch (featureID) { case DGPackage.POLYLINE__POINT: - return getPoint(); + return getPoints(); } return super.eGet(featureID, resolve, coreType); } @@ -123,8 +123,8 @@ public class PolylineImpl extends MarkedElementImpl implements Polyline { public void eSet(int featureID, Object newValue) { switch (featureID) { case DGPackage.POLYLINE__POINT: - getPoint().clear(); - getPoint().addAll((Collection<? extends Point>) newValue); + getPoints().clear(); + getPoints().addAll((Collection<? extends Point>) newValue); return; } super.eSet(featureID, newValue); @@ -139,7 +139,7 @@ public class PolylineImpl extends MarkedElementImpl implements Polyline { public void eUnset(int featureID) { switch (featureID) { case DGPackage.POLYLINE__POINT: - getPoint().clear(); + getPoints().clear(); return; } super.eUnset(featureID); @@ -154,7 +154,7 @@ public class PolylineImpl extends MarkedElementImpl implements Polyline { public boolean eIsSet(int featureID) { switch (featureID) { case DGPackage.POLYLINE__POINT: - return point != null && !point.isEmpty(); + return points != null && !points.isEmpty(); } return super.eIsSet(featureID); } diff --git a/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/impl/QuadraticCurveToImpl.java b/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/impl/QuadraticCurveToImpl.java index a571624d40c..3d6d6b93a2a 100644 --- a/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/impl/QuadraticCurveToImpl.java +++ b/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/impl/QuadraticCurveToImpl.java @@ -30,10 +30,10 @@ import org.eclipse.papyrus.dd.dg.QuadraticCurveTo; * <p> * The following features are implemented: * <ul> - * <li>{@link org.eclipse.papyrus.dd.dg.impl.QuadraticCurveToImpl#getPoint <em> - * Point</em>}</li> * <li>{@link org.eclipse.papyrus.dd.dg.impl.QuadraticCurveToImpl#getControl * <em>Control</em>}</li> + * <li>{@link org.eclipse.papyrus.dd.dg.impl.QuadraticCurveToImpl#getPoint <em> + * Point</em>}</li> * </ul> * </p> * @@ -42,24 +42,24 @@ import org.eclipse.papyrus.dd.dg.QuadraticCurveTo; public class QuadraticCurveToImpl extends PathCommandImpl implements QuadraticCurveTo { /** - * The cached value of the '{@link #getPoint() <em>Point</em>}' containment - * reference. <!-- begin-user-doc --> <!-- end-user-doc --> + * The cached value of the '{@link #getControl() <em>Control</em>}' + * containment reference. <!-- begin-user-doc --> <!-- end-user-doc --> * - * @see #getPoint() + * @see #getControl() * @generated * @ordered */ - protected Point point; + protected Point control; /** - * The cached value of the '{@link #getControl() <em>Control</em>}' - * containment reference. <!-- begin-user-doc --> <!-- end-user-doc --> + * The cached value of the '{@link #getPoint() <em>Point</em>}' containment + * reference. <!-- begin-user-doc --> <!-- end-user-doc --> * - * @see #getControl() + * @see #getPoint() * @generated * @ordered */ - protected Point control; + protected Point point; /** * <!-- begin-user-doc --> <!-- end-user-doc --> @@ -202,10 +202,10 @@ public class QuadraticCurveToImpl extends PathCommandImpl implements public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) { switch (featureID) { - case DGPackage.QUADRATIC_CURVE_TO__POINT: - return basicSetPoint(null, msgs); case DGPackage.QUADRATIC_CURVE_TO__CONTROL: return basicSetControl(null, msgs); + case DGPackage.QUADRATIC_CURVE_TO__POINT: + return basicSetPoint(null, msgs); } return super.eInverseRemove(otherEnd, featureID, msgs); } @@ -218,10 +218,10 @@ public class QuadraticCurveToImpl extends PathCommandImpl implements @Override public Object eGet(int featureID, boolean resolve, boolean coreType) { switch (featureID) { - case DGPackage.QUADRATIC_CURVE_TO__POINT: - return getPoint(); case DGPackage.QUADRATIC_CURVE_TO__CONTROL: return getControl(); + case DGPackage.QUADRATIC_CURVE_TO__POINT: + return getPoint(); } return super.eGet(featureID, resolve, coreType); } @@ -234,12 +234,12 @@ public class QuadraticCurveToImpl extends PathCommandImpl implements @Override public void eSet(int featureID, Object newValue) { switch (featureID) { - case DGPackage.QUADRATIC_CURVE_TO__POINT: - setPoint((Point) newValue); - return; case DGPackage.QUADRATIC_CURVE_TO__CONTROL: setControl((Point) newValue); return; + case DGPackage.QUADRATIC_CURVE_TO__POINT: + setPoint((Point) newValue); + return; } super.eSet(featureID, newValue); } @@ -252,12 +252,12 @@ public class QuadraticCurveToImpl extends PathCommandImpl implements @Override public void eUnset(int featureID) { switch (featureID) { - case DGPackage.QUADRATIC_CURVE_TO__POINT: - setPoint((Point) null); - return; case DGPackage.QUADRATIC_CURVE_TO__CONTROL: setControl((Point) null); return; + case DGPackage.QUADRATIC_CURVE_TO__POINT: + setPoint((Point) null); + return; } super.eUnset(featureID); } @@ -270,10 +270,10 @@ public class QuadraticCurveToImpl extends PathCommandImpl implements @Override public boolean eIsSet(int featureID) { switch (featureID) { - case DGPackage.QUADRATIC_CURVE_TO__POINT: - return point != null; case DGPackage.QUADRATIC_CURVE_TO__CONTROL: return control != null; + case DGPackage.QUADRATIC_CURVE_TO__POINT: + return point != null; } return super.eIsSet(featureID); } diff --git a/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/impl/RectangleImpl.java b/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/impl/RectangleImpl.java index 55ea15b59f1..c8862f61bca 100644 --- a/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/impl/RectangleImpl.java +++ b/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/impl/RectangleImpl.java @@ -11,9 +11,14 @@ */ package org.eclipse.papyrus.dd.dg.impl; +import java.lang.reflect.InvocationTargetException; +import java.util.Map; import org.eclipse.emf.common.notify.Notification; import org.eclipse.emf.common.notify.NotificationChain; +import org.eclipse.emf.common.util.Diagnostic; +import org.eclipse.emf.common.util.DiagnosticChain; +import org.eclipse.emf.common.util.EList; import org.eclipse.emf.ecore.EClass; import org.eclipse.emf.ecore.InternalEObject; @@ -23,6 +28,7 @@ import org.eclipse.papyrus.dd.dc.Bounds; import org.eclipse.papyrus.dd.dg.DGPackage; import org.eclipse.papyrus.dd.dg.Rectangle; +import org.eclipse.papyrus.dd.dg.util.DGValidator; /** * <!-- begin-user-doc --> An implementation of the model object ' @@ -73,6 +79,15 @@ public class RectangleImpl extends GraphicalElementImpl implements Rectangle { protected double cornerRadius = CORNER_RADIUS_EDEFAULT; /** + * This is true if the Corner Radius attribute has been set. <!-- + * begin-user-doc --> <!-- end-user-doc --> + * + * @generated + * @ordered + */ + protected boolean cornerRadiusESet; + + /** * <!-- begin-user-doc --> <!-- end-user-doc --> * * @generated @@ -162,10 +177,70 @@ public class RectangleImpl extends GraphicalElementImpl implements Rectangle { public void setCornerRadius(double newCornerRadius) { double oldCornerRadius = cornerRadius; cornerRadius = newCornerRadius; + boolean oldCornerRadiusESet = cornerRadiusESet; + cornerRadiusESet = true; if (eNotificationRequired()) eNotify(new ENotificationImpl(this, Notification.SET, DGPackage.RECTANGLE__CORNER_RADIUS, oldCornerRadius, - cornerRadius)); + cornerRadius, !oldCornerRadiusESet)); + } + + /** + * <!-- begin-user-doc --> <!-- end-user-doc --> + * + * @generated + */ + public void unsetCornerRadius() { + double oldCornerRadius = cornerRadius; + boolean oldCornerRadiusESet = cornerRadiusESet; + cornerRadius = CORNER_RADIUS_EDEFAULT; + cornerRadiusESet = false; + if (eNotificationRequired()) + eNotify(new ENotificationImpl(this, Notification.UNSET, + DGPackage.RECTANGLE__CORNER_RADIUS, oldCornerRadius, + CORNER_RADIUS_EDEFAULT, oldCornerRadiusESet)); + } + + /** + * <!-- begin-user-doc --> <!-- end-user-doc --> + * + * @generated + */ + public boolean isSetCornerRadius() { + return cornerRadiusESet; + } + + /** + * The cached validation expression for the ' + * {@link #nonNegativeCornerRadius(org.eclipse.emf.common.util.DiagnosticChain, java.util.Map) + * <em>Non Negative Corner Radius</em>}' invariant operation. <!-- + * begin-user-doc --> <!-- end-user-doc --> + * + * @see #nonNegativeCornerRadius(org.eclipse.emf.common.util.DiagnosticChain, + * java.util.Map) + * @generated + * @ordered + */ + protected static final String NON_NEGATIVE_CORNER_RADIUS_DIAGNOSTIC_CHAIN_MAP__EEXPRESSION = "cornerRadius >= 0"; + + /** + * <!-- begin-user-doc --> <!-- end-user-doc --> + * + * @generated + */ + public boolean nonNegativeCornerRadius(DiagnosticChain diagnostics, + Map<Object, Object> context) { + return DGValidator + .validate( + DGPackage.Literals.RECTANGLE, + this, + diagnostics, + context, + "http://www.eclipse.org/emf/2002/Ecore/OCL", + DGPackage.Literals.RECTANGLE___NON_NEGATIVE_CORNER_RADIUS__DIAGNOSTICCHAIN_MAP, + NON_NEGATIVE_CORNER_RADIUS_DIAGNOSTIC_CHAIN_MAP__EEXPRESSION, + Diagnostic.ERROR, DGValidator.DIAGNOSTIC_SOURCE, + DGValidator.RECTANGLE__NON_NEGATIVE_CORNER_RADIUS); } /** @@ -229,7 +304,7 @@ public class RectangleImpl extends GraphicalElementImpl implements Rectangle { setBounds((Bounds) null); return; case DGPackage.RECTANGLE__CORNER_RADIUS: - setCornerRadius(CORNER_RADIUS_EDEFAULT); + unsetCornerRadius(); return; } super.eUnset(featureID); @@ -246,7 +321,7 @@ public class RectangleImpl extends GraphicalElementImpl implements Rectangle { case DGPackage.RECTANGLE__BOUNDS: return bounds != null; case DGPackage.RECTANGLE__CORNER_RADIUS: - return cornerRadius != CORNER_RADIUS_EDEFAULT; + return isSetCornerRadius(); } return super.eIsSet(featureID); } @@ -257,13 +332,33 @@ public class RectangleImpl extends GraphicalElementImpl implements Rectangle { * @generated */ @Override + @SuppressWarnings("unchecked") + public Object eInvoke(int operationID, EList<?> arguments) + throws InvocationTargetException { + switch (operationID) { + case DGPackage.RECTANGLE___NON_NEGATIVE_CORNER_RADIUS__DIAGNOSTICCHAIN_MAP: + return nonNegativeCornerRadius((DiagnosticChain) arguments.get(0), + (Map<Object, Object>) arguments.get(1)); + } + return super.eInvoke(operationID, arguments); + } + + /** + * <!-- begin-user-doc --> <!-- end-user-doc --> + * + * @generated + */ + @Override public String toString() { if (eIsProxy()) return super.toString(); StringBuffer result = new StringBuffer(super.toString()); result.append(" (cornerRadius: "); - result.append(cornerRadius); + if (cornerRadiusESet) + result.append(cornerRadius); + else + result.append("<unset>"); result.append(')'); return result.toString(); } diff --git a/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/impl/RootCanvasImpl.java b/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/impl/RootCanvasImpl.java index e4e186fe50b..8ec85ae09ae 100644 --- a/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/impl/RootCanvasImpl.java +++ b/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/impl/RootCanvasImpl.java @@ -42,8 +42,9 @@ import org.eclipse.papyrus.dd.dg.StyleSheet; * <em>Background Color</em>}</li> * <li>{@link org.eclipse.papyrus.dd.dg.impl.RootCanvasImpl#getDefinitions <em> * Definitions</em>}</li> - * <li>{@link org.eclipse.papyrus.dd.dg.impl.RootCanvasImpl#getStyleSheet <em> - * Style Sheet</em>}</li> + * <li> + * {@link org.eclipse.papyrus.dd.dg.impl.RootCanvasImpl#getExternalStyleSheets + * <em>External Style Sheet</em>}</li> * </ul> * </p> * @@ -92,14 +93,15 @@ public class RootCanvasImpl extends CanvasImpl implements RootCanvas { protected Definitions definitions; /** - * The cached value of the '{@link #getStyleSheet() <em>Style Sheet</em>}' - * reference list. <!-- begin-user-doc --> <!-- end-user-doc --> + * The cached value of the '{@link #getExternalStyleSheets() + * <em>External Style Sheet</em>}' reference list. <!-- begin-user-doc --> + * <!-- end-user-doc --> * - * @see #getStyleSheet() + * @see #getExternalStyleSheets() * @generated * @ordered */ - protected EList<StyleSheet> styleSheet; + protected EList<StyleSheet> externalStyleSheets; /** * <!-- begin-user-doc --> <!-- end-user-doc --> @@ -234,12 +236,13 @@ public class RootCanvasImpl extends CanvasImpl implements RootCanvas { * * @generated */ - public EList<StyleSheet> getStyleSheet() { - if (styleSheet == null) { - styleSheet = new EObjectResolvingEList<StyleSheet>( - StyleSheet.class, this, DGPackage.ROOT_CANVAS__STYLE_SHEET); + public EList<StyleSheet> getExternalStyleSheets() { + if (externalStyleSheets == null) { + externalStyleSheets = new EObjectResolvingEList<StyleSheet>( + StyleSheet.class, this, + DGPackage.ROOT_CANVAS__EXTERNAL_STYLE_SHEET); } - return styleSheet; + return externalStyleSheets; } /** @@ -269,8 +272,8 @@ public class RootCanvasImpl extends CanvasImpl implements RootCanvas { return getBackgroundColor(); case DGPackage.ROOT_CANVAS__DEFINITIONS: return getDefinitions(); - case DGPackage.ROOT_CANVAS__STYLE_SHEET: - return getStyleSheet(); + case DGPackage.ROOT_CANVAS__EXTERNAL_STYLE_SHEET: + return getExternalStyleSheets(); } return super.eGet(featureID, resolve, coreType); } @@ -290,9 +293,10 @@ public class RootCanvasImpl extends CanvasImpl implements RootCanvas { case DGPackage.ROOT_CANVAS__DEFINITIONS: setDefinitions((Definitions) newValue); return; - case DGPackage.ROOT_CANVAS__STYLE_SHEET: - getStyleSheet().clear(); - getStyleSheet().addAll((Collection<? extends StyleSheet>) newValue); + case DGPackage.ROOT_CANVAS__EXTERNAL_STYLE_SHEET: + getExternalStyleSheets().clear(); + getExternalStyleSheets().addAll( + (Collection<? extends StyleSheet>) newValue); return; } super.eSet(featureID, newValue); @@ -312,8 +316,8 @@ public class RootCanvasImpl extends CanvasImpl implements RootCanvas { case DGPackage.ROOT_CANVAS__DEFINITIONS: setDefinitions((Definitions) null); return; - case DGPackage.ROOT_CANVAS__STYLE_SHEET: - getStyleSheet().clear(); + case DGPackage.ROOT_CANVAS__EXTERNAL_STYLE_SHEET: + getExternalStyleSheets().clear(); return; } super.eUnset(featureID); @@ -331,8 +335,9 @@ public class RootCanvasImpl extends CanvasImpl implements RootCanvas { return isSetBackgroundColor(); case DGPackage.ROOT_CANVAS__DEFINITIONS: return definitions != null; - case DGPackage.ROOT_CANVAS__STYLE_SHEET: - return styleSheet != null && !styleSheet.isEmpty(); + case DGPackage.ROOT_CANVAS__EXTERNAL_STYLE_SHEET: + return externalStyleSheets != null + && !externalStyleSheets.isEmpty(); } return super.eIsSet(featureID); } diff --git a/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/impl/StyleImpl.java b/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/impl/StyleImpl.java index f1af7fb4886..8dcf529962d 100644 --- a/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/impl/StyleImpl.java +++ b/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/impl/StyleImpl.java @@ -54,7 +54,7 @@ import org.eclipse.papyrus.dd.dg.util.DGValidator; * Width</em>}</li> * <li>{@link org.eclipse.papyrus.dd.dg.impl.StyleImpl#getStrokeOpacity <em> * Stroke Opacity</em>}</li> - * <li>{@link org.eclipse.papyrus.dd.dg.impl.StyleImpl#getStrokeDashLength <em> + * <li>{@link org.eclipse.papyrus.dd.dg.impl.StyleImpl#getStrokeDashLengths <em> * Stroke Dash Length</em>}</li> * <li>{@link org.eclipse.papyrus.dd.dg.impl.StyleImpl#getFontSize <em>Font Size * </em>}</li> @@ -200,15 +200,15 @@ public class StyleImpl extends MinimalEObjectImpl.Container implements Style { protected boolean strokeOpacityESet; /** - * The cached value of the '{@link #getStrokeDashLength() + * The cached value of the '{@link #getStrokeDashLengths() * <em>Stroke Dash Length</em>}' attribute list. <!-- begin-user-doc --> * <!-- end-user-doc --> * - * @see #getStrokeDashLength() + * @see #getStrokeDashLengths() * @generated * @ordered */ - protected EList<Double> strokeDashLength; + protected EList<Double> strokeDashLengths; /** * The default value of the '{@link #getFontSize() <em>Font Size</em>}' @@ -758,12 +758,12 @@ public class StyleImpl extends MinimalEObjectImpl.Container implements Style { * * @generated */ - public EList<Double> getStrokeDashLength() { - if (strokeDashLength == null) { - strokeDashLength = new EDataTypeEList.Unsettable<Double>( + public EList<Double> getStrokeDashLengths() { + if (strokeDashLengths == null) { + strokeDashLengths = new EDataTypeEList.Unsettable<Double>( Double.class, this, DGPackage.STYLE__STROKE_DASH_LENGTH); } - return strokeDashLength; + return strokeDashLengths; } /** @@ -771,9 +771,9 @@ public class StyleImpl extends MinimalEObjectImpl.Container implements Style { * * @generated */ - public void unsetStrokeDashLength() { - if (strokeDashLength != null) - ((InternalEList.Unsettable<?>) strokeDashLength).unset(); + public void unsetStrokeDashLengths() { + if (strokeDashLengths != null) + ((InternalEList.Unsettable<?>) strokeDashLengths).unset(); } /** @@ -781,9 +781,9 @@ public class StyleImpl extends MinimalEObjectImpl.Container implements Style { * * @generated */ - public boolean isSetStrokeDashLength() { - return strokeDashLength != null - && ((InternalEList.Unsettable<?>) strokeDashLength).isSet(); + public boolean isSetStrokeDashLengths() { + return strokeDashLengths != null + && ((InternalEList.Unsettable<?>) strokeDashLengths).isSet(); } /** @@ -1238,7 +1238,7 @@ public class StyleImpl extends MinimalEObjectImpl.Container implements Style { case DGPackage.STYLE__STROKE_OPACITY: return getStrokeOpacity(); case DGPackage.STYLE__STROKE_DASH_LENGTH: - return getStrokeDashLength(); + return getStrokeDashLengths(); case DGPackage.STYLE__FONT_SIZE: return getFontSize(); case DGPackage.STYLE__FONT_NAME: @@ -1278,8 +1278,8 @@ public class StyleImpl extends MinimalEObjectImpl.Container implements Style { setStrokeOpacity((Double) newValue); return; case DGPackage.STYLE__STROKE_DASH_LENGTH: - getStrokeDashLength().clear(); - getStrokeDashLength().addAll( + getStrokeDashLengths().clear(); + getStrokeDashLengths().addAll( (Collection<? extends Double>) newValue); return; case DGPackage.STYLE__FONT_SIZE: @@ -1325,7 +1325,7 @@ public class StyleImpl extends MinimalEObjectImpl.Container implements Style { unsetStrokeOpacity(); return; case DGPackage.STYLE__STROKE_DASH_LENGTH: - unsetStrokeDashLength(); + unsetStrokeDashLengths(); return; case DGPackage.STYLE__FONT_SIZE: unsetFontSize(); @@ -1365,7 +1365,7 @@ public class StyleImpl extends MinimalEObjectImpl.Container implements Style { case DGPackage.STYLE__STROKE_OPACITY: return isSetStrokeOpacity(); case DGPackage.STYLE__STROKE_DASH_LENGTH: - return isSetStrokeDashLength(); + return isSetStrokeDashLengths(); case DGPackage.STYLE__FONT_SIZE: return isSetFontSize(); case DGPackage.STYLE__FONT_NAME: @@ -1436,7 +1436,7 @@ public class StyleImpl extends MinimalEObjectImpl.Container implements Style { else result.append("<unset>"); result.append(", strokeDashLength: "); - result.append(strokeDashLength); + result.append(strokeDashLengths); result.append(", fontSize: "); if (fontSizeESet) result.append(fontSize); diff --git a/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/impl/StyleRuleImpl.java b/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/impl/StyleRuleImpl.java index fcaf7b55358..e4f001d0a71 100644 --- a/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/impl/StyleRuleImpl.java +++ b/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/impl/StyleRuleImpl.java @@ -38,7 +38,7 @@ import org.eclipse.papyrus.dd.dg.StyleSelector; * <p> * The following features are implemented: * <ul> - * <li>{@link org.eclipse.papyrus.dd.dg.impl.StyleRuleImpl#getSelector <em> + * <li>{@link org.eclipse.papyrus.dd.dg.impl.StyleRuleImpl#getSelectors <em> * Selector</em>}</li> * <li>{@link org.eclipse.papyrus.dd.dg.impl.StyleRuleImpl#getStyle <em>Style * </em>}</li> @@ -50,14 +50,14 @@ import org.eclipse.papyrus.dd.dg.StyleSelector; public class StyleRuleImpl extends MinimalEObjectImpl.Container implements StyleRule { /** - * The cached value of the '{@link #getSelector() <em>Selector</em>}' + * The cached value of the '{@link #getSelectors() <em>Selector</em>}' * containment reference list. <!-- begin-user-doc --> <!-- end-user-doc --> * - * @see #getSelector() + * @see #getSelectors() * @generated * @ordered */ - protected EList<StyleSelector> selector; + protected EList<StyleSelector> selectors; /** * The cached value of the '{@link #getStyle() <em>Style</em>}' containment @@ -93,12 +93,12 @@ public class StyleRuleImpl extends MinimalEObjectImpl.Container implements * * @generated */ - public EList<StyleSelector> getSelector() { - if (selector == null) { - selector = new EObjectContainmentEList<StyleSelector>( + public EList<StyleSelector> getSelectors() { + if (selectors == null) { + selectors = new EObjectContainmentEList<StyleSelector>( StyleSelector.class, this, DGPackage.STYLE_RULE__SELECTOR); } - return selector; + return selectors; } /** @@ -165,7 +165,7 @@ public class StyleRuleImpl extends MinimalEObjectImpl.Container implements int featureID, NotificationChain msgs) { switch (featureID) { case DGPackage.STYLE_RULE__SELECTOR: - return ((InternalEList<?>) getSelector()).basicRemove(otherEnd, + return ((InternalEList<?>) getSelectors()).basicRemove(otherEnd, msgs); case DGPackage.STYLE_RULE__STYLE: return basicSetStyle(null, msgs); @@ -182,7 +182,7 @@ public class StyleRuleImpl extends MinimalEObjectImpl.Container implements public Object eGet(int featureID, boolean resolve, boolean coreType) { switch (featureID) { case DGPackage.STYLE_RULE__SELECTOR: - return getSelector(); + return getSelectors(); case DGPackage.STYLE_RULE__STYLE: return getStyle(); } @@ -199,9 +199,9 @@ public class StyleRuleImpl extends MinimalEObjectImpl.Container implements public void eSet(int featureID, Object newValue) { switch (featureID) { case DGPackage.STYLE_RULE__SELECTOR: - getSelector().clear(); - getSelector() - .addAll((Collection<? extends StyleSelector>) newValue); + getSelectors().clear(); + getSelectors().addAll( + (Collection<? extends StyleSelector>) newValue); return; case DGPackage.STYLE_RULE__STYLE: setStyle((Style) newValue); @@ -219,7 +219,7 @@ public class StyleRuleImpl extends MinimalEObjectImpl.Container implements public void eUnset(int featureID) { switch (featureID) { case DGPackage.STYLE_RULE__SELECTOR: - getSelector().clear(); + getSelectors().clear(); return; case DGPackage.STYLE_RULE__STYLE: setStyle((Style) null); @@ -237,7 +237,7 @@ public class StyleRuleImpl extends MinimalEObjectImpl.Container implements public boolean eIsSet(int featureID) { switch (featureID) { case DGPackage.STYLE_RULE__SELECTOR: - return selector != null && !selector.isEmpty(); + return selectors != null && !selectors.isEmpty(); case DGPackage.STYLE_RULE__STYLE: return style != null; } diff --git a/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/impl/StyleSelectorImpl.java b/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/impl/StyleSelectorImpl.java index 06718d4144f..d78ddca3598 100644 --- a/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/impl/StyleSelectorImpl.java +++ b/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/impl/StyleSelectorImpl.java @@ -12,20 +12,14 @@ package org.eclipse.papyrus.dd.dg.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.InternalEObject; - import org.eclipse.emf.ecore.impl.ENotificationImpl; import org.eclipse.emf.ecore.impl.MinimalEObjectImpl; - import org.eclipse.emf.ecore.util.EDataTypeUniqueEList; - import org.eclipse.papyrus.dd.dg.DGPackage; +import org.eclipse.papyrus.dd.dg.ElementKind; import org.eclipse.papyrus.dd.dg.StyleSelector; /** @@ -34,10 +28,10 @@ import org.eclipse.papyrus.dd.dg.StyleSelector; * <p> * The following features are implemented: * <ul> - * <li>{@link org.eclipse.papyrus.dd.dg.impl.StyleSelectorImpl#getType <em>Type + * <li>{@link org.eclipse.papyrus.dd.dg.impl.StyleSelectorImpl#getKind <em>Kind * </em>}</li> - * <li>{@link org.eclipse.papyrus.dd.dg.impl.StyleSelectorImpl#getKeyword <em> - * Keyword</em>}</li> + * <li>{@link org.eclipse.papyrus.dd.dg.impl.StyleSelectorImpl#getClasses <em> + * Class</em>}</li> * </ul> * </p> * @@ -46,24 +40,43 @@ import org.eclipse.papyrus.dd.dg.StyleSelector; public class StyleSelectorImpl extends MinimalEObjectImpl.Container implements StyleSelector { /** - * The cached value of the '{@link #getType() <em>Type</em>}' reference. + * The default value of the '{@link #getKind() <em>Kind</em>}' attribute. * <!-- begin-user-doc --> <!-- end-user-doc --> * - * @see #getType() + * @see #getKind() + * @generated + * @ordered + */ + protected static final ElementKind KIND_EDEFAULT = ElementKind.CANVAS; + + /** + * The cached value of the '{@link #getKind() <em>Kind</em>}' attribute. + * <!-- begin-user-doc --> <!-- end-user-doc --> + * + * @see #getKind() + * @generated + * @ordered + */ + protected ElementKind kind = KIND_EDEFAULT; + + /** + * This is true if the Kind attribute has been set. <!-- begin-user-doc --> + * <!-- end-user-doc --> + * * @generated * @ordered */ - protected EClass type; + protected boolean kindESet; /** - * The cached value of the '{@link #getKeyword() <em>Keyword</em>}' - * attribute list. <!-- begin-user-doc --> <!-- end-user-doc --> + * The cached value of the '{@link #getClasses() <em>Class</em>}' attribute + * list. <!-- begin-user-doc --> <!-- end-user-doc --> * - * @see #getKeyword() + * @see #getClasses() * @generated * @ordered */ - protected EList<String> keyword; + protected EList<String> classes; /** * <!-- begin-user-doc --> <!-- end-user-doc --> @@ -89,17 +102,8 @@ public class StyleSelectorImpl extends MinimalEObjectImpl.Container implements * * @generated */ - public EClass getType() { - if (type != null && type.eIsProxy()) { - InternalEObject oldType = (InternalEObject) type; - type = (EClass) eResolveProxy(oldType); - if (type != oldType) { - if (eNotificationRequired()) - eNotify(new ENotificationImpl(this, Notification.RESOLVE, - DGPackage.STYLE_SELECTOR__TYPE, oldType, type)); - } - } - return type; + public ElementKind getKind() { + return kind; } /** @@ -107,8 +111,14 @@ public class StyleSelectorImpl extends MinimalEObjectImpl.Container implements * * @generated */ - public EClass basicGetType() { - return type; + public void setKind(ElementKind newKind) { + ElementKind oldKind = kind; + kind = newKind == null ? KIND_EDEFAULT : newKind; + boolean oldKindESet = kindESet; + kindESet = true; + if (eNotificationRequired()) + eNotify(new ENotificationImpl(this, Notification.SET, + DGPackage.STYLE_SELECTOR__KIND, oldKind, kind, !oldKindESet)); } /** @@ -116,12 +126,24 @@ public class StyleSelectorImpl extends MinimalEObjectImpl.Container implements * * @generated */ - public void setType(EClass newType) { - EClass oldType = type; - type = newType; + public void unsetKind() { + ElementKind oldKind = kind; + boolean oldKindESet = kindESet; + kind = KIND_EDEFAULT; + kindESet = false; if (eNotificationRequired()) - eNotify(new ENotificationImpl(this, Notification.SET, - DGPackage.STYLE_SELECTOR__TYPE, oldType, type)); + eNotify(new ENotificationImpl(this, Notification.UNSET, + DGPackage.STYLE_SELECTOR__KIND, oldKind, KIND_EDEFAULT, + oldKindESet)); + } + + /** + * <!-- begin-user-doc --> <!-- end-user-doc --> + * + * @generated + */ + public boolean isSetKind() { + return kindESet; } /** @@ -129,12 +151,12 @@ public class StyleSelectorImpl extends MinimalEObjectImpl.Container implements * * @generated */ - public EList<String> getKeyword() { - if (keyword == null) { - keyword = new EDataTypeUniqueEList<String>(String.class, this, - DGPackage.STYLE_SELECTOR__KEYWORD); + public EList<String> getClasses() { + if (classes == null) { + classes = new EDataTypeUniqueEList<String>(String.class, this, + DGPackage.STYLE_SELECTOR__CLASS); } - return keyword; + return classes; } /** @@ -145,12 +167,10 @@ public class StyleSelectorImpl extends MinimalEObjectImpl.Container implements @Override public Object eGet(int featureID, boolean resolve, boolean coreType) { switch (featureID) { - case DGPackage.STYLE_SELECTOR__TYPE: - if (resolve) - return getType(); - return basicGetType(); - case DGPackage.STYLE_SELECTOR__KEYWORD: - return getKeyword(); + case DGPackage.STYLE_SELECTOR__KIND: + return getKind(); + case DGPackage.STYLE_SELECTOR__CLASS: + return getClasses(); } return super.eGet(featureID, resolve, coreType); } @@ -164,12 +184,12 @@ public class StyleSelectorImpl extends MinimalEObjectImpl.Container implements @Override public void eSet(int featureID, Object newValue) { switch (featureID) { - case DGPackage.STYLE_SELECTOR__TYPE: - setType((EClass) newValue); + case DGPackage.STYLE_SELECTOR__KIND: + setKind((ElementKind) newValue); return; - case DGPackage.STYLE_SELECTOR__KEYWORD: - getKeyword().clear(); - getKeyword().addAll((Collection<? extends String>) newValue); + case DGPackage.STYLE_SELECTOR__CLASS: + getClasses().clear(); + getClasses().addAll((Collection<? extends String>) newValue); return; } super.eSet(featureID, newValue); @@ -183,11 +203,11 @@ public class StyleSelectorImpl extends MinimalEObjectImpl.Container implements @Override public void eUnset(int featureID) { switch (featureID) { - case DGPackage.STYLE_SELECTOR__TYPE: - setType((EClass) null); + case DGPackage.STYLE_SELECTOR__KIND: + unsetKind(); return; - case DGPackage.STYLE_SELECTOR__KEYWORD: - getKeyword().clear(); + case DGPackage.STYLE_SELECTOR__CLASS: + getClasses().clear(); return; } super.eUnset(featureID); @@ -201,10 +221,10 @@ public class StyleSelectorImpl extends MinimalEObjectImpl.Container implements @Override public boolean eIsSet(int featureID) { switch (featureID) { - case DGPackage.STYLE_SELECTOR__TYPE: - return type != null; - case DGPackage.STYLE_SELECTOR__KEYWORD: - return keyword != null && !keyword.isEmpty(); + case DGPackage.STYLE_SELECTOR__KIND: + return isSetKind(); + case DGPackage.STYLE_SELECTOR__CLASS: + return classes != null && !classes.isEmpty(); } return super.eIsSet(featureID); } @@ -220,8 +240,13 @@ public class StyleSelectorImpl extends MinimalEObjectImpl.Container implements return super.toString(); StringBuffer result = new StringBuffer(super.toString()); - result.append(" (keyword: "); - result.append(keyword); + result.append(" (kind: "); + if (kindESet) + result.append(kind); + else + result.append("<unset>"); + result.append(", class: "); + result.append(classes); result.append(')'); return result.toString(); } diff --git a/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/impl/StyleSheetImpl.java b/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/impl/StyleSheetImpl.java index 85edc7776cf..102ea2f86b4 100644 --- a/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/impl/StyleSheetImpl.java +++ b/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/impl/StyleSheetImpl.java @@ -35,7 +35,7 @@ import org.eclipse.papyrus.dd.dg.StyleSheet; * <p> * The following features are implemented: * <ul> - * <li>{@link org.eclipse.papyrus.dd.dg.impl.StyleSheetImpl#getRule <em>Rule + * <li>{@link org.eclipse.papyrus.dd.dg.impl.StyleSheetImpl#getRules <em>Rule * </em>}</li> * </ul> * </p> @@ -45,14 +45,14 @@ import org.eclipse.papyrus.dd.dg.StyleSheet; public class StyleSheetImpl extends MinimalEObjectImpl.Container implements StyleSheet { /** - * The cached value of the '{@link #getRule() <em>Rule</em>}' containment + * The cached value of the '{@link #getRules() <em>Rule</em>}' containment * reference list. <!-- begin-user-doc --> <!-- end-user-doc --> * - * @see #getRule() + * @see #getRules() * @generated * @ordered */ - protected EList<StyleRule> rule; + protected EList<StyleRule> rules; /** * <!-- begin-user-doc --> <!-- end-user-doc --> @@ -78,12 +78,12 @@ public class StyleSheetImpl extends MinimalEObjectImpl.Container implements * * @generated */ - public EList<StyleRule> getRule() { - if (rule == null) { - rule = new EObjectContainmentEList<StyleRule>(StyleRule.class, + public EList<StyleRule> getRules() { + if (rules == null) { + rules = new EObjectContainmentEList<StyleRule>(StyleRule.class, this, DGPackage.STYLE_SHEET__RULE); } - return rule; + return rules; } /** @@ -96,7 +96,7 @@ public class StyleSheetImpl extends MinimalEObjectImpl.Container implements int featureID, NotificationChain msgs) { switch (featureID) { case DGPackage.STYLE_SHEET__RULE: - return ((InternalEList<?>) getRule()).basicRemove(otherEnd, msgs); + return ((InternalEList<?>) getRules()).basicRemove(otherEnd, msgs); } return super.eInverseRemove(otherEnd, featureID, msgs); } @@ -110,7 +110,7 @@ public class StyleSheetImpl extends MinimalEObjectImpl.Container implements public Object eGet(int featureID, boolean resolve, boolean coreType) { switch (featureID) { case DGPackage.STYLE_SHEET__RULE: - return getRule(); + return getRules(); } return super.eGet(featureID, resolve, coreType); } @@ -125,8 +125,8 @@ public class StyleSheetImpl extends MinimalEObjectImpl.Container implements public void eSet(int featureID, Object newValue) { switch (featureID) { case DGPackage.STYLE_SHEET__RULE: - getRule().clear(); - getRule().addAll((Collection<? extends StyleRule>) newValue); + getRules().clear(); + getRules().addAll((Collection<? extends StyleRule>) newValue); return; } super.eSet(featureID, newValue); @@ -141,7 +141,7 @@ public class StyleSheetImpl extends MinimalEObjectImpl.Container implements public void eUnset(int featureID) { switch (featureID) { case DGPackage.STYLE_SHEET__RULE: - getRule().clear(); + getRules().clear(); return; } super.eUnset(featureID); @@ -156,7 +156,7 @@ public class StyleSheetImpl extends MinimalEObjectImpl.Container implements public boolean eIsSet(int featureID) { switch (featureID) { case DGPackage.STYLE_SHEET__RULE: - return rule != null && !rule.isEmpty(); + return rules != null && !rules.isEmpty(); } return super.eIsSet(featureID); } diff --git a/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/impl/TextImpl.java b/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/impl/TextImpl.java index 3032385cd47..7d9569050f0 100644 --- a/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/impl/TextImpl.java +++ b/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/impl/TextImpl.java @@ -11,9 +11,14 @@ */ package org.eclipse.papyrus.dd.dg.impl; +import java.lang.reflect.InvocationTargetException; +import java.util.Map; import org.eclipse.emf.common.notify.Notification; import org.eclipse.emf.common.notify.NotificationChain; +import org.eclipse.emf.common.util.Diagnostic; +import org.eclipse.emf.common.util.DiagnosticChain; +import org.eclipse.emf.common.util.EList; import org.eclipse.emf.ecore.EClass; import org.eclipse.emf.ecore.InternalEObject; @@ -23,6 +28,7 @@ import org.eclipse.papyrus.dd.dc.Point; import org.eclipse.papyrus.dd.dg.DGPackage; import org.eclipse.papyrus.dd.dg.Text; +import org.eclipse.papyrus.dd.dg.util.DGValidator; /** * <!-- begin-user-doc --> An implementation of the model object ' @@ -165,6 +171,39 @@ public class TextImpl extends GraphicalElementImpl implements Text { } /** + * The cached validation expression for the ' + * {@link #dataCannotBeEmpty(org.eclipse.emf.common.util.DiagnosticChain, java.util.Map) + * <em>Data Cannot Be Empty</em>}' invariant operation. <!-- begin-user-doc + * --> <!-- end-user-doc --> + * + * @see #dataCannotBeEmpty(org.eclipse.emf.common.util.DiagnosticChain, + * java.util.Map) + * @generated + * @ordered + */ + protected static final String DATA_CANNOT_BE_EMPTY_DIAGNOSTIC_CHAIN_MAP__EEXPRESSION = "data->notEmpty() implies data.size() > 0"; + + /** + * <!-- begin-user-doc --> <!-- end-user-doc --> + * + * @generated + */ + public boolean dataCannotBeEmpty(DiagnosticChain diagnostics, + Map<Object, Object> context) { + return DGValidator + .validate( + DGPackage.Literals.TEXT, + this, + diagnostics, + context, + "http://www.eclipse.org/emf/2002/Ecore/OCL", + DGPackage.Literals.TEXT___DATA_CANNOT_BE_EMPTY__DIAGNOSTICCHAIN_MAP, + DATA_CANNOT_BE_EMPTY_DIAGNOSTIC_CHAIN_MAP__EEXPRESSION, + Diagnostic.ERROR, DGValidator.DIAGNOSTIC_SOURCE, + DGValidator.TEXT__DATA_CANNOT_BE_EMPTY); + } + + /** * <!-- begin-user-doc --> <!-- end-user-doc --> * * @generated @@ -254,6 +293,23 @@ public class TextImpl extends GraphicalElementImpl implements Text { * @generated */ @Override + @SuppressWarnings("unchecked") + public Object eInvoke(int operationID, EList<?> arguments) + throws InvocationTargetException { + switch (operationID) { + case DGPackage.TEXT___DATA_CANNOT_BE_EMPTY__DIAGNOSTICCHAIN_MAP: + return dataCannotBeEmpty((DiagnosticChain) arguments.get(0), + (Map<Object, Object>) arguments.get(1)); + } + return super.eInvoke(operationID, arguments); + } + + /** + * <!-- begin-user-doc --> <!-- end-user-doc --> + * + * @generated + */ + @Override public String toString() { if (eIsProxy()) return super.toString(); diff --git a/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/impl/UseImpl.java b/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/impl/UseImpl.java index c25d621cfae..43c1a875ec6 100644 --- a/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/impl/UseImpl.java +++ b/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/impl/UseImpl.java @@ -11,9 +11,14 @@ */ package org.eclipse.papyrus.dd.dg.impl; +import java.lang.reflect.InvocationTargetException; +import java.util.Map; import org.eclipse.emf.common.notify.Notification; import org.eclipse.emf.common.notify.NotificationChain; +import org.eclipse.emf.common.util.Diagnostic; +import org.eclipse.emf.common.util.DiagnosticChain; +import org.eclipse.emf.common.util.EList; import org.eclipse.emf.ecore.EClass; import org.eclipse.emf.ecore.InternalEObject; @@ -22,7 +27,9 @@ import org.eclipse.emf.ecore.impl.ENotificationImpl; import org.eclipse.papyrus.dd.dc.Bounds; import org.eclipse.papyrus.dd.dg.DGPackage; +import org.eclipse.papyrus.dd.dg.GraphicalElement; import org.eclipse.papyrus.dd.dg.Use; +import org.eclipse.papyrus.dd.dg.util.DGValidator; /** * <!-- begin-user-doc --> An implementation of the model object ' @@ -31,6 +38,8 @@ import org.eclipse.papyrus.dd.dg.Use; * The following features are implemented: * <ul> * <li>{@link org.eclipse.papyrus.dd.dg.impl.UseImpl#getBounds <em>Bounds</em>}</li> + * <li>{@link org.eclipse.papyrus.dd.dg.impl.UseImpl#getReferencedElement <em> + * Referenced Element</em>}</li> * </ul> * </p> * @@ -48,6 +57,17 @@ public class UseImpl extends GraphicalElementImpl implements Use { protected Bounds bounds; /** + * The cached value of the '{@link #getReferencedElement() + * <em>Referenced Element</em>}' reference. <!-- begin-user-doc --> <!-- + * end-user-doc --> + * + * @see #getReferencedElement() + * @generated + * @ordered + */ + protected GraphicalElement referencedElement; + + /** * <!-- begin-user-doc --> <!-- end-user-doc --> * * @generated @@ -125,6 +145,81 @@ public class UseImpl extends GraphicalElementImpl implements Use { * * @generated */ + public GraphicalElement getReferencedElement() { + if (referencedElement != null && referencedElement.eIsProxy()) { + InternalEObject oldReferencedElement = (InternalEObject) referencedElement; + referencedElement = (GraphicalElement) eResolveProxy(oldReferencedElement); + if (referencedElement != oldReferencedElement) { + if (eNotificationRequired()) + eNotify(new ENotificationImpl(this, Notification.RESOLVE, + DGPackage.USE__REFERENCED_ELEMENT, + oldReferencedElement, referencedElement)); + } + } + return referencedElement; + } + + /** + * <!-- begin-user-doc --> <!-- end-user-doc --> + * + * @generated + */ + public GraphicalElement basicGetReferencedElement() { + return referencedElement; + } + + /** + * <!-- begin-user-doc --> <!-- end-user-doc --> + * + * @generated + */ + public void setReferencedElement(GraphicalElement newReferencedElement) { + GraphicalElement oldReferencedElement = referencedElement; + referencedElement = newReferencedElement; + if (eNotificationRequired()) + eNotify(new ENotificationImpl(this, Notification.SET, + DGPackage.USE__REFERENCED_ELEMENT, oldReferencedElement, + referencedElement)); + } + + /** + * The cached validation expression for the ' + * {@link #referencedElementHasId(org.eclipse.emf.common.util.DiagnosticChain, java.util.Map) + * <em>Referenced Element Has Id</em>}' invariant operation. <!-- + * begin-user-doc --> <!-- end-user-doc --> + * + * @see #referencedElementHasId(org.eclipse.emf.common.util.DiagnosticChain, + * java.util.Map) + * @generated + * @ordered + */ + protected static final String REFERENCED_ELEMENT_HAS_ID_DIAGNOSTIC_CHAIN_MAP__EEXPRESSION = "referencedElement->notEmpty() implies referencedElement.id->notEmpty()"; + + /** + * <!-- begin-user-doc --> <!-- end-user-doc --> + * + * @generated + */ + public boolean referencedElementHasId(DiagnosticChain diagnostics, + Map<Object, Object> context) { + return DGValidator + .validate( + DGPackage.Literals.USE, + this, + diagnostics, + context, + "http://www.eclipse.org/emf/2002/Ecore/OCL", + DGPackage.Literals.USE___REFERENCED_ELEMENT_HAS_ID__DIAGNOSTICCHAIN_MAP, + REFERENCED_ELEMENT_HAS_ID_DIAGNOSTIC_CHAIN_MAP__EEXPRESSION, + Diagnostic.ERROR, DGValidator.DIAGNOSTIC_SOURCE, + DGValidator.USE__REFERENCED_ELEMENT_HAS_ID); + } + + /** + * <!-- begin-user-doc --> <!-- end-user-doc --> + * + * @generated + */ @Override public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) { @@ -145,6 +240,10 @@ public class UseImpl extends GraphicalElementImpl implements Use { switch (featureID) { case DGPackage.USE__BOUNDS: return getBounds(); + case DGPackage.USE__REFERENCED_ELEMENT: + if (resolve) + return getReferencedElement(); + return basicGetReferencedElement(); } return super.eGet(featureID, resolve, coreType); } @@ -160,6 +259,9 @@ public class UseImpl extends GraphicalElementImpl implements Use { case DGPackage.USE__BOUNDS: setBounds((Bounds) newValue); return; + case DGPackage.USE__REFERENCED_ELEMENT: + setReferencedElement((GraphicalElement) newValue); + return; } super.eSet(featureID, newValue); } @@ -175,6 +277,9 @@ public class UseImpl extends GraphicalElementImpl implements Use { case DGPackage.USE__BOUNDS: setBounds((Bounds) null); return; + case DGPackage.USE__REFERENCED_ELEMENT: + setReferencedElement((GraphicalElement) null); + return; } super.eUnset(featureID); } @@ -189,8 +294,27 @@ public class UseImpl extends GraphicalElementImpl implements Use { switch (featureID) { case DGPackage.USE__BOUNDS: return bounds != null; + case DGPackage.USE__REFERENCED_ELEMENT: + return referencedElement != null; } return super.eIsSet(featureID); } + /** + * <!-- begin-user-doc --> <!-- end-user-doc --> + * + * @generated + */ + @Override + @SuppressWarnings("unchecked") + public Object eInvoke(int operationID, EList<?> arguments) + throws InvocationTargetException { + switch (operationID) { + case DGPackage.USE___REFERENCED_ELEMENT_HAS_ID__DIAGNOSTICCHAIN_MAP: + return referencedElementHasId((DiagnosticChain) arguments.get(0), + (Map<Object, Object>) arguments.get(1)); + } + return super.eInvoke(operationID, arguments); + } + } // UseImpl diff --git a/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/util/DGAdapterFactory.java b/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/util/DGAdapterFactory.java index e35a060258b..8c7830a6820 100644 --- a/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/util/DGAdapterFactory.java +++ b/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/util/DGAdapterFactory.java @@ -172,8 +172,8 @@ public class DGAdapterFactory extends AdapterFactoryImpl { } @Override - public Adapter caseEllipticalCurveTo(EllipticalCurveTo object) { - return createEllipticalCurveToAdapter(); + public Adapter caseEllipticalArcTo(EllipticalArcTo object) { + return createEllipticalArcToAdapter(); } @Override @@ -599,17 +599,17 @@ public class DGAdapterFactory extends AdapterFactoryImpl { /** * Creates a new adapter for an object of class ' - * {@link org.eclipse.papyrus.dd.dg.EllipticalCurveTo - * <em>Elliptical Curve To</em>}'. <!-- begin-user-doc --> This default + * {@link org.eclipse.papyrus.dd.dg.EllipticalArcTo + * <em>Elliptical Arc To</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.papyrus.dd.dg.EllipticalCurveTo + * @see org.eclipse.papyrus.dd.dg.EllipticalArcTo * @generated */ - public Adapter createEllipticalCurveToAdapter() { + public Adapter createEllipticalArcToAdapter() { return null; } diff --git a/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/util/DGSwitch.java b/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/util/DGSwitch.java index 1203dcdef4b..1416204f031 100644 --- a/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/util/DGSwitch.java +++ b/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/util/DGSwitch.java @@ -242,11 +242,11 @@ public class DGSwitch<T> extends Switch<T> { result = defaultCase(theEObject); return result; } - case DGPackage.ELLIPTICAL_CURVE_TO: { - EllipticalCurveTo ellipticalCurveTo = (EllipticalCurveTo) theEObject; - T result = caseEllipticalCurveTo(ellipticalCurveTo); + case DGPackage.ELLIPTICAL_ARC_TO: { + EllipticalArcTo ellipticalArcTo = (EllipticalArcTo) theEObject; + T result = caseEllipticalArcTo(ellipticalArcTo); if (result == null) - result = casePathCommand(ellipticalCurveTo); + result = casePathCommand(ellipticalArcTo); if (result == null) result = defaultCase(theEObject); return result; @@ -834,18 +834,18 @@ public class DGSwitch<T> extends Switch<T> { /** * Returns the result of interpreting the object as an instance of ' - * <em>Elliptical Curve To</em>'. <!-- begin-user-doc --> This - * implementation returns null; returning a non-null result will terminate - * the switch. <!-- end-user-doc --> + * <em>Elliptical Arc To</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>Elliptical Curve To</em>'. + * <em>Elliptical Arc To</em>'. * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject) * @generated */ - public T caseEllipticalCurveTo(EllipticalCurveTo object) { + public T caseEllipticalArcTo(EllipticalArcTo object) { return null; } diff --git a/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/util/DGValidator.java b/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/util/DGValidator.java index 0e535ea4657..00f2e36fae2 100644 --- a/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/util/DGValidator.java +++ b/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/util/DGValidator.java @@ -55,12 +55,39 @@ public class DGValidator extends EObjectValidator { /** * The {@link org.eclipse.emf.common.util.Diagnostic#getCode() code} for + * constraint 'Canvas Cannot Have Transforms' of 'Canvas'. <!-- + * begin-user-doc --> <!-- end-user-doc --> + * + * @generated + */ + public static final int CANVAS__CANVAS_CANNOT_HAVE_TRANSFORMS = 1; + + /** + * The {@link org.eclipse.emf.common.util.Diagnostic#getCode() code} for + * constraint 'Referenced Clippath Has Id' of 'Graphical Element'. <!-- + * begin-user-doc --> <!-- end-user-doc --> + * + * @generated + */ + public static final int GRAPHICAL_ELEMENT__REFERENCED_CLIPPATH_HAS_ID = 2; + + /** + * The {@link org.eclipse.emf.common.util.Diagnostic#getCode() code} for + * constraint 'Id Cannot Be Empty' of 'Definition'. <!-- begin-user-doc --> + * <!-- end-user-doc --> + * + * @generated + */ + public static final int DEFINITION__ID_CANNOT_BE_EMPTY = 3; + + /** + * The {@link org.eclipse.emf.common.util.Diagnostic#getCode() code} for * constraint 'Valid Font Size' of 'Style'. <!-- begin-user-doc --> <!-- * end-user-doc --> * * @generated */ - public static final int STYLE__VALID_FONT_SIZE = 1; + public static final int STYLE__VALID_FONT_SIZE = 4; /** * The {@link org.eclipse.emf.common.util.Diagnostic#getCode() code} for @@ -69,7 +96,7 @@ public class DGValidator extends EObjectValidator { * * @generated */ - public static final int STYLE__VALID_FILL_OPACITY = 2; + public static final int STYLE__VALID_FILL_OPACITY = 5; /** * The {@link org.eclipse.emf.common.util.Diagnostic#getCode() code} for @@ -78,7 +105,7 @@ public class DGValidator extends EObjectValidator { * * @generated */ - public static final int STYLE__VALID_STROKE_WIDTH = 3; + public static final int STYLE__VALID_STROKE_WIDTH = 6; /** * The {@link org.eclipse.emf.common.util.Diagnostic#getCode() code} for @@ -87,7 +114,7 @@ public class DGValidator extends EObjectValidator { * * @generated */ - public static final int STYLE__VALID_DASH_LENGTH_SIZE = 4; + public static final int STYLE__VALID_DASH_LENGTH_SIZE = 7; /** * The {@link org.eclipse.emf.common.util.Diagnostic#getCode() code} for @@ -96,7 +123,16 @@ public class DGValidator extends EObjectValidator { * * @generated */ - public static final int STYLE__VALID_STROKE_OPACITY = 5; + public static final int STYLE__VALID_STROKE_OPACITY = 8; + + /** + * The {@link org.eclipse.emf.common.util.Diagnostic#getCode() code} for + * constraint 'Referenced Paint Server Has Id' of 'Paint'. <!-- + * begin-user-doc --> <!-- end-user-doc --> + * + * @generated + */ + public static final int PAINT__REFERENCED_PAINT_SERVER_HAS_ID = 9; /** * The {@link org.eclipse.emf.common.util.Diagnostic#getCode() code} for @@ -105,7 +141,7 @@ public class DGValidator extends EObjectValidator { * * @generated */ - public static final int CIRCLE__NON_NEGATIVE_RADIUS = 6; + public static final int CIRCLE__NON_NEGATIVE_RADIUS = 10; /** * The {@link org.eclipse.emf.common.util.Diagnostic#getCode() code} for @@ -114,7 +150,7 @@ public class DGValidator extends EObjectValidator { * * @generated */ - public static final int GRADIENT_STOP__VALID_OFFSET = 7; + public static final int GRADIENT_STOP__VALID_OFFSET = 11; /** * The {@link org.eclipse.emf.common.util.Diagnostic#getCode() code} for @@ -123,7 +159,43 @@ public class DGValidator extends EObjectValidator { * * @generated */ - public static final int GRADIENT_STOP__VALID_OPACITY = 8; + public static final int GRADIENT_STOP__VALID_OPACITY = 12; + + /** + * The {@link org.eclipse.emf.common.util.Diagnostic#getCode() code} for + * constraint 'Source Cannot Be Empty' of 'Image'. <!-- begin-user-doc --> + * <!-- end-user-doc --> + * + * @generated + */ + public static final int IMAGE__SOURCE_CANNOT_BE_EMPTY = 13; + + /** + * The {@link org.eclipse.emf.common.util.Diagnostic#getCode() code} for + * constraint 'Referenced Start Marker Has Id' of 'Marked Element'. <!-- + * begin-user-doc --> <!-- end-user-doc --> + * + * @generated + */ + public static final int MARKED_ELEMENT__REFERENCED_START_MARKER_HAS_ID = 14; + + /** + * The {@link org.eclipse.emf.common.util.Diagnostic#getCode() code} for + * constraint 'Referenced Mid Marker Has Id' of 'Marked Element'. <!-- + * begin-user-doc --> <!-- end-user-doc --> + * + * @generated + */ + public static final int MARKED_ELEMENT__REFERENCED_MID_MARKER_HAS_ID = 15; + + /** + * The {@link org.eclipse.emf.common.util.Diagnostic#getCode() code} for + * constraint 'Referenced End Marker Has Id' of 'Marked Element'. <!-- + * begin-user-doc --> <!-- end-user-doc --> + * + * @generated + */ + public static final int MARKED_ELEMENT__REFERENCED_END_MARKER_HAS_ID = 16; /** * The {@link org.eclipse.emf.common.util.Diagnostic#getCode() code} for @@ -132,7 +204,16 @@ public class DGValidator extends EObjectValidator { * * @generated */ - public static final int LINEAR_GRADIENT__VALID_GRADIENT_VECTOR = 9; + public static final int LINEAR_GRADIENT__VALID_GRADIENT_VECTOR = 17; + + /** + * The {@link org.eclipse.emf.common.util.Diagnostic#getCode() code} for + * constraint 'First Command Must Be Move' of 'Path'. <!-- begin-user-doc + * --> <!-- end-user-doc --> + * + * @generated + */ + public static final int PATH__FIRST_COMMAND_MUST_BE_MOVE = 18; /** * The {@link org.eclipse.emf.common.util.Diagnostic#getCode() code} for @@ -141,7 +222,7 @@ public class DGValidator extends EObjectValidator { * * @generated */ - public static final int RADIAL_GRADIENT__VALID_CENTER_POINT = 10; + public static final int RADIAL_GRADIENT__VALID_CENTER_POINT = 19; /** * The {@link org.eclipse.emf.common.util.Diagnostic#getCode() code} for @@ -150,7 +231,7 @@ public class DGValidator extends EObjectValidator { * * @generated */ - public static final int RADIAL_GRADIENT__VALID_FOCUS_POINT = 11; + public static final int RADIAL_GRADIENT__VALID_FOCUS_POINT = 20; /** * The {@link org.eclipse.emf.common.util.Diagnostic#getCode() code} for @@ -159,7 +240,16 @@ public class DGValidator extends EObjectValidator { * * @generated */ - public static final int RADIAL_GRADIENT__VALID_RADIUS = 12; + public static final int RADIAL_GRADIENT__VALID_RADIUS = 21; + + /** + * The {@link org.eclipse.emf.common.util.Diagnostic#getCode() code} for + * constraint 'Non Negative Corner Radius' of 'Rectangle'. <!-- + * begin-user-doc --> <!-- end-user-doc --> + * + * @generated + */ + public static final int RECTANGLE__NON_NEGATIVE_CORNER_RADIUS = 22; /** * The {@link org.eclipse.emf.common.util.Diagnostic#getCode() code} for @@ -168,7 +258,25 @@ public class DGValidator extends EObjectValidator { * * @generated */ - public static final int SCALE__NONNEGATIVESCALE = 13; + public static final int SCALE__NONNEGATIVESCALE = 23; + + /** + * The {@link org.eclipse.emf.common.util.Diagnostic#getCode() code} for + * constraint 'Data Cannot Be Empty' of 'Text'. <!-- begin-user-doc --> <!-- + * end-user-doc --> + * + * @generated + */ + public static final int TEXT__DATA_CANNOT_BE_EMPTY = 24; + + /** + * The {@link org.eclipse.emf.common.util.Diagnostic#getCode() code} for + * constraint 'Referenced Element Has Id' of 'Use'. <!-- begin-user-doc --> + * <!-- end-user-doc --> + * + * @generated + */ + public static final int USE__REFERENCED_ELEMENT_HAS_ID = 25; /** * A constant with a fixed name that can be used as the base value for @@ -177,7 +285,7 @@ public class DGValidator extends EObjectValidator { * * @generated */ - private static final int GENERATED_DIAGNOSTIC_CODE_COUNT = 13; + private static final int GENERATED_DIAGNOSTIC_CODE_COUNT = 25; /** * A constant with a fixed name that can be used as the base value for @@ -278,8 +386,8 @@ public class DGValidator extends EObjectValidator { context); case DGPackage.ELLIPSE: return validateEllipse((Ellipse) value, diagnostics, context); - case DGPackage.ELLIPTICAL_CURVE_TO: - return validateEllipticalCurveTo((EllipticalCurveTo) value, + case DGPackage.ELLIPTICAL_ARC_TO: + return validateEllipticalArcTo((EllipticalArcTo) value, diagnostics, context); case DGPackage.QUADRATIC_CURVE_TO: return validateQuadraticCurveTo((QuadraticCurveTo) value, @@ -335,6 +443,9 @@ public class DGValidator extends EObjectValidator { case DGPackage.FONT_DECORATION: return validateFontDecoration((FontDecoration) value, diagnostics, context); + case DGPackage.ELEMENT_KIND: + return validateElementKind((ElementKind) value, diagnostics, + context); default: return true; } @@ -347,7 +458,48 @@ public class DGValidator extends EObjectValidator { */ public boolean validateCanvas(Canvas canvas, DiagnosticChain diagnostics, Map<Object, Object> context) { - return validate_EveryDefaultConstraint(canvas, diagnostics, context); + if (!validate_NoCircularContainment(canvas, diagnostics, context)) + return false; + boolean result = validate_EveryMultiplicityConforms(canvas, + diagnostics, context); + if (result || diagnostics != null) + result &= validate_EveryDataValueConforms(canvas, diagnostics, + context); + if (result || diagnostics != null) + result &= validate_EveryReferenceIsContained(canvas, diagnostics, + context); + if (result || diagnostics != null) + result &= validate_EveryBidirectionalReferenceIsPaired(canvas, + diagnostics, context); + if (result || diagnostics != null) + result &= validate_EveryProxyResolves(canvas, diagnostics, context); + if (result || diagnostics != null) + result &= validate_UniqueID(canvas, diagnostics, context); + if (result || diagnostics != null) + result &= validate_EveryKeyUnique(canvas, diagnostics, context); + if (result || diagnostics != null) + result &= validate_EveryMapEntryUnique(canvas, diagnostics, context); + if (result || diagnostics != null) + result &= validateDefinition_idCannotBeEmpty(canvas, diagnostics, + context); + if (result || diagnostics != null) + result &= validateGraphicalElement_referencedClippathHasId(canvas, + diagnostics, context); + if (result || diagnostics != null) + result &= validateCanvas_canvasCannotHaveTransforms(canvas, + diagnostics, context); + return result; + } + + /** + * Validates the canvasCannotHaveTransforms constraint of '<em>Canvas</em>'. + * <!-- begin-user-doc --> <!-- end-user-doc --> + * + * @generated + */ + public boolean validateCanvas_canvasCannotHaveTransforms(Canvas canvas, + DiagnosticChain diagnostics, Map<Object, Object> context) { + return canvas.canvasCannotHaveTransforms(diagnostics, context); } /** @@ -357,7 +509,34 @@ public class DGValidator extends EObjectValidator { */ public boolean validateGroup(Group group, DiagnosticChain diagnostics, Map<Object, Object> context) { - return validate_EveryDefaultConstraint(group, diagnostics, context); + if (!validate_NoCircularContainment(group, diagnostics, context)) + return false; + boolean result = validate_EveryMultiplicityConforms(group, diagnostics, + context); + if (result || diagnostics != null) + result &= validate_EveryDataValueConforms(group, diagnostics, + context); + if (result || diagnostics != null) + result &= validate_EveryReferenceIsContained(group, diagnostics, + context); + if (result || diagnostics != null) + result &= validate_EveryBidirectionalReferenceIsPaired(group, + diagnostics, context); + if (result || diagnostics != null) + result &= validate_EveryProxyResolves(group, diagnostics, context); + if (result || diagnostics != null) + result &= validate_UniqueID(group, diagnostics, context); + if (result || diagnostics != null) + result &= validate_EveryKeyUnique(group, diagnostics, context); + if (result || diagnostics != null) + result &= validate_EveryMapEntryUnique(group, diagnostics, context); + if (result || diagnostics != null) + result &= validateDefinition_idCannotBeEmpty(group, diagnostics, + context); + if (result || diagnostics != null) + result &= validateGraphicalElement_referencedClippathHasId(group, + diagnostics, context); + return result; } /** @@ -367,8 +546,51 @@ public class DGValidator extends EObjectValidator { */ public boolean validateGraphicalElement(GraphicalElement graphicalElement, DiagnosticChain diagnostics, Map<Object, Object> context) { - return validate_EveryDefaultConstraint(graphicalElement, diagnostics, - context); + if (!validate_NoCircularContainment(graphicalElement, diagnostics, + context)) + return false; + boolean result = validate_EveryMultiplicityConforms(graphicalElement, + diagnostics, context); + if (result || diagnostics != null) + result &= validate_EveryDataValueConforms(graphicalElement, + diagnostics, context); + if (result || diagnostics != null) + result &= validate_EveryReferenceIsContained(graphicalElement, + diagnostics, context); + if (result || diagnostics != null) + result &= validate_EveryBidirectionalReferenceIsPaired( + graphicalElement, diagnostics, context); + if (result || diagnostics != null) + result &= validate_EveryProxyResolves(graphicalElement, + diagnostics, context); + if (result || diagnostics != null) + result &= validate_UniqueID(graphicalElement, diagnostics, context); + if (result || diagnostics != null) + result &= validate_EveryKeyUnique(graphicalElement, diagnostics, + context); + if (result || diagnostics != null) + result &= validate_EveryMapEntryUnique(graphicalElement, + diagnostics, context); + if (result || diagnostics != null) + result &= validateDefinition_idCannotBeEmpty(graphicalElement, + diagnostics, context); + if (result || diagnostics != null) + result &= validateGraphicalElement_referencedClippathHasId( + graphicalElement, diagnostics, context); + return result; + } + + /** + * Validates the referencedClippathHasId constraint of ' + * <em>Graphical Element</em>'. <!-- begin-user-doc --> <!-- end-user-doc + * --> + * + * @generated + */ + public boolean validateGraphicalElement_referencedClippathHasId( + GraphicalElement graphicalElement, DiagnosticChain diagnostics, + Map<Object, Object> context) { + return graphicalElement.referencedClippathHasId(diagnostics, context); } /** @@ -378,7 +600,44 @@ public class DGValidator extends EObjectValidator { */ public boolean validateDefinition(Definition definition, DiagnosticChain diagnostics, Map<Object, Object> context) { - return validate_EveryDefaultConstraint(definition, diagnostics, context); + if (!validate_NoCircularContainment(definition, diagnostics, context)) + return false; + boolean result = validate_EveryMultiplicityConforms(definition, + diagnostics, context); + if (result || diagnostics != null) + result &= validate_EveryDataValueConforms(definition, diagnostics, + context); + if (result || diagnostics != null) + result &= validate_EveryReferenceIsContained(definition, + diagnostics, context); + if (result || diagnostics != null) + result &= validate_EveryBidirectionalReferenceIsPaired(definition, + diagnostics, context); + if (result || diagnostics != null) + result &= validate_EveryProxyResolves(definition, diagnostics, + context); + if (result || diagnostics != null) + result &= validate_UniqueID(definition, diagnostics, context); + if (result || diagnostics != null) + result &= validate_EveryKeyUnique(definition, diagnostics, context); + if (result || diagnostics != null) + result &= validate_EveryMapEntryUnique(definition, diagnostics, + context); + if (result || diagnostics != null) + result &= validateDefinition_idCannotBeEmpty(definition, + diagnostics, context); + return result; + } + + /** + * Validates the idCannotBeEmpty constraint of '<em>Definition</em>'. <!-- + * begin-user-doc --> <!-- end-user-doc --> + * + * @generated + */ + public boolean validateDefinition_idCannotBeEmpty(Definition definition, + DiagnosticChain diagnostics, Map<Object, Object> context) { + return definition.idCannotBeEmpty(diagnostics, context); } /** @@ -388,7 +647,36 @@ public class DGValidator extends EObjectValidator { */ public boolean validateClipPath(ClipPath clipPath, DiagnosticChain diagnostics, Map<Object, Object> context) { - return validate_EveryDefaultConstraint(clipPath, diagnostics, context); + if (!validate_NoCircularContainment(clipPath, diagnostics, context)) + return false; + boolean result = validate_EveryMultiplicityConforms(clipPath, + diagnostics, context); + if (result || diagnostics != null) + result &= validate_EveryDataValueConforms(clipPath, diagnostics, + context); + if (result || diagnostics != null) + result &= validate_EveryReferenceIsContained(clipPath, diagnostics, + context); + if (result || diagnostics != null) + result &= validate_EveryBidirectionalReferenceIsPaired(clipPath, + diagnostics, context); + if (result || diagnostics != null) + result &= validate_EveryProxyResolves(clipPath, diagnostics, + context); + if (result || diagnostics != null) + result &= validate_UniqueID(clipPath, diagnostics, context); + if (result || diagnostics != null) + result &= validate_EveryKeyUnique(clipPath, diagnostics, context); + if (result || diagnostics != null) + result &= validate_EveryMapEntryUnique(clipPath, diagnostics, + context); + if (result || diagnostics != null) + result &= validateDefinition_idCannotBeEmpty(clipPath, diagnostics, + context); + if (result || diagnostics != null) + result &= validateGraphicalElement_referencedClippathHasId( + clipPath, diagnostics, context); + return result; } /** @@ -498,7 +786,42 @@ public class DGValidator extends EObjectValidator { */ public boolean validatePaint(Paint paint, DiagnosticChain diagnostics, Map<Object, Object> context) { - return validate_EveryDefaultConstraint(paint, diagnostics, context); + if (!validate_NoCircularContainment(paint, diagnostics, context)) + return false; + boolean result = validate_EveryMultiplicityConforms(paint, diagnostics, + context); + if (result || diagnostics != null) + result &= validate_EveryDataValueConforms(paint, diagnostics, + context); + if (result || diagnostics != null) + result &= validate_EveryReferenceIsContained(paint, diagnostics, + context); + if (result || diagnostics != null) + result &= validate_EveryBidirectionalReferenceIsPaired(paint, + diagnostics, context); + if (result || diagnostics != null) + result &= validate_EveryProxyResolves(paint, diagnostics, context); + if (result || diagnostics != null) + result &= validate_UniqueID(paint, diagnostics, context); + if (result || diagnostics != null) + result &= validate_EveryKeyUnique(paint, diagnostics, context); + if (result || diagnostics != null) + result &= validate_EveryMapEntryUnique(paint, diagnostics, context); + if (result || diagnostics != null) + result &= validatePaint_referencedPaintServerHasId(paint, + diagnostics, context); + return result; + } + + /** + * Validates the referencedPaintServerHasId constraint of '<em>Paint</em>'. + * <!-- begin-user-doc --> <!-- end-user-doc --> + * + * @generated + */ + public boolean validatePaint_referencedPaintServerHasId(Paint paint, + DiagnosticChain diagnostics, Map<Object, Object> context) { + return paint.referencedPaintServerHasId(diagnostics, context); } /** @@ -508,8 +831,33 @@ public class DGValidator extends EObjectValidator { */ public boolean validatePaintServer(PaintServer paintServer, DiagnosticChain diagnostics, Map<Object, Object> context) { - return validate_EveryDefaultConstraint(paintServer, diagnostics, - context); + if (!validate_NoCircularContainment(paintServer, diagnostics, context)) + return false; + boolean result = validate_EveryMultiplicityConforms(paintServer, + diagnostics, context); + if (result || diagnostics != null) + result &= validate_EveryDataValueConforms(paintServer, diagnostics, + context); + if (result || diagnostics != null) + result &= validate_EveryReferenceIsContained(paintServer, + diagnostics, context); + if (result || diagnostics != null) + result &= validate_EveryBidirectionalReferenceIsPaired(paintServer, + diagnostics, context); + if (result || diagnostics != null) + result &= validate_EveryProxyResolves(paintServer, diagnostics, + context); + if (result || diagnostics != null) + result &= validate_UniqueID(paintServer, diagnostics, context); + if (result || diagnostics != null) + result &= validate_EveryKeyUnique(paintServer, diagnostics, context); + if (result || diagnostics != null) + result &= validate_EveryMapEntryUnique(paintServer, diagnostics, + context); + if (result || diagnostics != null) + result &= validateDefinition_idCannotBeEmpty(paintServer, + diagnostics, context); + return result; } /** @@ -562,7 +910,34 @@ public class DGValidator extends EObjectValidator { */ public boolean validateMarker(Marker marker, DiagnosticChain diagnostics, Map<Object, Object> context) { - return validate_EveryDefaultConstraint(marker, diagnostics, context); + if (!validate_NoCircularContainment(marker, diagnostics, context)) + return false; + boolean result = validate_EveryMultiplicityConforms(marker, + diagnostics, context); + if (result || diagnostics != null) + result &= validate_EveryDataValueConforms(marker, diagnostics, + context); + if (result || diagnostics != null) + result &= validate_EveryReferenceIsContained(marker, diagnostics, + context); + if (result || diagnostics != null) + result &= validate_EveryBidirectionalReferenceIsPaired(marker, + diagnostics, context); + if (result || diagnostics != null) + result &= validate_EveryProxyResolves(marker, diagnostics, context); + if (result || diagnostics != null) + result &= validate_UniqueID(marker, diagnostics, context); + if (result || diagnostics != null) + result &= validate_EveryKeyUnique(marker, diagnostics, context); + if (result || diagnostics != null) + result &= validate_EveryMapEntryUnique(marker, diagnostics, context); + if (result || diagnostics != null) + result &= validateDefinition_idCannotBeEmpty(marker, diagnostics, + context); + if (result || diagnostics != null) + result &= validateGraphicalElement_referencedClippathHasId(marker, + diagnostics, context); + return result; } /** @@ -625,6 +1000,12 @@ public class DGValidator extends EObjectValidator { if (result || diagnostics != null) result &= validate_EveryMapEntryUnique(circle, diagnostics, context); if (result || diagnostics != null) + result &= validateDefinition_idCannotBeEmpty(circle, diagnostics, + context); + if (result || diagnostics != null) + result &= validateGraphicalElement_referencedClippathHasId(circle, + diagnostics, context); + if (result || diagnostics != null) result &= validateCircle_nonNegativeRadius(circle, diagnostics, context); return result; @@ -658,7 +1039,35 @@ public class DGValidator extends EObjectValidator { */ public boolean validateEllipse(Ellipse ellipse, DiagnosticChain diagnostics, Map<Object, Object> context) { - return validate_EveryDefaultConstraint(ellipse, diagnostics, context); + if (!validate_NoCircularContainment(ellipse, diagnostics, context)) + return false; + boolean result = validate_EveryMultiplicityConforms(ellipse, + diagnostics, context); + if (result || diagnostics != null) + result &= validate_EveryDataValueConforms(ellipse, diagnostics, + context); + if (result || diagnostics != null) + result &= validate_EveryReferenceIsContained(ellipse, diagnostics, + context); + if (result || diagnostics != null) + result &= validate_EveryBidirectionalReferenceIsPaired(ellipse, + diagnostics, context); + if (result || diagnostics != null) + result &= validate_EveryProxyResolves(ellipse, diagnostics, context); + if (result || diagnostics != null) + result &= validate_UniqueID(ellipse, diagnostics, context); + if (result || diagnostics != null) + result &= validate_EveryKeyUnique(ellipse, diagnostics, context); + if (result || diagnostics != null) + result &= validate_EveryMapEntryUnique(ellipse, diagnostics, + context); + if (result || diagnostics != null) + result &= validateDefinition_idCannotBeEmpty(ellipse, diagnostics, + context); + if (result || diagnostics != null) + result &= validateGraphicalElement_referencedClippathHasId(ellipse, + diagnostics, context); + return result; } /** @@ -666,10 +1075,9 @@ public class DGValidator extends EObjectValidator { * * @generated */ - public boolean validateEllipticalCurveTo( - EllipticalCurveTo ellipticalCurveTo, DiagnosticChain diagnostics, - Map<Object, Object> context) { - return validate_EveryDefaultConstraint(ellipticalCurveTo, diagnostics, + public boolean validateEllipticalArcTo(EllipticalArcTo ellipticalArcTo, + DiagnosticChain diagnostics, Map<Object, Object> context) { + return validate_EveryDefaultConstraint(ellipticalArcTo, diagnostics, context); } @@ -691,7 +1099,33 @@ public class DGValidator extends EObjectValidator { */ public boolean validateGradient(Gradient gradient, DiagnosticChain diagnostics, Map<Object, Object> context) { - return validate_EveryDefaultConstraint(gradient, diagnostics, context); + if (!validate_NoCircularContainment(gradient, diagnostics, context)) + return false; + boolean result = validate_EveryMultiplicityConforms(gradient, + diagnostics, context); + if (result || diagnostics != null) + result &= validate_EveryDataValueConforms(gradient, diagnostics, + context); + if (result || diagnostics != null) + result &= validate_EveryReferenceIsContained(gradient, diagnostics, + context); + if (result || diagnostics != null) + result &= validate_EveryBidirectionalReferenceIsPaired(gradient, + diagnostics, context); + if (result || diagnostics != null) + result &= validate_EveryProxyResolves(gradient, diagnostics, + context); + if (result || diagnostics != null) + result &= validate_UniqueID(gradient, diagnostics, context); + if (result || diagnostics != null) + result &= validate_EveryKeyUnique(gradient, diagnostics, context); + if (result || diagnostics != null) + result &= validate_EveryMapEntryUnique(gradient, diagnostics, + context); + if (result || diagnostics != null) + result &= validateDefinition_idCannotBeEmpty(gradient, diagnostics, + context); + return result; } /** @@ -763,7 +1197,48 @@ public class DGValidator extends EObjectValidator { */ public boolean validateImage(Image image, DiagnosticChain diagnostics, Map<Object, Object> context) { - return validate_EveryDefaultConstraint(image, diagnostics, context); + if (!validate_NoCircularContainment(image, diagnostics, context)) + return false; + boolean result = validate_EveryMultiplicityConforms(image, diagnostics, + context); + if (result || diagnostics != null) + result &= validate_EveryDataValueConforms(image, diagnostics, + context); + if (result || diagnostics != null) + result &= validate_EveryReferenceIsContained(image, diagnostics, + context); + if (result || diagnostics != null) + result &= validate_EveryBidirectionalReferenceIsPaired(image, + diagnostics, context); + if (result || diagnostics != null) + result &= validate_EveryProxyResolves(image, diagnostics, context); + if (result || diagnostics != null) + result &= validate_UniqueID(image, diagnostics, context); + if (result || diagnostics != null) + result &= validate_EveryKeyUnique(image, diagnostics, context); + if (result || diagnostics != null) + result &= validate_EveryMapEntryUnique(image, diagnostics, context); + if (result || diagnostics != null) + result &= validateDefinition_idCannotBeEmpty(image, diagnostics, + context); + if (result || diagnostics != null) + result &= validateGraphicalElement_referencedClippathHasId(image, + diagnostics, context); + if (result || diagnostics != null) + result &= validateImage_sourceCannotBeEmpty(image, diagnostics, + context); + return result; + } + + /** + * Validates the sourceCannotBeEmpty constraint of '<em>Image</em>'. <!-- + * begin-user-doc --> <!-- end-user-doc --> + * + * @generated + */ + public boolean validateImage_sourceCannotBeEmpty(Image image, + DiagnosticChain diagnostics, Map<Object, Object> context) { + return image.sourceCannotBeEmpty(diagnostics, context); } /** @@ -773,7 +1248,43 @@ public class DGValidator extends EObjectValidator { */ public boolean validateLine(Line line, DiagnosticChain diagnostics, Map<Object, Object> context) { - return validate_EveryDefaultConstraint(line, diagnostics, context); + if (!validate_NoCircularContainment(line, diagnostics, context)) + return false; + boolean result = validate_EveryMultiplicityConforms(line, diagnostics, + context); + if (result || diagnostics != null) + result &= validate_EveryDataValueConforms(line, diagnostics, + context); + if (result || diagnostics != null) + result &= validate_EveryReferenceIsContained(line, diagnostics, + context); + if (result || diagnostics != null) + result &= validate_EveryBidirectionalReferenceIsPaired(line, + diagnostics, context); + if (result || diagnostics != null) + result &= validate_EveryProxyResolves(line, diagnostics, context); + if (result || diagnostics != null) + result &= validate_UniqueID(line, diagnostics, context); + if (result || diagnostics != null) + result &= validate_EveryKeyUnique(line, diagnostics, context); + if (result || diagnostics != null) + result &= validate_EveryMapEntryUnique(line, diagnostics, context); + if (result || diagnostics != null) + result &= validateDefinition_idCannotBeEmpty(line, diagnostics, + context); + if (result || diagnostics != null) + result &= validateGraphicalElement_referencedClippathHasId(line, + diagnostics, context); + if (result || diagnostics != null) + result &= validateMarkedElement_referencedStartMarkerHasId(line, + diagnostics, context); + if (result || diagnostics != null) + result &= validateMarkedElement_referencedMidMarkerHasId(line, + diagnostics, context); + if (result || diagnostics != null) + result &= validateMarkedElement_referencedEndMarkerHasId(line, + diagnostics, context); + return result; } /** @@ -783,8 +1294,82 @@ public class DGValidator extends EObjectValidator { */ public boolean validateMarkedElement(MarkedElement markedElement, DiagnosticChain diagnostics, Map<Object, Object> context) { - return validate_EveryDefaultConstraint(markedElement, diagnostics, - context); + if (!validate_NoCircularContainment(markedElement, diagnostics, context)) + return false; + boolean result = validate_EveryMultiplicityConforms(markedElement, + diagnostics, context); + if (result || diagnostics != null) + result &= validate_EveryDataValueConforms(markedElement, + diagnostics, context); + if (result || diagnostics != null) + result &= validate_EveryReferenceIsContained(markedElement, + diagnostics, context); + if (result || diagnostics != null) + result &= validate_EveryBidirectionalReferenceIsPaired( + markedElement, diagnostics, context); + if (result || diagnostics != null) + result &= validate_EveryProxyResolves(markedElement, diagnostics, + context); + if (result || diagnostics != null) + result &= validate_UniqueID(markedElement, diagnostics, context); + if (result || diagnostics != null) + result &= validate_EveryKeyUnique(markedElement, diagnostics, + context); + if (result || diagnostics != null) + result &= validate_EveryMapEntryUnique(markedElement, diagnostics, + context); + if (result || diagnostics != null) + result &= validateDefinition_idCannotBeEmpty(markedElement, + diagnostics, context); + if (result || diagnostics != null) + result &= validateGraphicalElement_referencedClippathHasId( + markedElement, diagnostics, context); + if (result || diagnostics != null) + result &= validateMarkedElement_referencedStartMarkerHasId( + markedElement, diagnostics, context); + if (result || diagnostics != null) + result &= validateMarkedElement_referencedMidMarkerHasId( + markedElement, diagnostics, context); + if (result || diagnostics != null) + result &= validateMarkedElement_referencedEndMarkerHasId( + markedElement, diagnostics, context); + return result; + } + + /** + * Validates the referencedStartMarkerHasId constraint of ' + * <em>Marked Element</em>'. <!-- begin-user-doc --> <!-- end-user-doc --> + * + * @generated + */ + public boolean validateMarkedElement_referencedStartMarkerHasId( + MarkedElement markedElement, DiagnosticChain diagnostics, + Map<Object, Object> context) { + return markedElement.referencedStartMarkerHasId(diagnostics, context); + } + + /** + * Validates the referencedMidMarkerHasId constraint of ' + * <em>Marked Element</em>'. <!-- begin-user-doc --> <!-- end-user-doc --> + * + * @generated + */ + public boolean validateMarkedElement_referencedMidMarkerHasId( + MarkedElement markedElement, DiagnosticChain diagnostics, + Map<Object, Object> context) { + return markedElement.referencedMidMarkerHasId(diagnostics, context); + } + + /** + * Validates the referencedEndMarkerHasId constraint of ' + * <em>Marked Element</em>'. <!-- begin-user-doc --> <!-- end-user-doc --> + * + * @generated + */ + public boolean validateMarkedElement_referencedEndMarkerHasId( + MarkedElement markedElement, DiagnosticChain diagnostics, + Map<Object, Object> context) { + return markedElement.referencedEndMarkerHasId(diagnostics, context); } /** @@ -820,6 +1405,9 @@ public class DGValidator extends EObjectValidator { result &= validate_EveryMapEntryUnique(linearGradient, diagnostics, context); if (result || diagnostics != null) + result &= validateDefinition_idCannotBeEmpty(linearGradient, + diagnostics, context); + if (result || diagnostics != null) result &= validateLinearGradient_validGradientVector( linearGradient, diagnostics, context); return result; @@ -874,7 +1462,57 @@ public class DGValidator extends EObjectValidator { */ public boolean validatePath(Path path, DiagnosticChain diagnostics, Map<Object, Object> context) { - return validate_EveryDefaultConstraint(path, diagnostics, context); + if (!validate_NoCircularContainment(path, diagnostics, context)) + return false; + boolean result = validate_EveryMultiplicityConforms(path, diagnostics, + context); + if (result || diagnostics != null) + result &= validate_EveryDataValueConforms(path, diagnostics, + context); + if (result || diagnostics != null) + result &= validate_EveryReferenceIsContained(path, diagnostics, + context); + if (result || diagnostics != null) + result &= validate_EveryBidirectionalReferenceIsPaired(path, + diagnostics, context); + if (result || diagnostics != null) + result &= validate_EveryProxyResolves(path, diagnostics, context); + if (result || diagnostics != null) + result &= validate_UniqueID(path, diagnostics, context); + if (result || diagnostics != null) + result &= validate_EveryKeyUnique(path, diagnostics, context); + if (result || diagnostics != null) + result &= validate_EveryMapEntryUnique(path, diagnostics, context); + if (result || diagnostics != null) + result &= validateDefinition_idCannotBeEmpty(path, diagnostics, + context); + if (result || diagnostics != null) + result &= validateGraphicalElement_referencedClippathHasId(path, + diagnostics, context); + if (result || diagnostics != null) + result &= validateMarkedElement_referencedStartMarkerHasId(path, + diagnostics, context); + if (result || diagnostics != null) + result &= validateMarkedElement_referencedMidMarkerHasId(path, + diagnostics, context); + if (result || diagnostics != null) + result &= validateMarkedElement_referencedEndMarkerHasId(path, + diagnostics, context); + if (result || diagnostics != null) + result &= validatePath_firstCommandMustBeMove(path, diagnostics, + context); + return result; + } + + /** + * Validates the firstCommandMustBeMove constraint of '<em>Path</em>'. <!-- + * begin-user-doc --> <!-- end-user-doc --> + * + * @generated + */ + public boolean validatePath_firstCommandMustBeMove(Path path, + DiagnosticChain diagnostics, Map<Object, Object> context) { + return path.firstCommandMustBeMove(diagnostics, context); } /** @@ -884,7 +1522,32 @@ public class DGValidator extends EObjectValidator { */ public boolean validatePattern(Pattern pattern, DiagnosticChain diagnostics, Map<Object, Object> context) { - return validate_EveryDefaultConstraint(pattern, diagnostics, context); + if (!validate_NoCircularContainment(pattern, diagnostics, context)) + return false; + boolean result = validate_EveryMultiplicityConforms(pattern, + diagnostics, context); + if (result || diagnostics != null) + result &= validate_EveryDataValueConforms(pattern, diagnostics, + context); + if (result || diagnostics != null) + result &= validate_EveryReferenceIsContained(pattern, diagnostics, + context); + if (result || diagnostics != null) + result &= validate_EveryBidirectionalReferenceIsPaired(pattern, + diagnostics, context); + if (result || diagnostics != null) + result &= validate_EveryProxyResolves(pattern, diagnostics, context); + if (result || diagnostics != null) + result &= validate_UniqueID(pattern, diagnostics, context); + if (result || diagnostics != null) + result &= validate_EveryKeyUnique(pattern, diagnostics, context); + if (result || diagnostics != null) + result &= validate_EveryMapEntryUnique(pattern, diagnostics, + context); + if (result || diagnostics != null) + result &= validateDefinition_idCannotBeEmpty(pattern, diagnostics, + context); + return result; } /** @@ -894,7 +1557,44 @@ public class DGValidator extends EObjectValidator { */ public boolean validatePolygon(Polygon polygon, DiagnosticChain diagnostics, Map<Object, Object> context) { - return validate_EveryDefaultConstraint(polygon, diagnostics, context); + if (!validate_NoCircularContainment(polygon, diagnostics, context)) + return false; + boolean result = validate_EveryMultiplicityConforms(polygon, + diagnostics, context); + if (result || diagnostics != null) + result &= validate_EveryDataValueConforms(polygon, diagnostics, + context); + if (result || diagnostics != null) + result &= validate_EveryReferenceIsContained(polygon, diagnostics, + context); + if (result || diagnostics != null) + result &= validate_EveryBidirectionalReferenceIsPaired(polygon, + diagnostics, context); + if (result || diagnostics != null) + result &= validate_EveryProxyResolves(polygon, diagnostics, context); + if (result || diagnostics != null) + result &= validate_UniqueID(polygon, diagnostics, context); + if (result || diagnostics != null) + result &= validate_EveryKeyUnique(polygon, diagnostics, context); + if (result || diagnostics != null) + result &= validate_EveryMapEntryUnique(polygon, diagnostics, + context); + if (result || diagnostics != null) + result &= validateDefinition_idCannotBeEmpty(polygon, diagnostics, + context); + if (result || diagnostics != null) + result &= validateGraphicalElement_referencedClippathHasId(polygon, + diagnostics, context); + if (result || diagnostics != null) + result &= validateMarkedElement_referencedStartMarkerHasId(polygon, + diagnostics, context); + if (result || diagnostics != null) + result &= validateMarkedElement_referencedMidMarkerHasId(polygon, + diagnostics, context); + if (result || diagnostics != null) + result &= validateMarkedElement_referencedEndMarkerHasId(polygon, + diagnostics, context); + return result; } /** @@ -904,7 +1604,45 @@ public class DGValidator extends EObjectValidator { */ public boolean validatePolyline(Polyline polyline, DiagnosticChain diagnostics, Map<Object, Object> context) { - return validate_EveryDefaultConstraint(polyline, diagnostics, context); + if (!validate_NoCircularContainment(polyline, diagnostics, context)) + return false; + boolean result = validate_EveryMultiplicityConforms(polyline, + diagnostics, context); + if (result || diagnostics != null) + result &= validate_EveryDataValueConforms(polyline, diagnostics, + context); + if (result || diagnostics != null) + result &= validate_EveryReferenceIsContained(polyline, diagnostics, + context); + if (result || diagnostics != null) + result &= validate_EveryBidirectionalReferenceIsPaired(polyline, + diagnostics, context); + if (result || diagnostics != null) + result &= validate_EveryProxyResolves(polyline, diagnostics, + context); + if (result || diagnostics != null) + result &= validate_UniqueID(polyline, diagnostics, context); + if (result || diagnostics != null) + result &= validate_EveryKeyUnique(polyline, diagnostics, context); + if (result || diagnostics != null) + result &= validate_EveryMapEntryUnique(polyline, diagnostics, + context); + if (result || diagnostics != null) + result &= validateDefinition_idCannotBeEmpty(polyline, diagnostics, + context); + if (result || diagnostics != null) + result &= validateGraphicalElement_referencedClippathHasId( + polyline, diagnostics, context); + if (result || diagnostics != null) + result &= validateMarkedElement_referencedStartMarkerHasId( + polyline, diagnostics, context); + if (result || diagnostics != null) + result &= validateMarkedElement_referencedMidMarkerHasId(polyline, + diagnostics, context); + if (result || diagnostics != null) + result &= validateMarkedElement_referencedEndMarkerHasId(polyline, + diagnostics, context); + return result; } /** @@ -940,6 +1678,9 @@ public class DGValidator extends EObjectValidator { result &= validate_EveryMapEntryUnique(radialGradient, diagnostics, context); if (result || diagnostics != null) + result &= validateDefinition_idCannotBeEmpty(radialGradient, + diagnostics, context); + if (result || diagnostics != null) result &= validateRadialGradient_validCenterPoint(radialGradient, diagnostics, context); if (result || diagnostics != null) @@ -994,7 +1735,51 @@ public class DGValidator extends EObjectValidator { */ public boolean validateRectangle(Rectangle rectangle, DiagnosticChain diagnostics, Map<Object, Object> context) { - return validate_EveryDefaultConstraint(rectangle, diagnostics, context); + if (!validate_NoCircularContainment(rectangle, diagnostics, context)) + return false; + boolean result = validate_EveryMultiplicityConforms(rectangle, + diagnostics, context); + if (result || diagnostics != null) + result &= validate_EveryDataValueConforms(rectangle, diagnostics, + context); + if (result || diagnostics != null) + result &= validate_EveryReferenceIsContained(rectangle, + diagnostics, context); + if (result || diagnostics != null) + result &= validate_EveryBidirectionalReferenceIsPaired(rectangle, + diagnostics, context); + if (result || diagnostics != null) + result &= validate_EveryProxyResolves(rectangle, diagnostics, + context); + if (result || diagnostics != null) + result &= validate_UniqueID(rectangle, diagnostics, context); + if (result || diagnostics != null) + result &= validate_EveryKeyUnique(rectangle, diagnostics, context); + if (result || diagnostics != null) + result &= validate_EveryMapEntryUnique(rectangle, diagnostics, + context); + if (result || diagnostics != null) + result &= validateDefinition_idCannotBeEmpty(rectangle, + diagnostics, context); + if (result || diagnostics != null) + result &= validateGraphicalElement_referencedClippathHasId( + rectangle, diagnostics, context); + if (result || diagnostics != null) + result &= validateRectangle_nonNegativeCornerRadius(rectangle, + diagnostics, context); + return result; + } + + /** + * Validates the nonNegativeCornerRadius constraint of '<em>Rectangle</em>'. + * <!-- begin-user-doc --> <!-- end-user-doc --> + * + * @generated + */ + public boolean validateRectangle_nonNegativeCornerRadius( + Rectangle rectangle, DiagnosticChain diagnostics, + Map<Object, Object> context) { + return rectangle.nonNegativeCornerRadius(diagnostics, context); } /** @@ -1004,7 +1789,39 @@ public class DGValidator extends EObjectValidator { */ public boolean validateRootCanvas(RootCanvas rootCanvas, DiagnosticChain diagnostics, Map<Object, Object> context) { - return validate_EveryDefaultConstraint(rootCanvas, diagnostics, context); + if (!validate_NoCircularContainment(rootCanvas, diagnostics, context)) + return false; + boolean result = validate_EveryMultiplicityConforms(rootCanvas, + diagnostics, context); + if (result || diagnostics != null) + result &= validate_EveryDataValueConforms(rootCanvas, diagnostics, + context); + if (result || diagnostics != null) + result &= validate_EveryReferenceIsContained(rootCanvas, + diagnostics, context); + if (result || diagnostics != null) + result &= validate_EveryBidirectionalReferenceIsPaired(rootCanvas, + diagnostics, context); + if (result || diagnostics != null) + result &= validate_EveryProxyResolves(rootCanvas, diagnostics, + context); + if (result || diagnostics != null) + result &= validate_UniqueID(rootCanvas, diagnostics, context); + if (result || diagnostics != null) + result &= validate_EveryKeyUnique(rootCanvas, diagnostics, context); + if (result || diagnostics != null) + result &= validate_EveryMapEntryUnique(rootCanvas, diagnostics, + context); + if (result || diagnostics != null) + result &= validateDefinition_idCannotBeEmpty(rootCanvas, + diagnostics, context); + if (result || diagnostics != null) + result &= validateGraphicalElement_referencedClippathHasId( + rootCanvas, diagnostics, context); + if (result || diagnostics != null) + result &= validateCanvas_canvasCannotHaveTransforms(rootCanvas, + diagnostics, context); + return result; } /** @@ -1079,7 +1896,47 @@ public class DGValidator extends EObjectValidator { */ public boolean validateText(Text text, DiagnosticChain diagnostics, Map<Object, Object> context) { - return validate_EveryDefaultConstraint(text, diagnostics, context); + if (!validate_NoCircularContainment(text, diagnostics, context)) + return false; + boolean result = validate_EveryMultiplicityConforms(text, diagnostics, + context); + if (result || diagnostics != null) + result &= validate_EveryDataValueConforms(text, diagnostics, + context); + if (result || diagnostics != null) + result &= validate_EveryReferenceIsContained(text, diagnostics, + context); + if (result || diagnostics != null) + result &= validate_EveryBidirectionalReferenceIsPaired(text, + diagnostics, context); + if (result || diagnostics != null) + result &= validate_EveryProxyResolves(text, diagnostics, context); + if (result || diagnostics != null) + result &= validate_UniqueID(text, diagnostics, context); + if (result || diagnostics != null) + result &= validate_EveryKeyUnique(text, diagnostics, context); + if (result || diagnostics != null) + result &= validate_EveryMapEntryUnique(text, diagnostics, context); + if (result || diagnostics != null) + result &= validateDefinition_idCannotBeEmpty(text, diagnostics, + context); + if (result || diagnostics != null) + result &= validateGraphicalElement_referencedClippathHasId(text, + diagnostics, context); + if (result || diagnostics != null) + result &= validateText_dataCannotBeEmpty(text, diagnostics, context); + return result; + } + + /** + * Validates the dataCannotBeEmpty constraint of '<em>Text</em>'. <!-- + * begin-user-doc --> <!-- end-user-doc --> + * + * @generated + */ + public boolean validateText_dataCannotBeEmpty(Text text, + DiagnosticChain diagnostics, Map<Object, Object> context) { + return text.dataCannotBeEmpty(diagnostics, context); } /** @@ -1099,7 +1956,47 @@ public class DGValidator extends EObjectValidator { */ public boolean validateUse(Use use, DiagnosticChain diagnostics, Map<Object, Object> context) { - return validate_EveryDefaultConstraint(use, diagnostics, context); + if (!validate_NoCircularContainment(use, diagnostics, context)) + return false; + boolean result = validate_EveryMultiplicityConforms(use, diagnostics, + context); + if (result || diagnostics != null) + result &= validate_EveryDataValueConforms(use, diagnostics, context); + if (result || diagnostics != null) + result &= validate_EveryReferenceIsContained(use, diagnostics, + context); + if (result || diagnostics != null) + result &= validate_EveryBidirectionalReferenceIsPaired(use, + diagnostics, context); + if (result || diagnostics != null) + result &= validate_EveryProxyResolves(use, diagnostics, context); + if (result || diagnostics != null) + result &= validate_UniqueID(use, diagnostics, context); + if (result || diagnostics != null) + result &= validate_EveryKeyUnique(use, diagnostics, context); + if (result || diagnostics != null) + result &= validate_EveryMapEntryUnique(use, diagnostics, context); + if (result || diagnostics != null) + result &= validateDefinition_idCannotBeEmpty(use, diagnostics, + context); + if (result || diagnostics != null) + result &= validateGraphicalElement_referencedClippathHasId(use, + diagnostics, context); + if (result || diagnostics != null) + result &= validateUse_referencedElementHasId(use, diagnostics, + context); + return result; + } + + /** + * Validates the referencedElementHasId constraint of '<em>Use</em>'. <!-- + * begin-user-doc --> <!-- end-user-doc --> + * + * @generated + */ + public boolean validateUse_referencedElementHasId(Use use, + DiagnosticChain diagnostics, Map<Object, Object> context) { + return use.referencedElementHasId(diagnostics, context); } /** @@ -1113,6 +2010,16 @@ public class DGValidator extends EObjectValidator { } /** + * <!-- begin-user-doc --> <!-- end-user-doc --> + * + * @generated + */ + public boolean validateElementKind(ElementKind elementKind, + DiagnosticChain diagnostics, Map<Object, Object> context) { + return true; + } + + /** * Returns the resource locator that will be used to fetch messages for this * validator's diagnostics. <!-- begin-user-doc --> <!-- end-user-doc --> * |