summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMaged Elaasar2014-06-06 02:07:39 (EDT)
committerMaged Elaasar2014-06-06 02:07:39 (EDT)
commit76c1479d19637cc7c5b8446daa1ad871e4da70b1 (patch)
tree934fdd1c4e1dc468a6e629206b17acd385b3059e
parent2dcb96d07d6a74874478e73925a69f00dc6ec558 (diff)
downloadorg.eclipse.papyrus-76c1479d19637cc7c5b8446daa1ad871e4da70b1.zip
org.eclipse.papyrus-76c1479d19637cc7c5b8446daa1ad871e4da70b1.tar.gz
org.eclipse.papyrus-76c1479d19637cc7c5b8446daa1ad871e4da70b1.tar.bz2
Implementing most of DG to SVG mapping (minus layout)refs/changes/89/28089/1
Change-Id: Ia686f98a432fcd34e0f6987e5bec434effac6f6c Signed-off-by: Maged Elaasar <melaasar@gmail.com>
-rw-r--r--extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/icons/full/ctool16/CreateEllipticalArcTo_point_Point.gif (renamed from extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/icons/full/ctool16/CreateEllipticalCurveTo_point_Point.gif)bin223 -> 223 bytes
-rw-r--r--extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/icons/full/ctool16/CreateEllipticalArcTo_radii_Dimension.gif (renamed from extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/icons/full/ctool16/CreateEllipticalCurveTo_radii_Dimension.gif)bin223 -> 223 bytes
-rw-r--r--extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/icons/full/ctool16/CreatePath_command_EllipticalArcTo.gif (renamed from extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/icons/full/ctool16/CreatePath_command_EllipticalCurveTo.gif)bin223 -> 223 bytes
-rw-r--r--extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/icons/full/obj16/EllipticalArcTo.gifbin0 -> 129 bytes
-rw-r--r--extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/icons/full/obj16/EllipticalCurveTo.gifbin129 -> 0 bytes
-rw-r--r--extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/plugin.properties22
-rw-r--r--extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/src/org/eclipse/papyrus/dd/dc/provider/BoundsItemProvider.java134
-rw-r--r--extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/src/org/eclipse/papyrus/dd/dc/provider/DCItemProviderAdapterFactory.java68
-rw-r--r--extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/src/org/eclipse/papyrus/dd/dc/provider/DimensionItemProvider.java77
-rw-r--r--extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/src/org/eclipse/papyrus/dd/dc/provider/PointItemProvider.java85
-rw-r--r--extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/src/org/eclipse/papyrus/dd/dg/provider/CanvasItemProvider.java64
-rw-r--r--extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/src/org/eclipse/papyrus/dd/dg/provider/CircleItemProvider.java88
-rw-r--r--extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/src/org/eclipse/papyrus/dd/dg/provider/ClipPathItemProvider.java30
-rw-r--r--extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/src/org/eclipse/papyrus/dd/dg/provider/ClosePathItemProvider.java25
-rw-r--r--extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/src/org/eclipse/papyrus/dd/dg/provider/CubicCurveToItemProvider.java90
-rw-r--r--extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/src/org/eclipse/papyrus/dd/dg/provider/DGItemProviderAdapterFactory.java367
-rw-r--r--extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/src/org/eclipse/papyrus/dd/dg/provider/DefinitionItemProvider.java56
-rw-r--r--extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/src/org/eclipse/papyrus/dd/dg/provider/DefinitionsItemProvider.java212
-rw-r--r--extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/src/org/eclipse/papyrus/dd/dg/provider/EllipseItemProvider.java68
-rw-r--r--extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/src/org/eclipse/papyrus/dd/dg/provider/EllipticalArcToItemProvider.java (renamed from extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/src/org/eclipse/papyrus/dd/dg/provider/EllipticalCurveToItemProvider.java)161
-rw-r--r--extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/src/org/eclipse/papyrus/dd/dg/provider/GradientItemProvider.java56
-rw-r--r--extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/src/org/eclipse/papyrus/dd/dg/provider/GradientStopItemProvider.java106
-rw-r--r--extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/src/org/eclipse/papyrus/dd/dg/provider/GraphicalElementItemProvider.java156
-rw-r--r--extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/src/org/eclipse/papyrus/dd/dg/provider/GroupItemProvider.java185
-rw-r--r--extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/src/org/eclipse/papyrus/dd/dg/provider/ImageItemProvider.java119
-rw-r--r--extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/src/org/eclipse/papyrus/dd/dg/provider/LineItemProvider.java79
-rw-r--r--extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/src/org/eclipse/papyrus/dd/dg/provider/LineToItemProvider.java54
-rw-r--r--extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/src/org/eclipse/papyrus/dd/dg/provider/LinearGradientItemProvider.java84
-rw-r--r--extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/src/org/eclipse/papyrus/dd/dg/provider/MarkedElementItemProvider.java92
-rw-r--r--extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/src/org/eclipse/papyrus/dd/dg/provider/MarkerItemProvider.java68
-rw-r--r--extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/src/org/eclipse/papyrus/dd/dg/provider/MatrixItemProvider.java198
-rw-r--r--extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/src/org/eclipse/papyrus/dd/dg/provider/MoveToItemProvider.java54
-rw-r--r--extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/src/org/eclipse/papyrus/dd/dg/provider/PaintItemProvider.java81
-rw-r--r--extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/src/org/eclipse/papyrus/dd/dg/provider/PaintServerItemProvider.java88
-rw-r--r--extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/src/org/eclipse/papyrus/dd/dg/provider/PathCommandItemProvider.java51
-rw-r--r--extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/src/org/eclipse/papyrus/dd/dg/provider/PathItemProvider.java104
-rw-r--r--extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/src/org/eclipse/papyrus/dd/dg/provider/PatternItemProvider.java196
-rw-r--r--extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/src/org/eclipse/papyrus/dd/dg/provider/PolygonItemProvider.java59
-rw-r--r--extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/src/org/eclipse/papyrus/dd/dg/provider/PolylineItemProvider.java59
-rw-r--r--extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/src/org/eclipse/papyrus/dd/dg/provider/QuadraticCurveToItemProvider.java75
-rw-r--r--extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/src/org/eclipse/papyrus/dd/dg/provider/RadialGradientItemProvider.java111
-rw-r--r--extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/src/org/eclipse/papyrus/dd/dg/provider/RectangleItemProvider.java89
-rw-r--r--extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/src/org/eclipse/papyrus/dd/dg/provider/RootCanvasItemProvider.java117
-rw-r--r--extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/src/org/eclipse/papyrus/dd/dg/provider/RotateItemProvider.java83
-rw-r--r--extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/src/org/eclipse/papyrus/dd/dg/provider/ScaleItemProvider.java78
-rw-r--r--extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/src/org/eclipse/papyrus/dd/dg/provider/SkewItemProvider.java78
-rw-r--r--extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/src/org/eclipse/papyrus/dd/dg/provider/StyleItemProvider.java351
-rw-r--r--extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/src/org/eclipse/papyrus/dd/dg/provider/StyleRuleItemProvider.java61
-rw-r--r--extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/src/org/eclipse/papyrus/dd/dg/provider/StyleSelectorItemProvider.java94
-rw-r--r--extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/src/org/eclipse/papyrus/dd/dg/provider/StyleSheetItemProvider.java48
-rw-r--r--extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/src/org/eclipse/papyrus/dd/dg/provider/TextItemProvider.java92
-rw-r--r--extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/src/org/eclipse/papyrus/dd/dg/provider/TransformItemProvider.java16
-rw-r--r--extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/src/org/eclipse/papyrus/dd/dg/provider/TranslateItemProvider.java78
-rw-r--r--extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/src/org/eclipse/papyrus/dd/dg/provider/UseItemProvider.java81
-rw-r--r--extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/src/org/eclipse/papyrus/dd/di/provider/DIItemProviderAdapterFactory.java42
-rw-r--r--extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/src/org/eclipse/papyrus/dd/di/provider/DiagramElementItemProvider.java133
-rw-r--r--extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/src/org/eclipse/papyrus/dd/di/provider/DiagramItemProvider.java107
-rw-r--r--extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/src/org/eclipse/papyrus/dd/di/provider/EdgeItemProvider.java89
-rw-r--r--extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/src/org/eclipse/papyrus/dd/di/provider/ShapeItemProvider.java45
-rw-r--r--extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/src/org/eclipse/papyrus/dd/di/provider/StyleItemProvider.java16
-rw-r--r--extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/src/org/eclipse/papyrus/dd/edit/DDEditPlugin.java16
-rw-r--r--extraplugins/diagram-definition/org.eclipse.papyrus.dd.editor/.classpath8
-rw-r--r--extraplugins/diagram-definition/org.eclipse.papyrus.dd.editor/src/org/eclipse/papyrus/dd/dg/editor/DGSVGCanvasPage.java3
-rw-r--r--extraplugins/diagram-definition/org.eclipse.papyrus.dd.editor/src/org/eclipse/papyrus/dd/dg/editor/DGSVGSourcePage.java26
-rw-r--r--extraplugins/diagram-definition/org.eclipse.papyrus.dd.editor/src/org/eclipse/papyrus/dd/dg/editor/DGToSVGConverter.java547
-rw-r--r--extraplugins/diagram-definition/org.eclipse.papyrus.dd/model/DC.cmof124
-rw-r--r--extraplugins/diagram-definition/org.eclipse.papyrus.dd/model/DC.ecore100
-rw-r--r--extraplugins/diagram-definition/org.eclipse.papyrus.dd/model/DC.genmodel25
-rw-r--r--extraplugins/diagram-definition/org.eclipse.papyrus.dd/model/DG.cmof254
-rw-r--r--extraplugins/diagram-definition/org.eclipse.papyrus.dd/model/DG.ecore326
-rw-r--r--extraplugins/diagram-definition/org.eclipse.papyrus.dd/model/DG.genmodel99
-rw-r--r--extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dc/AlignmentKind.java236
-rw-r--r--extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dc/Bounds.java128
-rw-r--r--extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dc/DCPackage.java156
-rw-r--r--extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dc/Dimension.java78
-rw-r--r--extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dc/Point.java52
-rw-r--r--extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dc/impl/BoundsImpl.java244
-rw-r--r--extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dc/impl/DCFactoryImpl.java29
-rw-r--r--extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dc/impl/DCPackageImpl.java136
-rw-r--r--extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dc/impl/DimensionImpl.java153
-rw-r--r--extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dc/impl/PointImpl.java92
-rw-r--r--extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dc/util/DCAdapterFactory.java1
-rw-r--r--extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dc/util/DCValidator.java77
-rw-r--r--extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/Canvas.java19
-rw-r--r--extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/Circle.java14
-rw-r--r--extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/CubicCurveTo.java2
-rw-r--r--extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/DGFactory.java6
-rw-r--r--extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/DGPackage.java1292
-rw-r--r--extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/Definition.java19
-rw-r--r--extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/Definitions.java4
-rw-r--r--extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/ElementKind.java542
-rw-r--r--extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/EllipticalArcTo.java (renamed from extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/EllipticalCurveTo.java)96
-rw-r--r--extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/Gradient.java4
-rw-r--r--extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/GradientStop.java107
-rw-r--r--extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/GraphicalElement.java41
-rw-r--r--extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/Group.java4
-rw-r--r--extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/Image.java17
-rw-r--r--extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/MarkedElement.java48
-rw-r--r--extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/Paint.java17
-rw-r--r--extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/PaintServer.java4
-rw-r--r--extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/Path.java23
-rw-r--r--extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/Polygon.java4
-rw-r--r--extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/Polyline.java4
-rw-r--r--extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/QuadraticCurveTo.java4
-rw-r--r--extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/Rectangle.java53
-rw-r--r--extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/RootCanvas.java14
-rw-r--r--extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/Style.java24
-rw-r--r--extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/StyleRule.java6
-rw-r--r--extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/StyleSelector.java83
-rw-r--r--extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/StyleSheet.java4
-rw-r--r--extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/Text.java17
-rw-r--r--extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/Use.java48
-rw-r--r--extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/impl/CanvasImpl.java57
-rw-r--r--extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/impl/CubicCurveToImpl.java48
-rw-r--r--extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/impl/DGFactoryImpl.java39
-rw-r--r--extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/impl/DGPackageImpl.java588
-rw-r--r--extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/impl/DefinitionImpl.java56
-rw-r--r--extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/impl/DefinitionsImpl.java28
-rw-r--r--extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/impl/EllipticalArcToImpl.java (renamed from extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/impl/EllipticalCurveToImpl.java)231
-rw-r--r--extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/impl/GradientImpl.java30
-rw-r--r--extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/impl/GradientStopImpl.java147
-rw-r--r--extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/impl/GraphicalElementImpl.java137
-rw-r--r--extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/impl/GroupImpl.java31
-rw-r--r--extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/impl/ImageImpl.java56
-rw-r--r--extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/impl/MarkedElementImpl.java132
-rw-r--r--extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/impl/PaintImpl.java57
-rw-r--r--extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/impl/PaintServerImpl.java30
-rw-r--r--extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/impl/PathImpl.java85
-rw-r--r--extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/impl/PolygonImpl.java28
-rw-r--r--extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/impl/PolylineImpl.java28
-rw-r--r--extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/impl/QuadraticCurveToImpl.java44
-rw-r--r--extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/impl/RectangleImpl.java103
-rw-r--r--extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/impl/RootCanvasImpl.java45
-rw-r--r--extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/impl/StyleImpl.java40
-rw-r--r--extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/impl/StyleRuleImpl.java30
-rw-r--r--extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/impl/StyleSelectorImpl.java147
-rw-r--r--extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/impl/StyleSheetImpl.java28
-rw-r--r--extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/impl/TextImpl.java56
-rw-r--r--extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/impl/UseImpl.java124
-rw-r--r--extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/util/DGAdapterFactory.java12
-rw-r--r--extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/util/DGSwitch.java18
-rw-r--r--extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/util/DGValidator.java995
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
index ed16f99..52cb135 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
Binary files differ
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
index a1607f9..01f8ed6 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
Binary files differ
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
index babb084..ce3b99f 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
Binary files differ
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
new file mode 100644
index 0000000..45731fe
--- /dev/null
+++ b/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/icons/full/obj16/EllipticalArcTo.gif
Binary files differ
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
deleted file mode 100644
index cdd3b76..0000000
--- a/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/icons/full/obj16/EllipticalCurveTo.gif
+++ /dev/null
Binary files differ
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 5e269cc..386355b 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 b57f150..c318b54 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 50af3de..8de50b3 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 6e87396..cee9cbc 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 30abcaf..dd0da37 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 1d72e79..3d5b314 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 f32a3af..6299674 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 308996c..f8f0e6f 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 a4b2a75..9dff16f 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 2ccd500..aeb1f0c 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 b0f6ee0..e09cde6 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 7430e99..d334d2f 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 9fa8e0e..b2c0a42 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 01fd974..5f1fe66 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 03c2210..d5ccf84 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 4c0694b..07eaa39 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 a4b7356..9f27752 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 6654a15..78e4210 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 8a6f5a1..8e0da31 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 c03c1c7..833458f 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 78793b1..1c5325c 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 c2d6566..8cb70eb 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 50ef812..28a5b7b 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 96f7c49..87d0edd 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 66bbbc2..8fb604f 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 271aedf..b12c130 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 91c112f..6987e9f 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 d3fbcf9..81fbd4c 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 7cec9e5..ebaded5 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 0c3773c..10955bc 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 1964dc9..01d4e89 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 e4aec7b..0aa9e09 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 86fa760..1d9e77c 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 25c6b57..f15043a 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 cccbbbe..b53005c 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 9079431..8eccf4c 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 188335d..7cd140a 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 df83bb6..08588dd 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 afb79f4..db397dd 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 5609693..1133c16 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 c1ca826..968c5e9 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 c63a376..49212e8 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 4c0f042..5cd45d1 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 976d223..d0adecd 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 83e57b3..de184c6 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 058976c..99c7b0e 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 eb885ba..7fba8fc 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 efea666..f1b500a 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 8682075..9a6c2c9 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 d16e6e3..f3bad6a 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 848ba49..b0e4588 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 b93e1db..c01f70b 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 f56e947..28ffe59 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 0a0e536..ca1ee4f 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 56bc0c7..72b98c6 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 c6a074e..ca8f65e 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 9481d15..75cac54 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 36c0486..3250c01 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 af901db..71b381c 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 b8cb689..e5801cb 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 8fd27a4..1d3674c 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 (&lt;= 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 (&lt;= 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 &lt;=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 &lt;=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 5193a7d..f3c6b0b 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 (&lt;= 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 (&lt;= 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 &lt;=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 &lt;=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 e8fe0ff..32a09b0 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 192a154..9843434 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&lt;=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&lt;=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 c07d387..c509a72 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.&#xA;Definitions nests definitions that are commonly referenced in the containing canvas. It can also nest an embedded stylesheet.&#xA;EllipticalArcTo is a kind of path command that draws an elliptical arc from the current point to a new point in the coordinate system.&#xA;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.&#xA;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&lt;=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 e39f6d7..666d22f 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 36d46eb..0000000
--- 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 5b94cf5..b6ec9d4 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 57e90b1..82e1241 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 551ec51..823ad0d 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 6b5abb8..9fe5728 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 28a416b..67e646e 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 ce9fbc3..6ff0634 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 019c95a..e57dfb2 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);
+ createEOperat