Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFlorian Noyrit2014-09-16 13:22:24 +0000
committerflorian noyrit2014-09-16 13:53:19 +0000
commit0bff0cabe4f177bc960b9712179d6ec23115372f (patch)
tree7cf9ff848bba1c0db3709a2344f46daf5ac3fa52
parent78cba1539ee0cd37e6da28c33b6a7196e91af23d (diff)
downloadorg.eclipse.papyrus-0bff0cabe4f177bc960b9712179d6ec23115372f.tar.gz
org.eclipse.papyrus-0bff0cabe4f177bc960b9712179d6ec23115372f.tar.xz
org.eclipse.papyrus-0bff0cabe4f177bc960b9712179d6ec23115372f.zip
Updated Diagram-Defintion
Change-Id: I4ad2f54a63e70a05a90646c92e49c0f66923770f Signed-off-by: Florian Noyrit <florian.noyrit@cea.fr>
-rw-r--r--extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/.settings/org.eclipse.jdt.core.prefs288
-rw-r--r--extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/.settings/org.eclipse.jdt.ui.prefs3
-rw-r--r--extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/META-INF/MANIFEST.MF46
-rw-r--r--extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/icons/full/ctool16/CreateDefinitions_definition_Canvas.gif (renamed from extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/icons/full/ctool16/CreateDefinitions_defnition_Canvas.gif)bin223 -> 223 bytes
-rw-r--r--extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/icons/full/ctool16/CreateDefinitions_definition_Circle.gif (renamed from extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/icons/full/ctool16/CreateDefinitions_defnition_Circle.gif)bin223 -> 223 bytes
-rw-r--r--extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/icons/full/ctool16/CreateDefinitions_definition_ClipPath.gif (renamed from extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/icons/full/ctool16/CreateDefinitions_defnition_ClipPath.gif)bin223 -> 223 bytes
-rw-r--r--extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/icons/full/ctool16/CreateDefinitions_definition_Ellipse.gif (renamed from extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/icons/full/ctool16/CreateDefinitions_defnition_Ellipse.gif)bin223 -> 223 bytes
-rw-r--r--extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/icons/full/ctool16/CreateDefinitions_definition_Group.gif (renamed from extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/icons/full/ctool16/CreateDefinitions_defnition_Group.gif)bin223 -> 223 bytes
-rw-r--r--extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/icons/full/ctool16/CreateDefinitions_definition_Image.gif (renamed from extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/icons/full/ctool16/CreateDefinitions_defnition_Image.gif)bin223 -> 223 bytes
-rw-r--r--extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/icons/full/ctool16/CreateDefinitions_definition_Line.gif (renamed from extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/icons/full/ctool16/CreateDefinitions_defnition_Line.gif)bin223 -> 223 bytes
-rw-r--r--extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/icons/full/ctool16/CreateDefinitions_definition_LinearGradient.gif (renamed from extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/icons/full/ctool16/CreateDefinitions_defnition_LinearGradient.gif)bin223 -> 223 bytes
-rw-r--r--extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/icons/full/ctool16/CreateDefinitions_definition_Marker.gif (renamed from extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/icons/full/ctool16/CreateDefinitions_defnition_Marker.gif)bin223 -> 223 bytes
-rw-r--r--extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/icons/full/ctool16/CreateDefinitions_definition_Path.gif (renamed from extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/icons/full/ctool16/CreateDefinitions_defnition_Path.gif)bin223 -> 223 bytes
-rw-r--r--extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/icons/full/ctool16/CreateDefinitions_definition_Pattern.gif (renamed from extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/icons/full/ctool16/CreateDefinitions_defnition_Pattern.gif)bin223 -> 223 bytes
-rw-r--r--extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/icons/full/ctool16/CreateDefinitions_definition_Polygon.gif (renamed from extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/icons/full/ctool16/CreateDefinitions_defnition_Polygon.gif)bin223 -> 223 bytes
-rw-r--r--extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/icons/full/ctool16/CreateDefinitions_definition_Polyline.gif (renamed from extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/icons/full/ctool16/CreateDefinitions_defnition_Polyline.gif)bin223 -> 223 bytes
-rw-r--r--extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/icons/full/ctool16/CreateDefinitions_definition_RadialGradient.gif (renamed from extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/icons/full/ctool16/CreateDefinitions_defnition_RadialGradient.gif)bin223 -> 223 bytes
-rw-r--r--extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/icons/full/ctool16/CreateDefinitions_definition_Rectangle.gif (renamed from extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/icons/full/ctool16/CreateDefinitions_defnition_Rectangle.gif)bin223 -> 223 bytes
-rw-r--r--extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/icons/full/ctool16/CreateDefinitions_definition_RootCanvas.gif (renamed from extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/icons/full/ctool16/CreateDefinitions_defnition_RootCanvas.gif)bin223 -> 223 bytes
-rw-r--r--extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/icons/full/ctool16/CreateDefinitions_definition_Text.gif (renamed from extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/icons/full/ctool16/CreateDefinitions_defnition_Text.gif)bin223 -> 223 bytes
-rw-r--r--extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/icons/full/ctool16/CreateDefinitions_definition_Use.gif (renamed from extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/icons/full/ctool16/CreateDefinitions_defnition_Use.gif)bin223 -> 223 bytes
-rw-r--r--extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/icons/full/ctool16/CreateText_bounds_Bounds.gifbin0 -> 223 bytes
-rw-r--r--extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/icons/full/ctool16/CreateText_position_Point.gifbin223 -> 0 bytes
-rw-r--r--extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/plugin.properties2
-rw-r--r--extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/src/org/eclipse/papyrus/dd/dc/provider/BoundsItemProvider.java22
-rw-r--r--extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/src/org/eclipse/papyrus/dd/dc/provider/DCItemProviderAdapterFactory.java20
-rw-r--r--extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/src/org/eclipse/papyrus/dd/dc/provider/DimensionItemProvider.java16
-rw-r--r--extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/src/org/eclipse/papyrus/dd/dc/provider/PointItemProvider.java16
-rw-r--r--extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/src/org/eclipse/papyrus/dd/dg/provider/CanvasItemProvider.java12
-rw-r--r--extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/src/org/eclipse/papyrus/dd/dg/provider/CircleItemProvider.java18
-rw-r--r--extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/src/org/eclipse/papyrus/dd/dg/provider/ClipPathItemProvider.java6
-rw-r--r--extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/src/org/eclipse/papyrus/dd/dg/provider/ClosePathItemProvider.java6
-rw-r--r--extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/src/org/eclipse/papyrus/dd/dg/provider/CubicCurveToItemProvider.java19
-rw-r--r--extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/src/org/eclipse/papyrus/dd/dg/provider/DGItemProviderAdapterFactory.java152
-rw-r--r--extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/src/org/eclipse/papyrus/dd/dg/provider/DefinitionItemProvider.java13
-rw-r--r--extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/src/org/eclipse/papyrus/dd/dg/provider/DefinitionsItemProvider.java54
-rw-r--r--extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/src/org/eclipse/papyrus/dd/dg/provider/EllipseItemProvider.java15
-rw-r--r--extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/src/org/eclipse/papyrus/dd/dg/provider/EllipticalArcToItemProvider.java25
-rw-r--r--extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/src/org/eclipse/papyrus/dd/dg/provider/GradientItemProvider.java12
-rw-r--r--extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/src/org/eclipse/papyrus/dd/dg/provider/GradientStopItemProvider.java20
-rw-r--r--extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/src/org/eclipse/papyrus/dd/dg/provider/GraphicalElementItemProvider.java31
-rw-r--r--extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/src/org/eclipse/papyrus/dd/dg/provider/GroupItemProvider.java17
-rw-r--r--extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/src/org/eclipse/papyrus/dd/dg/provider/ImageItemProvider.java21
-rw-r--r--extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/src/org/eclipse/papyrus/dd/dg/provider/LineItemProvider.java19
-rw-r--r--extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/src/org/eclipse/papyrus/dd/dg/provider/LineToItemProvider.java15
-rw-r--r--extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/src/org/eclipse/papyrus/dd/dg/provider/LinearGradientItemProvider.java16
-rw-r--r--extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/src/org/eclipse/papyrus/dd/dg/provider/MarkedElementItemProvider.java15
-rw-r--r--extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/src/org/eclipse/papyrus/dd/dg/provider/MarkerItemProvider.java15
-rw-r--r--extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/src/org/eclipse/papyrus/dd/dg/provider/MatrixItemProvider.java26
-rw-r--r--extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/src/org/eclipse/papyrus/dd/dg/provider/MoveToItemProvider.java15
-rw-r--r--extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/src/org/eclipse/papyrus/dd/dg/provider/PaintItemProvider.java17
-rw-r--r--extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/src/org/eclipse/papyrus/dd/dg/provider/PaintServerItemProvider.java14
-rw-r--r--extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/src/org/eclipse/papyrus/dd/dg/provider/PathCommandItemProvider.java13
-rw-r--r--extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/src/org/eclipse/papyrus/dd/dg/provider/PathItemProvider.java14
-rw-r--r--extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/src/org/eclipse/papyrus/dd/dg/provider/PatternItemProvider.java15
-rw-r--r--extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/src/org/eclipse/papyrus/dd/dg/provider/PolygonItemProvider.java15
-rw-r--r--extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/src/org/eclipse/papyrus/dd/dg/provider/PolylineItemProvider.java15
-rw-r--r--extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/src/org/eclipse/papyrus/dd/dg/provider/QuadraticCurveToItemProvider.java19
-rw-r--r--extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/src/org/eclipse/papyrus/dd/dg/provider/RadialGradientItemProvider.java20
-rw-r--r--extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/src/org/eclipse/papyrus/dd/dg/provider/RectangleItemProvider.java18
-rw-r--r--extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/src/org/eclipse/papyrus/dd/dg/provider/RootCanvasItemProvider.java23
-rw-r--r--extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/src/org/eclipse/papyrus/dd/dg/provider/RotateItemProvider.java18
-rw-r--r--extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/src/org/eclipse/papyrus/dd/dg/provider/ScaleItemProvider.java14
-rw-r--r--extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/src/org/eclipse/papyrus/dd/dg/provider/SkewItemProvider.java14
-rw-r--r--extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/src/org/eclipse/papyrus/dd/dg/provider/StyleItemProvider.java53
-rw-r--r--extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/src/org/eclipse/papyrus/dd/dg/provider/StyleRuleItemProvider.java14
-rw-r--r--extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/src/org/eclipse/papyrus/dd/dg/provider/StyleSelectorItemProvider.java16
-rw-r--r--extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/src/org/eclipse/papyrus/dd/dg/provider/StyleSheetItemProvider.java14
-rw-r--r--extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/src/org/eclipse/papyrus/dd/dg/provider/TextItemProvider.java27
-rw-r--r--extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/src/org/eclipse/papyrus/dd/dg/provider/TransformItemProvider.java5
-rw-r--r--extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/src/org/eclipse/papyrus/dd/dg/provider/TranslateItemProvider.java14
-rw-r--r--extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/src/org/eclipse/papyrus/dd/dg/provider/UseItemProvider.java18
-rw-r--r--extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/src/org/eclipse/papyrus/dd/di/provider/DIItemProviderAdapterFactory.java8
-rw-r--r--extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/src/org/eclipse/papyrus/dd/di/provider/DiagramElementItemProvider.java3
-rw-r--r--extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/src/org/eclipse/papyrus/dd/di/provider/DiagramItemProvider.java17
-rw-r--r--extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/src/org/eclipse/papyrus/dd/di/provider/EdgeItemProvider.java10
-rw-r--r--extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/src/org/eclipse/papyrus/dd/di/provider/ShapeItemProvider.java13
-rw-r--r--extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/src/org/eclipse/papyrus/dd/di/provider/StyleItemProvider.java5
-rw-r--r--extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/src/org/eclipse/papyrus/dd/edit/DDEditPlugin.java3
-rw-r--r--extraplugins/diagram-definition/org.eclipse.papyrus.dd.editor/META-INF/MANIFEST.MF108
-rw-r--r--extraplugins/diagram-definition/org.eclipse.papyrus.dd.editor/scripts/Layout.js156
-rw-r--r--extraplugins/diagram-definition/org.eclipse.papyrus.dd.editor/src/org/eclipse/papyrus/dd/dg/editor/DGModelWizard.java65
-rw-r--r--extraplugins/diagram-definition/org.eclipse.papyrus.dd.editor/src/org/eclipse/papyrus/dd/dg/editor/DGToSVGConverter.java33
-rw-r--r--extraplugins/diagram-definition/org.eclipse.papyrus.dd.examples/.project11
-rw-r--r--extraplugins/diagram-definition/org.eclipse.papyrus.dd.examples/Basic Shapes.dg134
-rw-r--r--extraplugins/diagram-definition/org.eclipse.papyrus.dd.examples/Group Shapes.dg162
-rw-r--r--extraplugins/diagram-definition/org.eclipse.papyrus.dd.examples/Markers.dg137
-rw-r--r--extraplugins/diagram-definition/org.eclipse.papyrus.dd.examples/Paints.dg55
-rw-r--r--extraplugins/diagram-definition/org.eclipse.papyrus.dd.examples/Tiger.jpgbin0 -> 73948 bytes
-rw-r--r--extraplugins/diagram-definition/org.eclipse.papyrus.dd.qvt/.classpath (renamed from extraplugins/diagram-definition/org.eclipse.papyrus.umldi2dg/.classpath)2
-rw-r--r--extraplugins/diagram-definition/org.eclipse.papyrus.dd.qvt/.project28
-rw-r--r--extraplugins/diagram-definition/org.eclipse.papyrus.dd.qvt/.settings/org.eclipse.jdt.core.prefs7
-rw-r--r--extraplugins/diagram-definition/org.eclipse.papyrus.dd.qvt/META-INF/MANIFEST.MF9
-rw-r--r--extraplugins/diagram-definition/org.eclipse.papyrus.dd.qvt/build.properties17
-rw-r--r--extraplugins/diagram-definition/org.eclipse.papyrus.dd.qvt/plugin.properties13
-rw-r--r--extraplugins/diagram-definition/org.eclipse.papyrus.dd.qvt/plugin.xml (renamed from extraplugins/diagram-definition/org.eclipse.papyrus.umldi2dg/plugin.xml)4
-rw-r--r--extraplugins/diagram-definition/org.eclipse.papyrus.dd.qvt/src/org/eclipse/papyrus/dd/qvt/UtilitiesLibrary.java (renamed from extraplugins/diagram-definition/org.eclipse.papyrus.umldi2dg/src/org/eclipse/papyrus/umldi2dg/UtilitiesLibrary.java)6
-rw-r--r--extraplugins/diagram-definition/org.eclipse.papyrus.dd/.settings/org.eclipse.jdt.core.prefs294
-rw-r--r--extraplugins/diagram-definition/org.eclipse.papyrus.dd/.settings/org.eclipse.jdt.ui.prefs3
-rw-r--r--extraplugins/diagram-definition/org.eclipse.papyrus.dd/META-INF/MANIFEST.MF49
-rw-r--r--extraplugins/diagram-definition/org.eclipse.papyrus.dd/model/DG.ecore6
-rw-r--r--extraplugins/diagram-definition/org.eclipse.papyrus.dd/model/DG.genmodel4
-rw-r--r--extraplugins/diagram-definition/org.eclipse.papyrus.dd/model/DG.uml756
-rw-r--r--extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dc/Bounds.java21
-rw-r--r--extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dc/DCPackage.java12
-rw-r--r--extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dc/Dimension.java17
-rw-r--r--extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dc/KnownColor.java12
-rw-r--r--extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dc/Point.java4
-rw-r--r--extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dc/impl/BoundsImpl.java60
-rw-r--r--extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dc/impl/DCFactoryImpl.java38
-rw-r--r--extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dc/impl/DCPackageImpl.java45
-rw-r--r--extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dc/impl/DimensionImpl.java44
-rw-r--r--extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dc/impl/PointImpl.java29
-rw-r--r--extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dc/util/DCAdapterFactory.java20
-rw-r--r--extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dc/util/DCSwitch.java40
-rw-r--r--extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dc/util/DCValidator.java73
-rw-r--r--extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/Canvas.java9
-rw-r--r--extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/Circle.java11
-rw-r--r--extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/CubicCurveTo.java6
-rw-r--r--extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/DGPackage.java130
-rw-r--r--extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/Definition.java9
-rw-r--r--extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/Definitions.java23
-rw-r--r--extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/ElementKind.java12
-rw-r--r--extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/Ellipse.java4
-rw-r--r--extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/EllipticalArcTo.java10
-rw-r--r--extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/FontDecoration.java12
-rw-r--r--extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/GradientStop.java20
-rw-r--r--extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/GraphicalElement.java15
-rw-r--r--extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/Group.java2
-rw-r--r--extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/Image.java13
-rw-r--r--extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/Line.java4
-rw-r--r--extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/LineTo.java2
-rw-r--r--extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/LinearGradient.java10
-rw-r--r--extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/MarkedElement.java25
-rw-r--r--extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/Marker.java4
-rw-r--r--extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/Matrix.java12
-rw-r--r--extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/MoveTo.java2
-rw-r--r--extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/Paint.java12
-rw-r--r--extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/Path.java7
-rw-r--r--extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/PathCommand.java2
-rw-r--r--extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/Pattern.java4
-rw-r--r--extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/Polygon.java1
-rw-r--r--extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/Polyline.java1
-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/RadialGradient.java24
-rw-r--r--extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/Rectangle.java11
-rw-r--r--extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/RootCanvas.java4
-rw-r--r--extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/Rotate.java4
-rw-r--r--extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/Scale.java10
-rw-r--r--extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/Skew.java4
-rw-r--r--extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/Style.java51
-rw-r--r--extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/StyleRule.java3
-rw-r--r--extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/StyleSelector.java2
-rw-r--r--extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/StyleSheet.java1
-rw-r--r--extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/Text.java45
-rw-r--r--extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/TextAnchor.java14
-rw-r--r--extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/Translate.java4
-rw-r--r--extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/Use.java11
-rw-r--r--extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/impl/CanvasImpl.java44
-rw-r--r--extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/impl/CircleImpl.java52
-rw-r--r--extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/impl/ClipPathImpl.java1
-rw-r--r--extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/impl/ClosePathImpl.java1
-rw-r--r--extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/impl/CubicCurveToImpl.java80
-rw-r--r--extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/impl/DGFactoryImpl.java63
-rw-r--r--extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/impl/DGPackageImpl.java314
-rw-r--r--extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/impl/DefinitionImpl.java25
-rw-r--r--extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/impl/DefinitionsImpl.java81
-rw-r--r--extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/impl/EllipseImpl.java58
-rw-r--r--extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/impl/EllipticalArcToImpl.java72
-rw-r--r--extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/impl/GradientImpl.java17
-rw-r--r--extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/impl/GradientStopImpl.java53
-rw-r--r--extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/impl/GraphicalElementImpl.java106
-rw-r--r--extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/impl/GroupImpl.java30
-rw-r--r--extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/impl/ImageImpl.java54
-rw-r--r--extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/impl/LineImpl.java58
-rw-r--r--extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/impl/LineToImpl.java36
-rw-r--r--extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/impl/LinearGradientImpl.java67
-rw-r--r--extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/impl/MarkedElementImpl.java83
-rw-r--r--extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/impl/MarkerImpl.java58
-rw-r--r--extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/impl/MatrixImpl.java37
-rw-r--r--extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/impl/MoveToImpl.java36
-rw-r--r--extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/impl/PaintImpl.java44
-rw-r--r--extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/impl/PaintServerImpl.java20
-rw-r--r--extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/impl/PathCommandImpl.java17
-rw-r--r--extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/impl/PathImpl.java29
-rw-r--r--extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/impl/PatternImpl.java58
-rw-r--r--extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/impl/PolygonImpl.java21
-rw-r--r--extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/impl/PolylineImpl.java21
-rw-r--r--extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/impl/QuadraticCurveToImpl.java58
-rw-r--r--extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/impl/RadialGradientImpl.java83
-rw-r--r--extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/impl/RectangleImpl.java54
-rw-r--r--extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/impl/RootCanvasImpl.java56
-rw-r--r--extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/impl/RotateImpl.java42
-rw-r--r--extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/impl/ScaleImpl.java31
-rw-r--r--extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/impl/SkewImpl.java21
-rw-r--r--extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/impl/StyleImpl.java184
-rw-r--r--extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/impl/StyleRuleImpl.java43
-rw-r--r--extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/impl/StyleSelectorImpl.java23
-rw-r--r--extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/impl/StyleSheetImpl.java21
-rw-r--r--extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/impl/TextImpl.java106
-rw-r--r--extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/impl/TransformImpl.java2
-rw-r--r--extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/impl/TranslateImpl.java21
-rw-r--r--extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/impl/UseImpl.java62
-rw-r--r--extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/util/DGAdapterFactory.java60
-rw-r--r--extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/util/DGSwitch.java568
-rw-r--r--extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/util/DGValidator.java732
-rw-r--r--extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/di/Diagram.java6
-rw-r--r--extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/di/DiagramElement.java4
-rw-r--r--extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/di/Edge.java1
-rw-r--r--extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/di/Shape.java2
-rw-r--r--extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/di/impl/DIFactoryImpl.java14
-rw-r--r--extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/di/impl/DIPackageImpl.java92
-rw-r--r--extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/di/impl/DiagramElementImpl.java16
-rw-r--r--extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/di/impl/DiagramImpl.java25
-rw-r--r--extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/di/impl/EdgeImpl.java25
-rw-r--r--extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/di/impl/ShapeImpl.java36
-rw-r--r--extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/di/impl/StyleImpl.java2
-rw-r--r--extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/di/util/DIAdapterFactory.java22
-rw-r--r--extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/di/util/DIDerivedUnionAdapter.java45
-rw-r--r--extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/di/util/DISwitch.java68
-rw-r--r--extraplugins/diagram-definition/org.eclipse.papyrus.umldi.edit/.settings/org.eclipse.jdt.core.prefs281
-rw-r--r--extraplugins/diagram-definition/org.eclipse.papyrus.umldi.edit/.settings/org.eclipse.jdt.ui.prefs3
-rw-r--r--extraplugins/diagram-definition/org.eclipse.papyrus.umldi.edit/META-INF/MANIFEST.MF48
-rw-r--r--extraplugins/diagram-definition/org.eclipse.papyrus.umldi.edit/plugin.properties6
-rw-r--r--extraplugins/diagram-definition/org.eclipse.papyrus.umldi.edit/src/org/eclipse/papyrus/umldi/provider/UMLDIEditPlugin.java6
-rw-r--r--extraplugins/diagram-definition/org.eclipse.papyrus.umldi.edit/src/org/eclipse/papyrus/umldi/provider/UMLDIItemProviderAdapterFactory.java36
-rw-r--r--extraplugins/diagram-definition/org.eclipse.papyrus.umldi.edit/src/org/eclipse/papyrus/umldi/provider/UmlCompartmentItemProvider.java50
-rw-r--r--extraplugins/diagram-definition/org.eclipse.papyrus.umldi.edit/src/org/eclipse/papyrus/umldi/provider/UmlDiagramElementItemProvider.java28
-rw-r--r--extraplugins/diagram-definition/org.eclipse.papyrus.umldi.edit/src/org/eclipse/papyrus/umldi/provider/UmlDiagramItemProvider.java70
-rw-r--r--extraplugins/diagram-definition/org.eclipse.papyrus.umldi.edit/src/org/eclipse/papyrus/umldi/provider/UmlEdgeItemProvider.java20
-rw-r--r--extraplugins/diagram-definition/org.eclipse.papyrus.umldi.edit/src/org/eclipse/papyrus/umldi/provider/UmlLabelItemProvider.java51
-rw-r--r--extraplugins/diagram-definition/org.eclipse.papyrus.umldi.edit/src/org/eclipse/papyrus/umldi/provider/UmlShapeItemProvider.java10
-rw-r--r--extraplugins/diagram-definition/org.eclipse.papyrus.umldi.edit/src/org/eclipse/papyrus/umldi/provider/UmlStyleItemProvider.java16
-rw-r--r--extraplugins/diagram-definition/org.eclipse.papyrus.umldi.editor/META-INF/MANIFEST.MF48
-rw-r--r--extraplugins/diagram-definition/org.eclipse.papyrus.umldi.editor/src/org/eclipse/papyrus/umldi/editor/UMLDIActionBarContributor.java5
-rw-r--r--extraplugins/diagram-definition/org.eclipse.papyrus.umldi.editor/src/org/eclipse/papyrus/umldi/editor/UMLDIModelPage.java2
-rw-r--r--extraplugins/diagram-definition/org.eclipse.papyrus.umldi.editor/src/org/eclipse/papyrus/umldi/editor/UMLDIModelWizard.java62
-rw-r--r--extraplugins/diagram-definition/org.eclipse.papyrus.umldi.examples/.project11
-rw-r--r--extraplugins/diagram-definition/org.eclipse.papyrus.umldi.examples/ClassDiagram1.dg422
-rw-r--r--extraplugins/diagram-definition/org.eclipse.papyrus.umldi.examples/ClassDiagram1.uml24
-rw-r--r--extraplugins/diagram-definition/org.eclipse.papyrus.umldi.examples/ClassDiagram1.umldi63
-rw-r--r--extraplugins/diagram-definition/org.eclipse.papyrus.umldi/.settings/org.eclipse.jdt.core.prefs281
-rw-r--r--extraplugins/diagram-definition/org.eclipse.papyrus.umldi/.settings/org.eclipse.jdt.ui.prefs3
-rw-r--r--extraplugins/diagram-definition/org.eclipse.papyrus.umldi/META-INF/MANIFEST.MF41
-rw-r--r--extraplugins/diagram-definition/org.eclipse.papyrus.umldi/model/UMLDI.di12
-rw-r--r--extraplugins/diagram-definition/org.eclipse.papyrus.umldi/model/UMLDI.ecore22
-rw-r--r--extraplugins/diagram-definition/org.eclipse.papyrus.umldi/model/UMLDI.genmodel10
-rw-r--r--extraplugins/diagram-definition/org.eclipse.papyrus.umldi/model/UMLDI.notation664
-rw-r--r--extraplugins/diagram-definition/org.eclipse.papyrus.umldi/model/UMLDI.uml23
-rw-r--r--extraplugins/diagram-definition/org.eclipse.papyrus.umldi/src/org/eclipse/papyrus/umldi/UMLDIFactory.java2
-rw-r--r--extraplugins/diagram-definition/org.eclipse.papyrus.umldi/src/org/eclipse/papyrus/umldi/UMLDIPackage.java376
-rw-r--r--extraplugins/diagram-definition/org.eclipse.papyrus.umldi/src/org/eclipse/papyrus/umldi/UmlCompartment.java6
-rw-r--r--extraplugins/diagram-definition/org.eclipse.papyrus.umldi/src/org/eclipse/papyrus/umldi/UmlCompartmentKind.java14
-rw-r--r--extraplugins/diagram-definition/org.eclipse.papyrus.umldi/src/org/eclipse/papyrus/umldi/UmlDiagram.java39
-rw-r--r--extraplugins/diagram-definition/org.eclipse.papyrus.umldi/src/org/eclipse/papyrus/umldi/UmlDiagramElement.java8
-rw-r--r--extraplugins/diagram-definition/org.eclipse.papyrus.umldi/src/org/eclipse/papyrus/umldi/UmlDiagramKind.java205
-rw-r--r--extraplugins/diagram-definition/org.eclipse.papyrus.umldi/src/org/eclipse/papyrus/umldi/UmlEdge.java4
-rw-r--r--extraplugins/diagram-definition/org.eclipse.papyrus.umldi/src/org/eclipse/papyrus/umldi/UmlLabel.java6
-rw-r--r--extraplugins/diagram-definition/org.eclipse.papyrus.umldi/src/org/eclipse/papyrus/umldi/UmlLabelKind.java42
-rw-r--r--extraplugins/diagram-definition/org.eclipse.papyrus.umldi/src/org/eclipse/papyrus/umldi/UmlStyle.java11
-rw-r--r--extraplugins/diagram-definition/org.eclipse.papyrus.umldi/src/org/eclipse/papyrus/umldi/impl/UMLDIFactoryImpl.java64
-rw-r--r--extraplugins/diagram-definition/org.eclipse.papyrus.umldi/src/org/eclipse/papyrus/umldi/impl/UMLDIPackageImpl.java161
-rw-r--r--extraplugins/diagram-definition/org.eclipse.papyrus.umldi/src/org/eclipse/papyrus/umldi/impl/UmlCompartmentImpl.java154
-rw-r--r--extraplugins/diagram-definition/org.eclipse.papyrus.umldi/src/org/eclipse/papyrus/umldi/impl/UmlDiagramElementImpl.java141
-rw-r--r--extraplugins/diagram-definition/org.eclipse.papyrus.umldi/src/org/eclipse/papyrus/umldi/impl/UmlDiagramImpl.java209
-rw-r--r--extraplugins/diagram-definition/org.eclipse.papyrus.umldi/src/org/eclipse/papyrus/umldi/impl/UmlEdgeImpl.java127
-rw-r--r--extraplugins/diagram-definition/org.eclipse.papyrus.umldi/src/org/eclipse/papyrus/umldi/impl/UmlLabelImpl.java157
-rw-r--r--extraplugins/diagram-definition/org.eclipse.papyrus.umldi/src/org/eclipse/papyrus/umldi/impl/UmlShapeImpl.java42
-rw-r--r--extraplugins/diagram-definition/org.eclipse.papyrus.umldi/src/org/eclipse/papyrus/umldi/impl/UmlStyleImpl.java34
-rw-r--r--extraplugins/diagram-definition/org.eclipse.papyrus.umldi/src/org/eclipse/papyrus/umldi/util/UMLDIAdapterFactory.java37
-rw-r--r--extraplugins/diagram-definition/org.eclipse.papyrus.umldi/src/org/eclipse/papyrus/umldi/util/UMLDIDerivedUnionAdapter.java64
-rw-r--r--extraplugins/diagram-definition/org.eclipse.papyrus.umldi/src/org/eclipse/papyrus/umldi/util/UMLDIResourceFactoryImpl.java5
-rw-r--r--extraplugins/diagram-definition/org.eclipse.papyrus.umldi/src/org/eclipse/papyrus/umldi/util/UMLDIResourceImpl.java5
-rw-r--r--extraplugins/diagram-definition/org.eclipse.papyrus.umldi/src/org/eclipse/papyrus/umldi/util/UMLDISwitch.java162
-rw-r--r--extraplugins/diagram-definition/org.eclipse.papyrus.umldi/src/org/eclipse/papyrus/umldi/util/UMLDIValidator.java71
-rw-r--r--extraplugins/diagram-definition/org.eclipse.papyrus.umldi/src/org/eclipse/papyrus/umldi/util/UMLDIXMLProcessor.java7
-rw-r--r--extraplugins/diagram-definition/org.eclipse.papyrus.umldi2dg/.project6
-rw-r--r--extraplugins/diagram-definition/org.eclipse.papyrus.umldi2dg/META-INF/MANIFEST.MF18
-rw-r--r--extraplugins/diagram-definition/org.eclipse.papyrus.umldi2dg/build.properties20
-rw-r--r--extraplugins/diagram-definition/org.eclipse.papyrus.umldi2dg/plugin.properties2
-rw-r--r--extraplugins/diagram-definition/org.eclipse.papyrus.umldi2dg/scripts/UmlLayouts.js (renamed from extraplugins/diagram-definition/org.eclipse.papyrus.umldi2dg/scripts/umllayouts.js)122
-rw-r--r--extraplugins/diagram-definition/org.eclipse.papyrus.umldi2dg/transforms/ClassDiagramToDG.qvto154
-rw-r--r--extraplugins/diagram-definition/org.eclipse.papyrus.umldi2dg/transforms/UMLDIToDG.qvto24
-rw-r--r--extraplugins/diagram-definition/org.eclipse.papyrus.umldi2dg/transforms/UmlDefinitions.qvto373
-rw-r--r--extraplugins/diagram-definition/org.eclipse.papyrus.umldi2dg/transforms/UmlDiagramToDG.qvto131
-rw-r--r--extraplugins/diagram-definition/org.eclipse.papyrus.umldi2dg/transforms/umldefinitions.qvto72
-rw-r--r--extraplugins/diagram-definition/org.eclipse.papyrus.umldi2dg/transforms/umldi2dg.qvto136
287 files changed, 9198 insertions, 4924 deletions
diff --git a/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/.settings/org.eclipse.jdt.core.prefs b/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/.settings/org.eclipse.jdt.core.prefs
index 11f6e462df7..e5766923962 100644
--- a/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/.settings/org.eclipse.jdt.core.prefs
+++ b/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/.settings/org.eclipse.jdt.core.prefs
@@ -1,7 +1,281 @@
-eclipse.preferences.version=1
-org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.7
-org.eclipse.jdt.core.compiler.compliance=1.7
-org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
-org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
-org.eclipse.jdt.core.compiler.source=1.7
+eclipse.preferences.version=1
+org.eclipse.jdt.core.formatter.align_type_members_on_columns=false
+org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression=0
+org.eclipse.jdt.core.formatter.alignment_for_arguments_in_annotation=0
+org.eclipse.jdt.core.formatter.alignment_for_arguments_in_enum_constant=0
+org.eclipse.jdt.core.formatter.alignment_for_arguments_in_explicit_constructor_call=0
+org.eclipse.jdt.core.formatter.alignment_for_arguments_in_method_invocation=0
+org.eclipse.jdt.core.formatter.alignment_for_arguments_in_qualified_allocation_expression=0
+org.eclipse.jdt.core.formatter.alignment_for_assignment=0
+org.eclipse.jdt.core.formatter.alignment_for_binary_expression=0
+org.eclipse.jdt.core.formatter.alignment_for_compact_if=0
+org.eclipse.jdt.core.formatter.alignment_for_conditional_expression=0
+org.eclipse.jdt.core.formatter.alignment_for_enum_constants=0
+org.eclipse.jdt.core.formatter.alignment_for_expressions_in_array_initializer=0
+org.eclipse.jdt.core.formatter.alignment_for_method_declaration=0
+org.eclipse.jdt.core.formatter.alignment_for_multiple_fields=16
+org.eclipse.jdt.core.formatter.alignment_for_parameters_in_constructor_declaration=0
+org.eclipse.jdt.core.formatter.alignment_for_parameters_in_method_declaration=0
+org.eclipse.jdt.core.formatter.alignment_for_resources_in_try=80
+org.eclipse.jdt.core.formatter.alignment_for_selector_in_method_invocation=0
+org.eclipse.jdt.core.formatter.alignment_for_superclass_in_type_declaration=0
+org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_enum_declaration=0
+org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_type_declaration=0
+org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_constructor_declaration=0
+org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_method_declaration=0
+org.eclipse.jdt.core.formatter.alignment_for_union_type_in_multicatch=16
+org.eclipse.jdt.core.formatter.blank_lines_after_imports=1
+org.eclipse.jdt.core.formatter.blank_lines_after_package=1
+org.eclipse.jdt.core.formatter.blank_lines_before_field=1
+org.eclipse.jdt.core.formatter.blank_lines_before_first_class_body_declaration=1
+org.eclipse.jdt.core.formatter.blank_lines_before_imports=1
+org.eclipse.jdt.core.formatter.blank_lines_before_member_type=1
+org.eclipse.jdt.core.formatter.blank_lines_before_method=1
+org.eclipse.jdt.core.formatter.blank_lines_before_new_chunk=1
+org.eclipse.jdt.core.formatter.blank_lines_before_package=0
+org.eclipse.jdt.core.formatter.blank_lines_between_import_groups=1
+org.eclipse.jdt.core.formatter.blank_lines_between_type_declarations=1
+org.eclipse.jdt.core.formatter.brace_position_for_annotation_type_declaration=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_anonymous_type_declaration=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_array_initializer=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_block=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_block_in_case=next_line
+org.eclipse.jdt.core.formatter.brace_position_for_constructor_declaration=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_enum_constant=next_line
+org.eclipse.jdt.core.formatter.brace_position_for_enum_declaration=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_method_declaration=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_switch=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_type_declaration=end_of_line
+org.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_block_comment=false
+org.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_javadoc_comment=false
+org.eclipse.jdt.core.formatter.comment.format_block_comments=true
+org.eclipse.jdt.core.formatter.comment.format_header=false
+org.eclipse.jdt.core.formatter.comment.format_html=true
+org.eclipse.jdt.core.formatter.comment.format_javadoc_comments=true
+org.eclipse.jdt.core.formatter.comment.format_line_comments=false
+org.eclipse.jdt.core.formatter.comment.format_source_code=true
+org.eclipse.jdt.core.formatter.comment.indent_parameter_description=false
+org.eclipse.jdt.core.formatter.comment.indent_root_tags=true
+org.eclipse.jdt.core.formatter.comment.insert_new_line_before_root_tags=insert
+org.eclipse.jdt.core.formatter.comment.insert_new_line_for_parameter=insert
+org.eclipse.jdt.core.formatter.comment.line_length=150
+org.eclipse.jdt.core.formatter.comment.new_lines_at_block_boundaries=true
+org.eclipse.jdt.core.formatter.comment.new_lines_at_javadoc_boundaries=true
+org.eclipse.jdt.core.formatter.comment.preserve_white_space_between_code_and_line_comments=false
+org.eclipse.jdt.core.formatter.compact_else_if=true
+org.eclipse.jdt.core.formatter.continuation_indentation=1
+org.eclipse.jdt.core.formatter.continuation_indentation_for_array_initializer=1
+org.eclipse.jdt.core.formatter.disabling_tag=@formatter\:off
+org.eclipse.jdt.core.formatter.enabling_tag=@formatter\:on
+org.eclipse.jdt.core.formatter.format_guardian_clause_on_one_line=false
+org.eclipse.jdt.core.formatter.format_line_comment_starting_on_first_column=true
+org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_annotation_declaration_header=true
+org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_enum_constant_header=true
+org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_enum_declaration_header=true
+org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_type_header=true
+org.eclipse.jdt.core.formatter.indent_breaks_compare_to_cases=true
+org.eclipse.jdt.core.formatter.indent_empty_lines=false
+org.eclipse.jdt.core.formatter.indent_statements_compare_to_block=true
+org.eclipse.jdt.core.formatter.indent_statements_compare_to_body=true
+org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_cases=true
+org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_switch=false
+org.eclipse.jdt.core.formatter.indentation.size=4
+org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_field=insert
+org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_local_variable=insert
+org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_method=insert
+org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_package=insert
+org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_parameter=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_type=insert
+org.eclipse.jdt.core.formatter.insert_new_line_after_label=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_after_opening_brace_in_array_initializer=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_at_end_of_file_if_missing=insert
+org.eclipse.jdt.core.formatter.insert_new_line_before_catch_in_try_statement=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_before_closing_brace_in_array_initializer=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_before_else_in_if_statement=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_before_finally_in_try_statement=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_before_while_in_do_statement=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_in_empty_annotation_declaration=insert
+org.eclipse.jdt.core.formatter.insert_new_line_in_empty_anonymous_type_declaration=insert
+org.eclipse.jdt.core.formatter.insert_new_line_in_empty_block=insert
+org.eclipse.jdt.core.formatter.insert_new_line_in_empty_enum_constant=insert
+org.eclipse.jdt.core.formatter.insert_new_line_in_empty_enum_declaration=insert
+org.eclipse.jdt.core.formatter.insert_new_line_in_empty_method_body=insert
+org.eclipse.jdt.core.formatter.insert_new_line_in_empty_type_declaration=insert
+org.eclipse.jdt.core.formatter.insert_space_after_and_in_type_parameter=insert
+org.eclipse.jdt.core.formatter.insert_space_after_assignment_operator=insert
+org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation_type_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_binary_operator=insert
+org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_arguments=insert
+org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_parameters=insert
+org.eclipse.jdt.core.formatter.insert_space_after_closing_brace_in_block=insert
+org.eclipse.jdt.core.formatter.insert_space_after_closing_paren_in_cast=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_colon_in_assert=insert
+org.eclipse.jdt.core.formatter.insert_space_after_colon_in_case=insert
+org.eclipse.jdt.core.formatter.insert_space_after_colon_in_conditional=insert
+org.eclipse.jdt.core.formatter.insert_space_after_colon_in_for=insert
+org.eclipse.jdt.core.formatter.insert_space_after_colon_in_labeled_statement=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_allocation_expression=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_annotation=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_array_initializer=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_constructor_declaration_parameters=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_constructor_declaration_throws=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_enum_constant_arguments=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_enum_declarations=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_explicitconstructorcall_arguments=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_for_increments=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_for_inits=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_declaration_parameters=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_declaration_throws=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_invocation_arguments=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_multiple_field_declarations=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_multiple_local_declarations=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_parameterized_type_reference=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_superinterfaces=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_arguments=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_parameters=insert
+org.eclipse.jdt.core.formatter.insert_space_after_ellipsis=insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_parameterized_type_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_arguments=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_parameters=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_brace_in_array_initializer=insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_bracket_in_array_allocation_expression=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_bracket_in_array_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_annotation=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_cast=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_catch=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_constructor_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_enum_constant=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_for=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_if=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_method_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_method_invocation=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_parenthesized_expression=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_switch=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_synchronized=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_try=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_while=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_postfix_operator=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_prefix_operator=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_question_in_conditional=insert
+org.eclipse.jdt.core.formatter.insert_space_after_question_in_wildcard=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_semicolon_in_for=insert
+org.eclipse.jdt.core.formatter.insert_space_after_semicolon_in_try_resources=insert
+org.eclipse.jdt.core.formatter.insert_space_after_unary_operator=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_and_in_type_parameter=insert
+org.eclipse.jdt.core.formatter.insert_space_before_assignment_operator=insert
+org.eclipse.jdt.core.formatter.insert_space_before_at_in_annotation_type_declaration=insert
+org.eclipse.jdt.core.formatter.insert_space_before_binary_operator=insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_parameterized_type_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_arguments=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_parameters=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_brace_in_array_initializer=insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_bracket_in_array_allocation_expression=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_bracket_in_array_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_annotation=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_cast=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_catch=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_constructor_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_enum_constant=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_for=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_if=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_method_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_method_invocation=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_parenthesized_expression=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_switch=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_synchronized=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_try=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_while=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_colon_in_assert=insert
+org.eclipse.jdt.core.formatter.insert_space_before_colon_in_case=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_colon_in_conditional=insert
+org.eclipse.jdt.core.formatter.insert_space_before_colon_in_default=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_colon_in_for=insert
+org.eclipse.jdt.core.formatter.insert_space_before_colon_in_labeled_statement=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_allocation_expression=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_annotation=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_array_initializer=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_constructor_declaration_parameters=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_constructor_declaration_throws=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_enum_constant_arguments=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_enum_declarations=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_explicitconstructorcall_arguments=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_for_increments=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_for_inits=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_declaration_parameters=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_declaration_throws=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_invocation_arguments=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_multiple_field_declarations=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_multiple_local_declarations=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_parameterized_type_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_superinterfaces=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_arguments=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_parameters=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_ellipsis=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_parameterized_type_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_arguments=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_parameters=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_annotation_type_declaration=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_anonymous_type_declaration=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_array_initializer=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_block=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_constructor_declaration=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_enum_constant=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_enum_declaration=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_method_declaration=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_switch=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_type_declaration=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_allocation_expression=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_type_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_annotation=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_annotation_type_member_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_catch=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_constructor_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_enum_constant=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_for=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_if=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_method_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_method_invocation=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_parenthesized_expression=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_switch=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_synchronized=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_try=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_while=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_parenthesized_expression_in_return=insert
+org.eclipse.jdt.core.formatter.insert_space_before_parenthesized_expression_in_throw=insert
+org.eclipse.jdt.core.formatter.insert_space_before_postfix_operator=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_prefix_operator=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_question_in_conditional=insert
+org.eclipse.jdt.core.formatter.insert_space_before_question_in_wildcard=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_semicolon=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_semicolon_in_for=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_semicolon_in_try_resources=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_unary_operator=do not insert
+org.eclipse.jdt.core.formatter.insert_space_between_brackets_in_array_type_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_between_empty_braces_in_array_initializer=do not insert
+org.eclipse.jdt.core.formatter.insert_space_between_empty_brackets_in_array_allocation_expression=do not insert
+org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_annotation_type_member_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_constructor_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_enum_constant=do not insert
+org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_invocation=do not insert
+org.eclipse.jdt.core.formatter.join_lines_in_comments=false
+org.eclipse.jdt.core.formatter.join_wrapped_lines=true
+org.eclipse.jdt.core.formatter.keep_else_statement_on_same_line=false
+org.eclipse.jdt.core.formatter.keep_empty_array_initializer_on_one_line=false
+org.eclipse.jdt.core.formatter.keep_imple_if_on_one_line=false
+org.eclipse.jdt.core.formatter.keep_then_statement_on_same_line=false
+org.eclipse.jdt.core.formatter.lineSplit=200
+org.eclipse.jdt.core.formatter.never_indent_block_comments_on_first_column=false
+org.eclipse.jdt.core.formatter.never_indent_line_comments_on_first_column=false
+org.eclipse.jdt.core.formatter.number_of_blank_lines_at_beginning_of_method_body=0
+org.eclipse.jdt.core.formatter.number_of_empty_lines_to_preserve=0
+org.eclipse.jdt.core.formatter.put_empty_statement_on_new_line=false
+org.eclipse.jdt.core.formatter.tabulation.char=tab
+org.eclipse.jdt.core.formatter.tabulation.size=4
+org.eclipse.jdt.core.formatter.use_on_off_tags=false
+org.eclipse.jdt.core.formatter.use_tabs_only_for_leading_indentations=false
+org.eclipse.jdt.core.formatter.wrap_before_binary_operator=true
+org.eclipse.jdt.core.formatter.wrap_before_or_operator_multicatch=true
+org.eclipse.jdt.core.formatter.wrap_outer_expressions_when_nested=true
diff --git a/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/.settings/org.eclipse.jdt.ui.prefs b/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/.settings/org.eclipse.jdt.ui.prefs
new file mode 100644
index 00000000000..b5f980cae55
--- /dev/null
+++ b/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/.settings/org.eclipse.jdt.ui.prefs
@@ -0,0 +1,3 @@
+eclipse.preferences.version=1
+formatter_profile=_Zero blank Papyrus Formatter Profile CDM
+formatter_settings_version=12
diff --git a/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/META-INF/MANIFEST.MF b/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/META-INF/MANIFEST.MF
index 2dd70469f64..a68cda381b6 100644
--- a/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/META-INF/MANIFEST.MF
+++ b/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/META-INF/MANIFEST.MF
@@ -1,24 +1,22 @@
-Manifest-Version: 1.0
-Export-Package: org.eclipse.papyrus.dd.dc.provider,
- org.eclipse.papyrus.dd.dg.provider,
- org.eclipse.papyrus.dd.di.provider,
- org.eclipse.papyrus.dd.edit
-Require-Bundle: org.eclipse.core.runtime,
- org.eclipse.papyrus.dd;bundle-version="1.1.0";visibility:=reexport,
- org.eclipse.emf.edit;visibility:=reexport,
- org.eclipse.papyrus.dd.edit;bundle-version="1.1.0";visibility:=reexport,
- org.eclipse.emf.ecore;visibility:=reexport,
- org.eclipse.emf.ecore.edit;visibility:=reexport,
- org.eclipse.uml2.common.edit;visibility:=reexport
-Bundle-Vendor: %providerName
-Bundle-ActivationPolicy: lazy
-Bundle-ClassPath: .
-Bundle-Version: 1.1.0.qualifier
-Bundle-Name: %pluginName
-Bundle-Localization: plugin
-Bundle-ManifestVersion: 2
-Bundle-Activator: org.eclipse.papyrus.dd.edit.DDEditPlugin$Implementat
- ion
-Bundle-SymbolicName: org.eclipse.papyrus.dd.edit;singleton:=true
-Bundle-RequiredExecutionEnvironment: JavaSE-1.7
-
+Manifest-Version: 1.0
+Bundle-ManifestVersion: 2
+Bundle-Name: %pluginName
+Bundle-SymbolicName: org.eclipse.papyrus.dd.edit;singleton:=true
+Bundle-Version: 1.0.0.qualifier
+Bundle-ClassPath: .
+Bundle-Activator: org.eclipse.papyrus.dd.edit.DDEditPlugin$Implementation
+Bundle-Vendor: %providerName
+Bundle-Localization: plugin
+Bundle-RequiredExecutionEnvironment: JavaSE-1.7
+Export-Package: org.eclipse.papyrus.dd.dc.provider,
+ org.eclipse.papyrus.dd.dg.provider,
+ org.eclipse.papyrus.dd.di.provider,
+ org.eclipse.papyrus.dd.edit
+Require-Bundle: org.eclipse.core.runtime,
+ org.eclipse.papyrus.dd;visibility:=reexport,
+ org.eclipse.emf.edit;visibility:=reexport,
+ org.eclipse.papyrus.dd.edit;visibility:=reexport,
+ org.eclipse.emf.ecore;visibility:=reexport,
+ org.eclipse.emf.ecore.edit;visibility:=reexport,
+ org.eclipse.uml2.common.edit;visibility:=reexport
+Bundle-ActivationPolicy: lazy
diff --git a/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/icons/full/ctool16/CreateDefinitions_defnition_Canvas.gif b/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/icons/full/ctool16/CreateDefinitions_definition_Canvas.gif
index 0f1a66a3248..0f1a66a3248 100644
--- a/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/icons/full/ctool16/CreateDefinitions_defnition_Canvas.gif
+++ b/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/icons/full/ctool16/CreateDefinitions_definition_Canvas.gif
Binary files differ
diff --git a/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/icons/full/ctool16/CreateDefinitions_defnition_Circle.gif b/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/icons/full/ctool16/CreateDefinitions_definition_Circle.gif
index d9a8b0c6560..d9a8b0c6560 100644
--- a/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/icons/full/ctool16/CreateDefinitions_defnition_Circle.gif
+++ b/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/icons/full/ctool16/CreateDefinitions_definition_Circle.gif
Binary files differ
diff --git a/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/icons/full/ctool16/CreateDefinitions_defnition_ClipPath.gif b/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/icons/full/ctool16/CreateDefinitions_definition_ClipPath.gif
index 2f72c3abb0f..2f72c3abb0f 100644
--- a/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/icons/full/ctool16/CreateDefinitions_defnition_ClipPath.gif
+++ b/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/icons/full/ctool16/CreateDefinitions_definition_ClipPath.gif
Binary files differ
diff --git a/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/icons/full/ctool16/CreateDefinitions_defnition_Ellipse.gif b/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/icons/full/ctool16/CreateDefinitions_definition_Ellipse.gif
index df2b32dc2d7..df2b32dc2d7 100644
--- a/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/icons/full/ctool16/CreateDefinitions_defnition_Ellipse.gif
+++ b/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/icons/full/ctool16/CreateDefinitions_definition_Ellipse.gif
Binary files differ
diff --git a/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/icons/full/ctool16/CreateDefinitions_defnition_Group.gif b/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/icons/full/ctool16/CreateDefinitions_definition_Group.gif
index bfcb3a1d04c..bfcb3a1d04c 100644
--- a/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/icons/full/ctool16/CreateDefinitions_defnition_Group.gif
+++ b/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/icons/full/ctool16/CreateDefinitions_definition_Group.gif
Binary files differ
diff --git a/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/icons/full/ctool16/CreateDefinitions_defnition_Image.gif b/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/icons/full/ctool16/CreateDefinitions_definition_Image.gif
index 0ec54208f65..0ec54208f65 100644
--- a/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/icons/full/ctool16/CreateDefinitions_defnition_Image.gif
+++ b/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/icons/full/ctool16/CreateDefinitions_definition_Image.gif
Binary files differ
diff --git a/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/icons/full/ctool16/CreateDefinitions_defnition_Line.gif b/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/icons/full/ctool16/CreateDefinitions_definition_Line.gif
index 0131b567575..0131b567575 100644
--- a/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/icons/full/ctool16/CreateDefinitions_defnition_Line.gif
+++ b/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/icons/full/ctool16/CreateDefinitions_definition_Line.gif
Binary files differ
diff --git a/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/icons/full/ctool16/CreateDefinitions_defnition_LinearGradient.gif b/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/icons/full/ctool16/CreateDefinitions_definition_LinearGradient.gif
index c128024445b..c128024445b 100644
--- a/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/icons/full/ctool16/CreateDefinitions_defnition_LinearGradient.gif
+++ b/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/icons/full/ctool16/CreateDefinitions_definition_LinearGradient.gif
Binary files differ
diff --git a/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/icons/full/ctool16/CreateDefinitions_defnition_Marker.gif b/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/icons/full/ctool16/CreateDefinitions_definition_Marker.gif
index 6b00e675037..6b00e675037 100644
--- a/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/icons/full/ctool16/CreateDefinitions_defnition_Marker.gif
+++ b/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/icons/full/ctool16/CreateDefinitions_definition_Marker.gif
Binary files differ
diff --git a/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/icons/full/ctool16/CreateDefinitions_defnition_Path.gif b/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/icons/full/ctool16/CreateDefinitions_definition_Path.gif
index e03542c865b..e03542c865b 100644
--- a/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/icons/full/ctool16/CreateDefinitions_defnition_Path.gif
+++ b/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/icons/full/ctool16/CreateDefinitions_definition_Path.gif
Binary files differ
diff --git a/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/icons/full/ctool16/CreateDefinitions_defnition_Pattern.gif b/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/icons/full/ctool16/CreateDefinitions_definition_Pattern.gif
index 258ef9873e7..258ef9873e7 100644
--- a/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/icons/full/ctool16/CreateDefinitions_defnition_Pattern.gif
+++ b/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/icons/full/ctool16/CreateDefinitions_definition_Pattern.gif
Binary files differ
diff --git a/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/icons/full/ctool16/CreateDefinitions_defnition_Polygon.gif b/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/icons/full/ctool16/CreateDefinitions_definition_Polygon.gif
index 51bab8f637e..51bab8f637e 100644
--- a/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/icons/full/ctool16/CreateDefinitions_defnition_Polygon.gif
+++ b/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/icons/full/ctool16/CreateDefinitions_definition_Polygon.gif
Binary files differ
diff --git a/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/icons/full/ctool16/CreateDefinitions_defnition_Polyline.gif b/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/icons/full/ctool16/CreateDefinitions_definition_Polyline.gif
index dfb9f6a21cf..dfb9f6a21cf 100644
--- a/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/icons/full/ctool16/CreateDefinitions_defnition_Polyline.gif
+++ b/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/icons/full/ctool16/CreateDefinitions_definition_Polyline.gif
Binary files differ
diff --git a/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/icons/full/ctool16/CreateDefinitions_defnition_RadialGradient.gif b/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/icons/full/ctool16/CreateDefinitions_definition_RadialGradient.gif
index 0fae0b12c2a..0fae0b12c2a 100644
--- a/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/icons/full/ctool16/CreateDefinitions_defnition_RadialGradient.gif
+++ b/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/icons/full/ctool16/CreateDefinitions_definition_RadialGradient.gif
Binary files differ
diff --git a/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/icons/full/ctool16/CreateDefinitions_defnition_Rectangle.gif b/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/icons/full/ctool16/CreateDefinitions_definition_Rectangle.gif
index c525027841f..c525027841f 100644
--- a/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/icons/full/ctool16/CreateDefinitions_defnition_Rectangle.gif
+++ b/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/icons/full/ctool16/CreateDefinitions_definition_Rectangle.gif
Binary files differ
diff --git a/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/icons/full/ctool16/CreateDefinitions_defnition_RootCanvas.gif b/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/icons/full/ctool16/CreateDefinitions_definition_RootCanvas.gif
index a75fd205d20..a75fd205d20 100644
--- a/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/icons/full/ctool16/CreateDefinitions_defnition_RootCanvas.gif
+++ b/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/icons/full/ctool16/CreateDefinitions_definition_RootCanvas.gif
Binary files differ
diff --git a/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/icons/full/ctool16/CreateDefinitions_defnition_Text.gif b/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/icons/full/ctool16/CreateDefinitions_definition_Text.gif
index dad75922595..dad75922595 100644
--- a/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/icons/full/ctool16/CreateDefinitions_defnition_Text.gif
+++ b/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/icons/full/ctool16/CreateDefinitions_definition_Text.gif
Binary files differ
diff --git a/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/icons/full/ctool16/CreateDefinitions_defnition_Use.gif b/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/icons/full/ctool16/CreateDefinitions_definition_Use.gif
index 258ef9873e7..258ef9873e7 100644
--- a/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/icons/full/ctool16/CreateDefinitions_defnition_Use.gif
+++ b/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/icons/full/ctool16/CreateDefinitions_definition_Use.gif
Binary files differ
diff --git a/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/icons/full/ctool16/CreateText_bounds_Bounds.gif b/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/icons/full/ctool16/CreateText_bounds_Bounds.gif
new file mode 100644
index 00000000000..63feef5ec0a
--- /dev/null
+++ b/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/icons/full/ctool16/CreateText_bounds_Bounds.gif
Binary files differ
diff --git a/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/icons/full/ctool16/CreateText_position_Point.gif b/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/icons/full/ctool16/CreateText_position_Point.gif
deleted file mode 100644
index 527759b7ded..00000000000
--- a/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/icons/full/ctool16/CreateText_position_Point.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 8adaa8c5620..df5d4522438 100644
--- a/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/plugin.properties
+++ b/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/plugin.properties
@@ -272,3 +272,5 @@ _UI_Text_anchor_feature = Anchor
_UI_TextAnchor_start_literal = start
_UI_TextAnchor_middle_literal = middle
_UI_TextAnchor_end_literal = end
+_UI_Text_bounds_feature = Bounds
+_UI_Definitions_definition_feature = Definition
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 983e1ec9933..f6094025c74 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
@@ -16,7 +16,9 @@ import java.util.List;
import org.eclipse.emf.common.notify.AdapterFactory;
import org.eclipse.emf.common.notify.Notification;
+
import org.eclipse.emf.common.util.ResourceLocator;
+
import org.eclipse.emf.edit.provider.ComposeableAdapterFactory;
import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
import org.eclipse.emf.edit.provider.IItemLabelProvider;
@@ -27,8 +29,10 @@ import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
import org.eclipse.emf.edit.provider.ItemPropertyDescriptor;
import org.eclipse.emf.edit.provider.ItemProviderAdapter;
import org.eclipse.emf.edit.provider.ViewerNotification;
+
import org.eclipse.papyrus.dd.dc.Bounds;
import org.eclipse.papyrus.dd.dc.DCPackage;
+
import org.eclipse.papyrus.dd.edit.DDEditPlugin;
/**
@@ -58,7 +62,7 @@ public class BoundsItemProvider extends ItemProviderAdapter implements IEditingD
*/
@Override
public List<IItemPropertyDescriptor> getPropertyDescriptors(Object object) {
- if (itemPropertyDescriptors == null) {
+ if(itemPropertyDescriptors == null) {
super.getPropertyDescriptors(object);
addXPropertyDescriptor(object);
addYPropertyDescriptor(object);
@@ -76,8 +80,7 @@ public class BoundsItemProvider extends ItemProviderAdapter implements IEditingD
* @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));
}
/**
@@ -88,8 +91,7 @@ public class BoundsItemProvider extends ItemProviderAdapter implements IEditingD
* @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));
}
/**
@@ -99,8 +101,7 @@ public class BoundsItemProvider extends ItemProviderAdapter implements IEditingD
* @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));
}
/**
@@ -110,8 +111,7 @@ public class BoundsItemProvider extends ItemProviderAdapter implements IEditingD
* @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));
}
/**
@@ -133,7 +133,7 @@ public class BoundsItemProvider extends ItemProviderAdapter implements IEditingD
*/
@Override
public String getText(Object object) {
- Bounds bounds = (Bounds) object;
+ Bounds bounds = (Bounds)object;
return getString("_UI_Bounds_type") + " " + bounds.getX() + ", " + bounds.getY() + ", " + bounds.getWidth() + ", " + bounds.getHeight();
}
@@ -148,7 +148,7 @@ public class BoundsItemProvider extends ItemProviderAdapter implements IEditingD
@Override
public void notifyChanged(Notification notification) {
updateChildren(notification);
- switch (notification.getFeatureID(Bounds.class)) {
+ switch(notification.getFeatureID(Bounds.class)) {
case DCPackage.BOUNDS__X:
case DCPackage.BOUNDS__Y:
case DCPackage.BOUNDS__WIDTH:
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 4764a31e476..bd778f4c9f5 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
@@ -17,6 +17,7 @@ import java.util.Collection;
import org.eclipse.emf.common.notify.Adapter;
import org.eclipse.emf.common.notify.Notification;
import org.eclipse.emf.common.notify.Notifier;
+
import org.eclipse.emf.edit.provider.ChangeNotifier;
import org.eclipse.emf.edit.provider.ComposeableAdapterFactory;
import org.eclipse.emf.edit.provider.ComposedAdapterFactory;
@@ -28,6 +29,7 @@ import org.eclipse.emf.edit.provider.IItemPropertySource;
import org.eclipse.emf.edit.provider.INotifyChangedListener;
import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;
import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
+
import org.eclipse.papyrus.dd.dc.util.DCAdapterFactory;
/**
@@ -98,7 +100,7 @@ public class DCItemProviderAdapterFactory extends DCAdapterFactory implements Co
*/
@Override
public Adapter createPointAdapter() {
- if (pointItemProvider == null) {
+ if(pointItemProvider == null) {
pointItemProvider = new PointItemProvider(this);
}
return pointItemProvider;
@@ -120,7 +122,7 @@ public class DCItemProviderAdapterFactory extends DCAdapterFactory implements Co
*/
@Override
public Adapter createDimensionAdapter() {
- if (dimensionItemProvider == null) {
+ if(dimensionItemProvider == null) {
dimensionItemProvider = new DimensionItemProvider(this);
}
return dimensionItemProvider;
@@ -143,7 +145,7 @@ public class DCItemProviderAdapterFactory extends DCAdapterFactory implements Co
*/
@Override
public Adapter createBoundsAdapter() {
- if (boundsItemProvider == null) {
+ if(boundsItemProvider == null) {
boundsItemProvider = new BoundsItemProvider(this);
}
return boundsItemProvider;
@@ -199,9 +201,9 @@ public class DCItemProviderAdapterFactory extends DCAdapterFactory implements Co
*/
@Override
public Object adapt(Object object, Object type) {
- if (isFactoryForType(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;
}
}
@@ -239,7 +241,7 @@ public class DCItemProviderAdapterFactory extends DCAdapterFactory implements Co
@Override
public void fireNotifyChanged(Notification notification) {
changeNotifier.fireNotifyChanged(notification);
- if (parentAdapterFactory != null) {
+ if(parentAdapterFactory != null) {
parentAdapterFactory.fireNotifyChanged(notification);
}
}
@@ -252,13 +254,13 @@ public class DCItemProviderAdapterFactory extends DCAdapterFactory implements Co
*/
@Override
public void dispose() {
- if (pointItemProvider != null) {
+ if(pointItemProvider != null) {
pointItemProvider.dispose();
}
- if (dimensionItemProvider != null) {
+ if(dimensionItemProvider != null) {
dimensionItemProvider.dispose();
}
- if (boundsItemProvider != null) {
+ 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 ce36891ce09..546ace9d7e7 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
@@ -16,7 +16,9 @@ import java.util.List;
import org.eclipse.emf.common.notify.AdapterFactory;
import org.eclipse.emf.common.notify.Notification;
+
import org.eclipse.emf.common.util.ResourceLocator;
+
import org.eclipse.emf.edit.provider.ComposeableAdapterFactory;
import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
import org.eclipse.emf.edit.provider.IItemLabelProvider;
@@ -27,8 +29,10 @@ import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
import org.eclipse.emf.edit.provider.ItemPropertyDescriptor;
import org.eclipse.emf.edit.provider.ItemProviderAdapter;
import org.eclipse.emf.edit.provider.ViewerNotification;
+
import org.eclipse.papyrus.dd.dc.DCPackage;
import org.eclipse.papyrus.dd.dc.Dimension;
+
import org.eclipse.papyrus.dd.edit.DDEditPlugin;
/**
@@ -58,7 +62,7 @@ public class DimensionItemProvider extends ItemProviderAdapter implements IEditi
*/
@Override
public List<IItemPropertyDescriptor> getPropertyDescriptors(Object object) {
- if (itemPropertyDescriptors == null) {
+ if(itemPropertyDescriptors == null) {
super.getPropertyDescriptors(object);
addWidthPropertyDescriptor(object);
addHeightPropertyDescriptor(object);
@@ -73,8 +77,7 @@ public class DimensionItemProvider extends ItemProviderAdapter implements IEditi
* @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));
}
/**
@@ -84,8 +87,7 @@ public class DimensionItemProvider extends ItemProviderAdapter implements IEditi
* @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));
}
/**
@@ -107,7 +109,7 @@ public class DimensionItemProvider extends ItemProviderAdapter implements IEditi
*/
@Override
public String getText(Object object) {
- Dimension dimension = (Dimension) object;
+ Dimension dimension = (Dimension)object;
return getString("_UI_Dimension_type") + " " + dimension.getWidth() + ", " + dimension.getHeight();
}
@@ -122,7 +124,7 @@ public class DimensionItemProvider extends ItemProviderAdapter implements IEditi
@Override
public void notifyChanged(Notification notification) {
updateChildren(notification);
- switch (notification.getFeatureID(Dimension.class)) {
+ switch(notification.getFeatureID(Dimension.class)) {
case DCPackage.DIMENSION__WIDTH:
case DCPackage.DIMENSION__HEIGHT:
fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), false, true));
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 65c1d557d03..83c79ea44e5 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
@@ -16,7 +16,9 @@ import java.util.List;
import org.eclipse.emf.common.notify.AdapterFactory;
import org.eclipse.emf.common.notify.Notification;
+
import org.eclipse.emf.common.util.ResourceLocator;
+
import org.eclipse.emf.edit.provider.ComposeableAdapterFactory;
import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
import org.eclipse.emf.edit.provider.IItemLabelProvider;
@@ -27,8 +29,10 @@ import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
import org.eclipse.emf.edit.provider.ItemPropertyDescriptor;
import org.eclipse.emf.edit.provider.ItemProviderAdapter;
import org.eclipse.emf.edit.provider.ViewerNotification;
+
import org.eclipse.papyrus.dd.dc.DCPackage;
import org.eclipse.papyrus.dd.dc.Point;
+
import org.eclipse.papyrus.dd.edit.DDEditPlugin;
/**
@@ -58,7 +62,7 @@ public class PointItemProvider extends ItemProviderAdapter implements IEditingDo
*/
@Override
public List<IItemPropertyDescriptor> getPropertyDescriptors(Object object) {
- if (itemPropertyDescriptors == null) {
+ if(itemPropertyDescriptors == null) {
super.getPropertyDescriptors(object);
addXPropertyDescriptor(object);
addYPropertyDescriptor(object);
@@ -74,8 +78,7 @@ public class PointItemProvider extends ItemProviderAdapter implements IEditingDo
* @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));
}
/**
@@ -86,8 +89,7 @@ public class PointItemProvider extends ItemProviderAdapter implements IEditingDo
* @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));
}
/**
@@ -109,7 +111,7 @@ public class PointItemProvider extends ItemProviderAdapter implements IEditingDo
*/
@Override
public String getText(Object object) {
- Point point = (Point) object;
+ Point point = (Point)object;
return getString("_UI_Point_type") + " " + point.getX() + ", " + point.getY();
}
@@ -124,7 +126,7 @@ public class PointItemProvider extends ItemProviderAdapter implements IEditingDo
@Override
public void notifyChanged(Notification notification) {
updateChildren(notification);
- switch (notification.getFeatureID(Point.class)) {
+ switch(notification.getFeatureID(Point.class)) {
case DCPackage.POINT__X:
case DCPackage.POINT__Y:
fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), false, true));
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 074690c794d..d73a09b47a8 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,7 +13,6 @@ 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;
@@ -57,14 +56,15 @@ public class CanvasItemProvider extends GroupItemProvider implements IEditingDom
*/
@Override
public List<IItemPropertyDescriptor> getPropertyDescriptors(Object object) {
- if (itemPropertyDescriptors == null) {
+ if(itemPropertyDescriptors == null) {
super.getPropertyDescriptors(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
+ * 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 -->
*
@@ -72,7 +72,7 @@ public class CanvasItemProvider extends GroupItemProvider implements IEditingDom
*/
@Override
public Collection<? extends EStructuralFeature> getChildrenFeatures(Object object) {
- if (childrenFeatures == null) {
+ if(childrenFeatures == null) {
super.getChildrenFeatures(object);
childrenFeatures.add(DGPackage.Literals.CANVAS__BOUNDS);
}
@@ -111,7 +111,7 @@ public class CanvasItemProvider extends GroupItemProvider implements IEditingDom
*/
@Override
public String getText(Object object) {
- String label = ((Canvas) object).getId();
+ String label = ((Canvas)object).getId();
return label == null || label.length() == 0 ? getString("_UI_Canvas_type") : getString("_UI_Canvas_type") + " " + label;
}
@@ -126,7 +126,7 @@ public class CanvasItemProvider extends GroupItemProvider implements IEditingDom
@Override
public void notifyChanged(Notification notification) {
updateChildren(notification);
- switch (notification.getFeatureID(Canvas.class)) {
+ switch(notification.getFeatureID(Canvas.class)) {
case DGPackage.CANVAS__BOUNDS:
fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), true, false));
return;
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 ddf4c8213e6..d0c5251a4a3 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
@@ -16,7 +16,9 @@ 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.ComposeableAdapterFactory;
import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
import org.eclipse.emf.edit.provider.IItemColorProvider;
@@ -28,7 +30,9 @@ import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;
import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
import org.eclipse.emf.edit.provider.ItemPropertyDescriptor;
import org.eclipse.emf.edit.provider.ViewerNotification;
+
import org.eclipse.papyrus.dd.dc.DCFactory;
+
import org.eclipse.papyrus.dd.dg.Circle;
import org.eclipse.papyrus.dd.dg.DGPackage;
@@ -59,7 +63,7 @@ public class CircleItemProvider extends GraphicalElementItemProvider implements
*/
@Override
public List<IItemPropertyDescriptor> getPropertyDescriptors(Object object) {
- if (itemPropertyDescriptors == null) {
+ if(itemPropertyDescriptors == null) {
super.getPropertyDescriptors(object);
addRadiusPropertyDescriptor(object);
}
@@ -73,12 +77,12 @@ 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
+ * 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 -->
*
@@ -86,7 +90,7 @@ public class CircleItemProvider extends GraphicalElementItemProvider implements
*/
@Override
public Collection<? extends EStructuralFeature> getChildrenFeatures(Object object) {
- if (childrenFeatures == null) {
+ if(childrenFeatures == null) {
super.getChildrenFeatures(object);
childrenFeatures.add(DGPackage.Literals.CIRCLE__CENTER);
}
@@ -125,7 +129,7 @@ public class CircleItemProvider extends GraphicalElementItemProvider implements
*/
@Override
public String getText(Object object) {
- String label = ((Circle) object).getId();
+ String label = ((Circle)object).getId();
return label == null || label.length() == 0 ? getString("_UI_Circle_type") : getString("_UI_Circle_type") + " " + label;
}
@@ -140,7 +144,7 @@ public class CircleItemProvider extends GraphicalElementItemProvider implements
@Override
public void notifyChanged(Notification notification) {
updateChildren(notification);
- switch (notification.getFeatureID(Circle.class)) {
+ switch(notification.getFeatureID(Circle.class)) {
case DGPackage.CIRCLE__RADIUS:
fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), false, true));
return;
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 0607b976607..f027c41ad4b 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
@@ -16,6 +16,7 @@ import java.util.List;
import org.eclipse.emf.common.notify.AdapterFactory;
import org.eclipse.emf.common.notify.Notification;
+
import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
import org.eclipse.emf.edit.provider.IItemColorProvider;
import org.eclipse.emf.edit.provider.IItemFontProvider;
@@ -24,6 +25,7 @@ import org.eclipse.emf.edit.provider.IItemPropertyDescriptor;
import org.eclipse.emf.edit.provider.IItemPropertySource;
import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;
import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
+
import org.eclipse.papyrus.dd.dg.ClipPath;
/**
@@ -53,7 +55,7 @@ public class ClipPathItemProvider extends GroupItemProvider implements IEditingD
*/
@Override
public List<IItemPropertyDescriptor> getPropertyDescriptors(Object object) {
- if (itemPropertyDescriptors == null) {
+ if(itemPropertyDescriptors == null) {
super.getPropertyDescriptors(object);
}
return itemPropertyDescriptors;
@@ -79,7 +81,7 @@ public class ClipPathItemProvider extends GroupItemProvider implements IEditingD
*/
@Override
public String getText(Object object) {
- String label = ((ClipPath) object).getId();
+ String label = ((ClipPath)object).getId();
return label == null || label.length() == 0 ? getString("_UI_ClipPath_type") : getString("_UI_ClipPath_type") + " " + label;
}
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 dc7fc69fbe8..a2efe4b72e3 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
@@ -16,6 +16,7 @@ import java.util.List;
import org.eclipse.emf.common.notify.AdapterFactory;
import org.eclipse.emf.common.notify.Notification;
+
import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
import org.eclipse.emf.edit.provider.IItemColorProvider;
import org.eclipse.emf.edit.provider.IItemFontProvider;
@@ -24,6 +25,7 @@ import org.eclipse.emf.edit.provider.IItemPropertyDescriptor;
import org.eclipse.emf.edit.provider.IItemPropertySource;
import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;
import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
+
import org.eclipse.papyrus.dd.dg.ClosePath;
/**
@@ -53,7 +55,7 @@ public class ClosePathItemProvider extends PathCommandItemProvider implements IE
*/
@Override
public List<IItemPropertyDescriptor> getPropertyDescriptors(Object object) {
- if (itemPropertyDescriptors == null) {
+ if(itemPropertyDescriptors == null) {
super.getPropertyDescriptors(object);
}
return itemPropertyDescriptors;
@@ -79,7 +81,7 @@ public class ClosePathItemProvider extends PathCommandItemProvider implements IE
*/
@Override
public String getText(Object object) {
- ClosePath closePath = (ClosePath) object;
+ ClosePath closePath = (ClosePath)object;
return getString("_UI_ClosePath_type") + " " + closePath.isRelative();
}
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 2e75778a9d6..1e92cb4f43c 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
@@ -16,7 +16,9 @@ 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;
@@ -26,7 +28,9 @@ 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.CubicCurveTo;
import org.eclipse.papyrus.dd.dg.DGPackage;
@@ -57,14 +61,15 @@ public class CubicCurveToItemProvider extends PathCommandItemProvider implements
*/
@Override
public List<IItemPropertyDescriptor> getPropertyDescriptors(Object object) {
- if (itemPropertyDescriptors == null) {
+ if(itemPropertyDescriptors == null) {
super.getPropertyDescriptors(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
+ * 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 -->
*
@@ -72,7 +77,7 @@ public class CubicCurveToItemProvider extends PathCommandItemProvider implements
*/
@Override
public Collection<? extends EStructuralFeature> getChildrenFeatures(Object object) {
- if (childrenFeatures == null) {
+ if(childrenFeatures == null) {
super.getChildrenFeatures(object);
childrenFeatures.add(DGPackage.Literals.CUBIC_CURVE_TO__START_CONTROL);
childrenFeatures.add(DGPackage.Literals.CUBIC_CURVE_TO__END_CONTROL);
@@ -113,7 +118,7 @@ public class CubicCurveToItemProvider extends PathCommandItemProvider implements
*/
@Override
public String getText(Object object) {
- CubicCurveTo cubicCurveTo = (CubicCurveTo) object;
+ CubicCurveTo cubicCurveTo = (CubicCurveTo)object;
return getString("_UI_CubicCurveTo_type") + " " + cubicCurveTo.isRelative();
}
@@ -128,7 +133,7 @@ public class CubicCurveToItemProvider extends PathCommandItemProvider implements
@Override
public void notifyChanged(Notification notification) {
updateChildren(notification);
- switch (notification.getFeatureID(CubicCurveTo.class)) {
+ switch(notification.getFeatureID(CubicCurveTo.class)) {
case DGPackage.CUBIC_CURVE_TO__START_CONTROL:
case DGPackage.CUBIC_CURVE_TO__END_CONTROL:
case DGPackage.CUBIC_CURVE_TO__POINT:
@@ -164,8 +169,8 @@ public class CubicCurveToItemProvider extends PathCommandItemProvider implements
Object childFeature = feature;
Object childObject = child;
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) });
+ if(qualify) {
+ 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 4fab4ac1631..525c0a2f06d 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
@@ -17,6 +17,7 @@ import java.util.Collection;
import org.eclipse.emf.common.notify.Adapter;
import org.eclipse.emf.common.notify.Notification;
import org.eclipse.emf.common.notify.Notifier;
+
import org.eclipse.emf.edit.provider.ChangeNotifier;
import org.eclipse.emf.edit.provider.ComposeableAdapterFactory;
import org.eclipse.emf.edit.provider.ComposedAdapterFactory;
@@ -30,6 +31,7 @@ import org.eclipse.emf.edit.provider.IItemPropertySource;
import org.eclipse.emf.edit.provider.INotifyChangedListener;
import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;
import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
+
import org.eclipse.papyrus.dd.dg.util.DGAdapterFactory;
/**
@@ -102,7 +104,7 @@ public class DGItemProviderAdapterFactory extends DGAdapterFactory implements Co
*/
@Override
public Adapter createCanvasAdapter() {
- if (canvasItemProvider == null) {
+ if(canvasItemProvider == null) {
canvasItemProvider = new CanvasItemProvider(this);
}
return canvasItemProvider;
@@ -125,7 +127,7 @@ public class DGItemProviderAdapterFactory extends DGAdapterFactory implements Co
*/
@Override
public Adapter createGroupAdapter() {
- if (groupItemProvider == null) {
+ if(groupItemProvider == null) {
groupItemProvider = new GroupItemProvider(this);
}
return groupItemProvider;
@@ -148,7 +150,7 @@ public class DGItemProviderAdapterFactory extends DGAdapterFactory implements Co
*/
@Override
public Adapter createMoveToAdapter() {
- if (moveToItemProvider == null) {
+ if(moveToItemProvider == null) {
moveToItemProvider = new MoveToItemProvider(this);
}
return moveToItemProvider;
@@ -171,7 +173,7 @@ public class DGItemProviderAdapterFactory extends DGAdapterFactory implements Co
*/
@Override
public Adapter createClipPathAdapter() {
- if (clipPathItemProvider == null) {
+ if(clipPathItemProvider == null) {
clipPathItemProvider = new ClipPathItemProvider(this);
}
return clipPathItemProvider;
@@ -194,7 +196,7 @@ public class DGItemProviderAdapterFactory extends DGAdapterFactory implements Co
*/
@Override
public Adapter createStyleAdapter() {
- if (styleItemProvider == null) {
+ if(styleItemProvider == null) {
styleItemProvider = new StyleItemProvider(this);
}
return styleItemProvider;
@@ -217,7 +219,7 @@ public class DGItemProviderAdapterFactory extends DGAdapterFactory implements Co
*/
@Override
public Adapter createPaintAdapter() {
- if (paintItemProvider == null) {
+ if(paintItemProvider == null) {
paintItemProvider = new PaintItemProvider(this);
}
return paintItemProvider;
@@ -240,7 +242,7 @@ public class DGItemProviderAdapterFactory extends DGAdapterFactory implements Co
*/
@Override
public Adapter createCircleAdapter() {
- if (circleItemProvider == null) {
+ if(circleItemProvider == null) {
circleItemProvider = new CircleItemProvider(this);
}
return circleItemProvider;
@@ -262,7 +264,7 @@ public class DGItemProviderAdapterFactory extends DGAdapterFactory implements Co
*/
@Override
public Adapter createClosePathAdapter() {
- if (closePathItemProvider == null) {
+ if(closePathItemProvider == null) {
closePathItemProvider = new ClosePathItemProvider(this);
}
return closePathItemProvider;
@@ -285,7 +287,7 @@ public class DGItemProviderAdapterFactory extends DGAdapterFactory implements Co
*/
@Override
public Adapter createCubicCurveToAdapter() {
- if (cubicCurveToItemProvider == null) {
+ if(cubicCurveToItemProvider == null) {
cubicCurveToItemProvider = new CubicCurveToItemProvider(this);
}
return cubicCurveToItemProvider;
@@ -308,7 +310,7 @@ public class DGItemProviderAdapterFactory extends DGAdapterFactory implements Co
*/
@Override
public Adapter createDefinitionsAdapter() {
- if (definitionsItemProvider == null) {
+ if(definitionsItemProvider == null) {
definitionsItemProvider = new DefinitionsItemProvider(this);
}
return definitionsItemProvider;
@@ -331,7 +333,7 @@ public class DGItemProviderAdapterFactory extends DGAdapterFactory implements Co
*/
@Override
public Adapter createStyleSheetAdapter() {
- if (styleSheetItemProvider == null) {
+ if(styleSheetItemProvider == null) {
styleSheetItemProvider = new StyleSheetItemProvider(this);
}
return styleSheetItemProvider;
@@ -353,7 +355,7 @@ public class DGItemProviderAdapterFactory extends DGAdapterFactory implements Co
*/
@Override
public Adapter createStyleRuleAdapter() {
- if (styleRuleItemProvider == null) {
+ if(styleRuleItemProvider == null) {
styleRuleItemProvider = new StyleRuleItemProvider(this);
}
return styleRuleItemProvider;
@@ -376,7 +378,7 @@ public class DGItemProviderAdapterFactory extends DGAdapterFactory implements Co
*/
@Override
public Adapter createStyleSelectorAdapter() {
- if (styleSelectorItemProvider == null) {
+ if(styleSelectorItemProvider == null) {
styleSelectorItemProvider = new StyleSelectorItemProvider(this);
}
return styleSelectorItemProvider;
@@ -399,7 +401,7 @@ public class DGItemProviderAdapterFactory extends DGAdapterFactory implements Co
*/
@Override
public Adapter createEllipseAdapter() {
- if (ellipseItemProvider == null) {
+ if(ellipseItemProvider == null) {
ellipseItemProvider = new EllipseItemProvider(this);
}
return ellipseItemProvider;
@@ -422,7 +424,7 @@ public class DGItemProviderAdapterFactory extends DGAdapterFactory implements Co
*/
@Override
public Adapter createEllipticalArcToAdapter() {
- if (ellipticalArcToItemProvider == null) {
+ if(ellipticalArcToItemProvider == null) {
ellipticalArcToItemProvider = new EllipticalArcToItemProvider(this);
}
return ellipticalArcToItemProvider;
@@ -445,7 +447,7 @@ public class DGItemProviderAdapterFactory extends DGAdapterFactory implements Co
*/
@Override
public Adapter createQuadraticCurveToAdapter() {
- if (quadraticCurveToItemProvider == null) {
+ if(quadraticCurveToItemProvider == null) {
quadraticCurveToItemProvider = new QuadraticCurveToItemProvider(this);
}
return quadraticCurveToItemProvider;
@@ -468,7 +470,7 @@ public class DGItemProviderAdapterFactory extends DGAdapterFactory implements Co
*/
@Override
public Adapter createGradientStopAdapter() {
- if (gradientStopItemProvider == null) {
+ if(gradientStopItemProvider == null) {
gradientStopItemProvider = new GradientStopItemProvider(this);
}
return gradientStopItemProvider;
@@ -491,7 +493,7 @@ public class DGItemProviderAdapterFactory extends DGAdapterFactory implements Co
*/
@Override
public Adapter createImageAdapter() {
- if (imageItemProvider == null) {
+ if(imageItemProvider == null) {
imageItemProvider = new ImageItemProvider(this);
}
return imageItemProvider;
@@ -514,7 +516,7 @@ public class DGItemProviderAdapterFactory extends DGAdapterFactory implements Co
*/
@Override
public Adapter createLineAdapter() {
- if (lineItemProvider == null) {
+ if(lineItemProvider == null) {
lineItemProvider = new LineItemProvider(this);
}
return lineItemProvider;
@@ -537,7 +539,7 @@ public class DGItemProviderAdapterFactory extends DGAdapterFactory implements Co
*/
@Override
public Adapter createMarkerAdapter() {
- if (markerItemProvider == null) {
+ if(markerItemProvider == null) {
markerItemProvider = new MarkerItemProvider(this);
}
return markerItemProvider;
@@ -560,7 +562,7 @@ public class DGItemProviderAdapterFactory extends DGAdapterFactory implements Co
*/
@Override
public Adapter createLinearGradientAdapter() {
- if (linearGradientItemProvider == null) {
+ if(linearGradientItemProvider == null) {
linearGradientItemProvider = new LinearGradientItemProvider(this);
}
return linearGradientItemProvider;
@@ -583,7 +585,7 @@ public class DGItemProviderAdapterFactory extends DGAdapterFactory implements Co
*/
@Override
public Adapter createLineToAdapter() {
- if (lineToItemProvider == null) {
+ if(lineToItemProvider == null) {
lineToItemProvider = new LineToItemProvider(this);
}
return lineToItemProvider;
@@ -606,7 +608,7 @@ public class DGItemProviderAdapterFactory extends DGAdapterFactory implements Co
*/
@Override
public Adapter createMatrixAdapter() {
- if (matrixItemProvider == null) {
+ if(matrixItemProvider == null) {
matrixItemProvider = new MatrixItemProvider(this);
}
return matrixItemProvider;
@@ -629,7 +631,7 @@ public class DGItemProviderAdapterFactory extends DGAdapterFactory implements Co
*/
@Override
public Adapter createPathAdapter() {
- if (pathItemProvider == null) {
+ if(pathItemProvider == null) {
pathItemProvider = new PathItemProvider(this);
}
return pathItemProvider;
@@ -652,7 +654,7 @@ public class DGItemProviderAdapterFactory extends DGAdapterFactory implements Co
*/
@Override
public Adapter createPatternAdapter() {
- if (patternItemProvider == null) {
+ if(patternItemProvider == null) {
patternItemProvider = new PatternItemProvider(this);
}
return patternItemProvider;
@@ -675,7 +677,7 @@ public class DGItemProviderAdapterFactory extends DGAdapterFactory implements Co
*/
@Override
public Adapter createPolygonAdapter() {
- if (polygonItemProvider == null) {
+ if(polygonItemProvider == null) {
polygonItemProvider = new PolygonItemProvider(this);
}
return polygonItemProvider;
@@ -698,7 +700,7 @@ public class DGItemProviderAdapterFactory extends DGAdapterFactory implements Co
*/
@Override
public Adapter createPolylineAdapter() {
- if (polylineItemProvider == null) {
+ if(polylineItemProvider == null) {
polylineItemProvider = new PolylineItemProvider(this);
}
return polylineItemProvider;
@@ -721,7 +723,7 @@ public class DGItemProviderAdapterFactory extends DGAdapterFactory implements Co
*/
@Override
public Adapter createRadialGradientAdapter() {
- if (radialGradientItemProvider == null) {
+ if(radialGradientItemProvider == null) {
radialGradientItemProvider = new RadialGradientItemProvider(this);
}
return radialGradientItemProvider;
@@ -743,7 +745,7 @@ public class DGItemProviderAdapterFactory extends DGAdapterFactory implements Co
*/
@Override
public Adapter createRectangleAdapter() {
- if (rectangleItemProvider == null) {
+ if(rectangleItemProvider == null) {
rectangleItemProvider = new RectangleItemProvider(this);
}
return rectangleItemProvider;
@@ -766,7 +768,7 @@ public class DGItemProviderAdapterFactory extends DGAdapterFactory implements Co
*/
@Override
public Adapter createRootCanvasAdapter() {
- if (rootCanvasItemProvider == null) {
+ if(rootCanvasItemProvider == null) {
rootCanvasItemProvider = new RootCanvasItemProvider(this);
}
return rootCanvasItemProvider;
@@ -789,7 +791,7 @@ public class DGItemProviderAdapterFactory extends DGAdapterFactory implements Co
*/
@Override
public Adapter createRotateAdapter() {
- if (rotateItemProvider == null) {
+ if(rotateItemProvider == null) {
rotateItemProvider = new RotateItemProvider(this);
}
return rotateItemProvider;
@@ -812,7 +814,7 @@ public class DGItemProviderAdapterFactory extends DGAdapterFactory implements Co
*/
@Override
public Adapter createScaleAdapter() {
- if (scaleItemProvider == null) {
+ if(scaleItemProvider == null) {
scaleItemProvider = new ScaleItemProvider(this);
}
return scaleItemProvider;
@@ -835,7 +837,7 @@ public class DGItemProviderAdapterFactory extends DGAdapterFactory implements Co
*/
@Override
public Adapter createSkewAdapter() {
- if (skewItemProvider == null) {
+ if(skewItemProvider == null) {
skewItemProvider = new SkewItemProvider(this);
}
return skewItemProvider;
@@ -858,7 +860,7 @@ public class DGItemProviderAdapterFactory extends DGAdapterFactory implements Co
*/
@Override
public Adapter createTextAdapter() {
- if (textItemProvider == null) {
+ if(textItemProvider == null) {
textItemProvider = new TextItemProvider(this);
}
return textItemProvider;
@@ -880,7 +882,7 @@ public class DGItemProviderAdapterFactory extends DGAdapterFactory implements Co
*/
@Override
public Adapter createTranslateAdapter() {
- if (translateItemProvider == null) {
+ if(translateItemProvider == null) {
translateItemProvider = new TranslateItemProvider(this);
}
return translateItemProvider;
@@ -903,7 +905,7 @@ public class DGItemProviderAdapterFactory extends DGAdapterFactory implements Co
*/
@Override
public Adapter createUseAdapter() {
- if (useItemProvider == null) {
+ if(useItemProvider == null) {
useItemProvider = new UseItemProvider(this);
}
return useItemProvider;
@@ -959,9 +961,9 @@ public class DGItemProviderAdapterFactory extends DGAdapterFactory implements Co
*/
@Override
public Object adapt(Object object, Object type) {
- if (isFactoryForType(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;
}
}
@@ -999,7 +1001,7 @@ public class DGItemProviderAdapterFactory extends DGAdapterFactory implements Co
@Override
public void fireNotifyChanged(Notification notification) {
changeNotifier.fireNotifyChanged(notification);
- if (parentAdapterFactory != null) {
+ if(parentAdapterFactory != null) {
parentAdapterFactory.fireNotifyChanged(notification);
}
}
@@ -1012,112 +1014,112 @@ public class DGItemProviderAdapterFactory extends DGAdapterFactory implements Co
*/
@Override
public void dispose() {
- if (canvasItemProvider != null) {
+ if(canvasItemProvider != null) {
canvasItemProvider.dispose();
}
- if (groupItemProvider != null) {
+ if(groupItemProvider != null) {
groupItemProvider.dispose();
}
- if (moveToItemProvider != null) {
+ if(moveToItemProvider != null) {
moveToItemProvider.dispose();
}
- if (clipPathItemProvider != null) {
+ if(clipPathItemProvider != null) {
clipPathItemProvider.dispose();
}
- if (styleItemProvider != null) {
+ if(styleItemProvider != null) {
styleItemProvider.dispose();
}
- if (paintItemProvider != null) {
+ if(paintItemProvider != null) {
paintItemProvider.dispose();
}
- if (circleItemProvider != null) {
+ if(circleItemProvider != null) {
circleItemProvider.dispose();
}
- if (closePathItemProvider != null) {
+ if(closePathItemProvider != null) {
closePathItemProvider.dispose();
}
- if (cubicCurveToItemProvider != null) {
+ if(cubicCurveToItemProvider != null) {
cubicCurveToItemProvider.dispose();
}
- if (definitionsItemProvider != null) {
+ if(definitionsItemProvider != null) {
definitionsItemProvider.dispose();
}
- if (styleSheetItemProvider != null) {
+ if(styleSheetItemProvider != null) {
styleSheetItemProvider.dispose();
}
- if (styleRuleItemProvider != null) {
+ if(styleRuleItemProvider != null) {
styleRuleItemProvider.dispose();
}
- if (styleSelectorItemProvider != null) {
+ if(styleSelectorItemProvider != null) {
styleSelectorItemProvider.dispose();
}
- if (ellipseItemProvider != null) {
+ if(ellipseItemProvider != null) {
ellipseItemProvider.dispose();
}
- if (ellipticalArcToItemProvider != null) {
+ if(ellipticalArcToItemProvider != null) {
ellipticalArcToItemProvider.dispose();
}
- if (quadraticCurveToItemProvider != null) {
+ if(quadraticCurveToItemProvider != null) {
quadraticCurveToItemProvider.dispose();
}
- if (gradientStopItemProvider != null) {
+ if(gradientStopItemProvider != null) {
gradientStopItemProvider.dispose();
}
- if (imageItemProvider != null) {
+ if(imageItemProvider != null) {
imageItemProvider.dispose();
}
- if (lineItemProvider != null) {
+ if(lineItemProvider != null) {
lineItemProvider.dispose();
}
- if (markerItemProvider != null) {
+ if(markerItemProvider != null) {
markerItemProvider.dispose();
}
- if (linearGradientItemProvider != null) {
+ if(linearGradientItemProvider != null) {
linearGradientItemProvider.dispose();
}
- if (lineToItemProvider != null) {
+ if(lineToItemProvider != null) {
lineToItemProvider.dispose();
}
- if (matrixItemProvider != null) {
+ if(matrixItemProvider != null) {
matrixItemProvider.dispose();
}
- if (pathItemProvider != null) {
+ if(pathItemProvider != null) {
pathItemProvider.dispose();
}
- if (patternItemProvider != null) {
+ if(patternItemProvider != null) {
patternItemProvider.dispose();
}
- if (polygonItemProvider != null) {
+ if(polygonItemProvider != null) {
polygonItemProvider.dispose();
}
- if (polylineItemProvider != null) {
+ if(polylineItemProvider != null) {
polylineItemProvider.dispose();
}
- if (radialGradientItemProvider != null) {
+ if(radialGradientItemProvider != null) {
radialGradientItemProvider.dispose();
}
- if (rectangleItemProvider != null) {
+ if(rectangleItemProvider != null) {
rectangleItemProvider.dispose();
}
- if (rootCanvasItemProvider != null) {
+ if(rootCanvasItemProvider != null) {
rootCanvasItemProvider.dispose();
}
- if (rotateItemProvider != null) {
+ if(rotateItemProvider != null) {
rotateItemProvider.dispose();
}
- if (scaleItemProvider != null) {
+ if(scaleItemProvider != null) {
scaleItemProvider.dispose();
}
- if (skewItemProvider != null) {
+ if(skewItemProvider != null) {
skewItemProvider.dispose();
}
- if (textItemProvider != null) {
+ if(textItemProvider != null) {
textItemProvider.dispose();
}
- if (translateItemProvider != null) {
+ if(translateItemProvider != null) {
translateItemProvider.dispose();
}
- if (useItemProvider != null) {
+ 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 eab7b7dc639..c9422976e24 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
@@ -16,7 +16,9 @@ import java.util.List;
import org.eclipse.emf.common.notify.AdapterFactory;
import org.eclipse.emf.common.notify.Notification;
+
import org.eclipse.emf.common.util.ResourceLocator;
+
import org.eclipse.emf.edit.provider.ComposeableAdapterFactory;
import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
import org.eclipse.emf.edit.provider.IItemColorProvider;
@@ -29,8 +31,10 @@ import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
import org.eclipse.emf.edit.provider.ItemPropertyDescriptor;
import org.eclipse.emf.edit.provider.ItemProviderAdapter;
import org.eclipse.emf.edit.provider.ViewerNotification;
+
import org.eclipse.papyrus.dd.dg.DGPackage;
import org.eclipse.papyrus.dd.dg.Definition;
+
import org.eclipse.papyrus.dd.edit.DDEditPlugin;
/**
@@ -60,7 +64,7 @@ public class DefinitionItemProvider extends ItemProviderAdapter implements IEdit
*/
@Override
public List<IItemPropertyDescriptor> getPropertyDescriptors(Object object) {
- if (itemPropertyDescriptors == null) {
+ if(itemPropertyDescriptors == null) {
super.getPropertyDescriptors(object);
addIdPropertyDescriptor(object);
}
@@ -75,8 +79,7 @@ public class DefinitionItemProvider extends ItemProviderAdapter implements IEdit
* @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));
}
/**
@@ -88,7 +91,7 @@ public class DefinitionItemProvider extends ItemProviderAdapter implements IEdit
*/
@Override
public String getText(Object object) {
- String label = ((Definition) object).getId();
+ String label = ((Definition)object).getId();
return label == null || label.length() == 0 ? getString("_UI_Definition_type") : getString("_UI_Definition_type") + " " + label;
}
@@ -103,7 +106,7 @@ public class DefinitionItemProvider extends ItemProviderAdapter implements IEdit
@Override
public void notifyChanged(Notification notification) {
updateChildren(notification);
- switch (notification.getFeatureID(Definition.class)) {
+ switch(notification.getFeatureID(Definition.class)) {
case DGPackage.DEFINITION__ID:
fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), false, true));
return;
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 401ff888e46..b862ce2b3a1 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
@@ -16,8 +16,11 @@ import java.util.List;
import org.eclipse.emf.common.notify.AdapterFactory;
import org.eclipse.emf.common.notify.Notification;
+
import org.eclipse.emf.common.util.ResourceLocator;
+
import org.eclipse.emf.ecore.EStructuralFeature;
+
import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
import org.eclipse.emf.edit.provider.IItemColorProvider;
import org.eclipse.emf.edit.provider.IItemFontProvider;
@@ -28,9 +31,11 @@ import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;
import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
import org.eclipse.emf.edit.provider.ItemProviderAdapter;
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.Definitions;
+
import org.eclipse.papyrus.dd.edit.DDEditPlugin;
/**
@@ -60,14 +65,15 @@ public class DefinitionsItemProvider extends ItemProviderAdapter implements IEdi
*/
@Override
public List<IItemPropertyDescriptor> getPropertyDescriptors(Object object) {
- if (itemPropertyDescriptors == null) {
+ if(itemPropertyDescriptors == null) {
super.getPropertyDescriptors(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
+ * 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 -->
*
@@ -75,9 +81,9 @@ public class DefinitionsItemProvider extends ItemProviderAdapter implements IEdi
*/
@Override
public Collection<? extends EStructuralFeature> getChildrenFeatures(Object object) {
- if (childrenFeatures == null) {
+ if(childrenFeatures == null) {
super.getChildrenFeatures(object);
- childrenFeatures.add(DGPackage.Literals.DEFINITIONS__DEFNITION);
+ childrenFeatures.add(DGPackage.Literals.DEFINITIONS__DEFINITION);
childrenFeatures.add(DGPackage.Literals.DEFINITIONS__STYLE_SHEET);
}
return childrenFeatures;
@@ -129,8 +135,8 @@ public class DefinitionsItemProvider extends ItemProviderAdapter implements IEdi
@Override
public void notifyChanged(Notification notification) {
updateChildren(notification);
- switch (notification.getFeatureID(Definitions.class)) {
- case DGPackage.DEFINITIONS__DEFNITION:
+ switch(notification.getFeatureID(Definitions.class)) {
+ case DGPackage.DEFINITIONS__DEFINITION:
case DGPackage.DEFINITIONS__STYLE_SHEET:
fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), true, false));
return;
@@ -148,24 +154,24 @@ public class DefinitionsItemProvider extends ItemProviderAdapter implements IEdi
@Override
protected void collectNewChildDescriptors(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__DEFINITION, DGFactory.eINSTANCE.createGroup()));
+ newChildDescriptors.add(createChildParameter(DGPackage.Literals.DEFINITIONS__DEFINITION, DGFactory.eINSTANCE.createCanvas()));
+ newChildDescriptors.add(createChildParameter(DGPackage.Literals.DEFINITIONS__DEFINITION, DGFactory.eINSTANCE.createClipPath()));
+ newChildDescriptors.add(createChildParameter(DGPackage.Literals.DEFINITIONS__DEFINITION, DGFactory.eINSTANCE.createCircle()));
+ newChildDescriptors.add(createChildParameter(DGPackage.Literals.DEFINITIONS__DEFINITION, DGFactory.eINSTANCE.createEllipse()));
+ newChildDescriptors.add(createChildParameter(DGPackage.Literals.DEFINITIONS__DEFINITION, DGFactory.eINSTANCE.createImage()));
+ newChildDescriptors.add(createChildParameter(DGPackage.Literals.DEFINITIONS__DEFINITION, DGFactory.eINSTANCE.createLine()));
+ newChildDescriptors.add(createChildParameter(DGPackage.Literals.DEFINITIONS__DEFINITION, DGFactory.eINSTANCE.createMarker()));
+ newChildDescriptors.add(createChildParameter(DGPackage.Literals.DEFINITIONS__DEFINITION, DGFactory.eINSTANCE.createLinearGradient()));
+ newChildDescriptors.add(createChildParameter(DGPackage.Literals.DEFINITIONS__DEFINITION, DGFactory.eINSTANCE.createPath()));
+ newChildDescriptors.add(createChildParameter(DGPackage.Literals.DEFINITIONS__DEFINITION, DGFactory.eINSTANCE.createPattern()));
+ newChildDescriptors.add(createChildParameter(DGPackage.Literals.DEFINITIONS__DEFINITION, DGFactory.eINSTANCE.createPolygon()));
+ newChildDescriptors.add(createChildParameter(DGPackage.Literals.DEFINITIONS__DEFINITION, DGFactory.eINSTANCE.createPolyline()));
+ newChildDescriptors.add(createChildParameter(DGPackage.Literals.DEFINITIONS__DEFINITION, DGFactory.eINSTANCE.createRadialGradient()));
+ newChildDescriptors.add(createChildParameter(DGPackage.Literals.DEFINITIONS__DEFINITION, DGFactory.eINSTANCE.createRectangle()));
+ newChildDescriptors.add(createChildParameter(DGPackage.Literals.DEFINITIONS__DEFINITION, DGFactory.eINSTANCE.createRootCanvas()));
+ newChildDescriptors.add(createChildParameter(DGPackage.Literals.DEFINITIONS__DEFINITION, DGFactory.eINSTANCE.createText()));
+ newChildDescriptors.add(createChildParameter(DGPackage.Literals.DEFINITIONS__DEFINITION, 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 a29e61953a9..7cc335418ad 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
@@ -16,7 +16,9 @@ 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;
@@ -26,7 +28,9 @@ 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.Ellipse;
@@ -57,14 +61,15 @@ public class EllipseItemProvider extends GraphicalElementItemProvider implements
*/
@Override
public List<IItemPropertyDescriptor> getPropertyDescriptors(Object object) {
- if (itemPropertyDescriptors == null) {
+ if(itemPropertyDescriptors == null) {
super.getPropertyDescriptors(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
+ * 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 -->
*
@@ -72,7 +77,7 @@ public class EllipseItemProvider extends GraphicalElementItemProvider implements
*/
@Override
public Collection<? extends EStructuralFeature> getChildrenFeatures(Object object) {
- if (childrenFeatures == null) {
+ if(childrenFeatures == null) {
super.getChildrenFeatures(object);
childrenFeatures.add(DGPackage.Literals.ELLIPSE__CENTER);
childrenFeatures.add(DGPackage.Literals.ELLIPSE__RADII);
@@ -112,7 +117,7 @@ public class EllipseItemProvider extends GraphicalElementItemProvider implements
*/
@Override
public String getText(Object object) {
- String label = ((Ellipse) object).getId();
+ String label = ((Ellipse)object).getId();
return label == null || label.length() == 0 ? getString("_UI_Ellipse_type") : getString("_UI_Ellipse_type") + " " + label;
}
@@ -127,7 +132,7 @@ public class EllipseItemProvider extends GraphicalElementItemProvider implements
@Override
public void notifyChanged(Notification notification) {
updateChildren(notification);
- switch (notification.getFeatureID(Ellipse.class)) {
+ switch(notification.getFeatureID(Ellipse.class)) {
case DGPackage.ELLIPSE__CENTER:
case DGPackage.ELLIPSE__RADII:
fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), true, false));
diff --git a/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/src/org/eclipse/papyrus/dd/dg/provider/EllipticalArcToItemProvider.java b/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/src/org/eclipse/papyrus/dd/dg/provider/EllipticalArcToItemProvider.java
index d5815e9d89d..b2e4f76cc32 100644
--- a/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/src/org/eclipse/papyrus/dd/dg/provider/EllipticalArcToItemProvider.java
+++ b/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/src/org/eclipse/papyrus/dd/dg/provider/EllipticalArcToItemProvider.java
@@ -16,7 +16,9 @@ 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.ComposeableAdapterFactory;
import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
import org.eclipse.emf.edit.provider.IItemColorProvider;
@@ -28,7 +30,9 @@ import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;
import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
import org.eclipse.emf.edit.provider.ItemPropertyDescriptor;
import org.eclipse.emf.edit.provider.ViewerNotification;
+
import org.eclipse.papyrus.dd.dc.DCFactory;
+
import org.eclipse.papyrus.dd.dg.DGPackage;
import org.eclipse.papyrus.dd.dg.EllipticalArcTo;
@@ -59,7 +63,7 @@ public class EllipticalArcToItemProvider extends PathCommandItemProvider impleme
*/
@Override
public List<IItemPropertyDescriptor> getPropertyDescriptors(Object object) {
- if (itemPropertyDescriptors == null) {
+ if(itemPropertyDescriptors == null) {
super.getPropertyDescriptors(object);
addRotationPropertyDescriptor(object);
addIsLargeArcPropertyDescriptor(object);
@@ -75,8 +79,7 @@ public class EllipticalArcToItemProvider extends PathCommandItemProvider impleme
* @generated
*/
protected void addRotationPropertyDescriptor(Object object) {
- 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));
+ 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));
}
/**
@@ -86,9 +89,7 @@ public class EllipticalArcToItemProvider extends PathCommandItemProvider impleme
* @generated
*/
protected void addIsLargeArcPropertyDescriptor(Object object) {
- 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));
+ 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));
}
/**
@@ -98,12 +99,12 @@ public class EllipticalArcToItemProvider extends PathCommandItemProvider impleme
* @generated
*/
protected void addIsSweepPropertyDescriptor(Object object) {
- 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));
+ 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
+ * 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 -->
*
@@ -111,7 +112,7 @@ public class EllipticalArcToItemProvider extends PathCommandItemProvider impleme
*/
@Override
public Collection<? extends EStructuralFeature> getChildrenFeatures(Object object) {
- if (childrenFeatures == null) {
+ if(childrenFeatures == null) {
super.getChildrenFeatures(object);
childrenFeatures.add(DGPackage.Literals.ELLIPTICAL_ARC_TO__RADII);
childrenFeatures.add(DGPackage.Literals.ELLIPTICAL_ARC_TO__POINT);
@@ -152,7 +153,7 @@ public class EllipticalArcToItemProvider extends PathCommandItemProvider impleme
*/
@Override
public String getText(Object object) {
- EllipticalArcTo ellipticalArcTo = (EllipticalArcTo) object;
+ EllipticalArcTo ellipticalArcTo = (EllipticalArcTo)object;
return getString("_UI_EllipticalArcTo_type") + " " + ellipticalArcTo.isRelative();
}
@@ -167,7 +168,7 @@ public class EllipticalArcToItemProvider extends PathCommandItemProvider impleme
@Override
public void notifyChanged(Notification notification) {
updateChildren(notification);
- switch (notification.getFeatureID(EllipticalArcTo.class)) {
+ 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:
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 dd72fbbc60c..57bc0b8f735 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,7 +13,6 @@ 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;
@@ -57,14 +56,15 @@ public class GradientItemProvider extends PaintServerItemProvider implements IEd
*/
@Override
public List<IItemPropertyDescriptor> getPropertyDescriptors(Object object) {
- if (itemPropertyDescriptors == null) {
+ if(itemPropertyDescriptors == null) {
super.getPropertyDescriptors(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
+ * 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 -->
*
@@ -72,7 +72,7 @@ public class GradientItemProvider extends PaintServerItemProvider implements IEd
*/
@Override
public Collection<? extends EStructuralFeature> getChildrenFeatures(Object object) {
- if (childrenFeatures == null) {
+ if(childrenFeatures == null) {
super.getChildrenFeatures(object);
childrenFeatures.add(DGPackage.Literals.GRADIENT__STOP);
}
@@ -100,7 +100,7 @@ public class GradientItemProvider extends PaintServerItemProvider implements IEd
*/
@Override
public String getText(Object object) {
- String label = ((Gradient) object).getId();
+ String label = ((Gradient)object).getId();
return label == null || label.length() == 0 ? getString("_UI_Gradient_type") : getString("_UI_Gradient_type") + " " + label;
}
@@ -115,7 +115,7 @@ public class GradientItemProvider extends PaintServerItemProvider implements IEd
@Override
public void notifyChanged(Notification notification) {
updateChildren(notification);
- switch (notification.getFeatureID(Gradient.class)) {
+ switch(notification.getFeatureID(Gradient.class)) {
case DGPackage.GRADIENT__STOP:
fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), true, false));
return;
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 f0210465dd6..9299073ebfd 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
@@ -12,12 +12,15 @@
package org.eclipse.papyrus.dd.dg.provider;
import java.awt.Color;
+
import java.util.Collection;
import java.util.List;
import org.eclipse.emf.common.notify.AdapterFactory;
import org.eclipse.emf.common.notify.Notification;
+
import org.eclipse.emf.common.util.ResourceLocator;
+
import org.eclipse.emf.edit.provider.ComposeableAdapterFactory;
import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
import org.eclipse.emf.edit.provider.IItemColorProvider;
@@ -30,8 +33,10 @@ import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
import org.eclipse.emf.edit.provider.ItemPropertyDescriptor;
import org.eclipse.emf.edit.provider.ItemProviderAdapter;
import org.eclipse.emf.edit.provider.ViewerNotification;
+
import org.eclipse.papyrus.dd.dg.DGPackage;
import org.eclipse.papyrus.dd.dg.GradientStop;
+
import org.eclipse.papyrus.dd.edit.DDEditPlugin;
/**
@@ -61,7 +66,7 @@ public class GradientStopItemProvider extends ItemProviderAdapter implements IEd
*/
@Override
public List<IItemPropertyDescriptor> getPropertyDescriptors(Object object) {
- if (itemPropertyDescriptors == null) {
+ if(itemPropertyDescriptors == null) {
super.getPropertyDescriptors(object);
addColorPropertyDescriptor(object);
addOffsetPropertyDescriptor(object);
@@ -77,8 +82,7 @@ public class GradientStopItemProvider extends ItemProviderAdapter implements IEd
* @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));
}
/**
@@ -88,8 +92,7 @@ public class GradientStopItemProvider extends ItemProviderAdapter implements IEd
* @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));
}
/**
@@ -99,8 +102,7 @@ public class GradientStopItemProvider extends ItemProviderAdapter implements IEd
* @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));
}
/**
@@ -123,7 +125,7 @@ public class GradientStopItemProvider extends ItemProviderAdapter implements IEd
*/
@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;
}
@@ -139,7 +141,7 @@ public class GradientStopItemProvider extends ItemProviderAdapter implements IEd
@Override
public void notifyChanged(Notification notification) {
updateChildren(notification);
- switch (notification.getFeatureID(GradientStop.class)) {
+ switch(notification.getFeatureID(GradientStop.class)) {
case DGPackage.GRADIENT_STOP__COLOR:
case DGPackage.GRADIENT_STOP__OFFSET:
case DGPackage.GRADIENT_STOP__OPACITY:
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 7baa45c9ace..3421e88e0e5 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
@@ -58,7 +58,7 @@ public class GraphicalElementItemProvider extends DefinitionItemProvider impleme
*/
@Override
public List<IItemPropertyDescriptor> getPropertyDescriptors(Object object) {
- if (itemPropertyDescriptors == null) {
+ if(itemPropertyDescriptors == null) {
super.getPropertyDescriptors(object);
addClipPathPropertyDescriptor(object);
addClassPropertyDescriptor(object);
@@ -74,8 +74,7 @@ public class GraphicalElementItemProvider extends DefinitionItemProvider impleme
* @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));
}
/**
@@ -85,8 +84,7 @@ public class GraphicalElementItemProvider extends DefinitionItemProvider impleme
* @generated
*/
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));
+ 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));
}
/**
@@ -97,13 +95,12 @@ public class GraphicalElementItemProvider extends DefinitionItemProvider impleme
* @generated
*/
protected void addLayoutDataPropertyDescriptor(Object object) {
- itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(), getString("_UI_GraphicalElement_layoutData_feature"),
- getString("_UI_PropertyDescriptor_description", "_UI_GraphicalElement_layoutData_feature", "_UI_GraphicalElement_type"), DGPackage.Literals.GRAPHICAL_ELEMENT__LAYOUT_DATA, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null,
- null));
+ itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(), getResourceLocator(), getString("_UI_GraphicalElement_layoutData_feature"), getString("_UI_PropertyDescriptor_description", "_UI_GraphicalElement_layoutData_feature", "_UI_GraphicalElement_type"), DGPackage.Literals.GRAPHICAL_ELEMENT__LAYOUT_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
+ * 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 -->
*
@@ -111,7 +108,7 @@ public class GraphicalElementItemProvider extends DefinitionItemProvider impleme
*/
@Override
public Collection<? extends EStructuralFeature> getChildrenFeatures(Object object) {
- if (childrenFeatures == null) {
+ if(childrenFeatures == null) {
super.getChildrenFeatures(object);
childrenFeatures.add(DGPackage.Literals.GRAPHICAL_ELEMENT__STYLE);
childrenFeatures.add(DGPackage.Literals.GRAPHICAL_ELEMENT__TRANSFORM);
@@ -140,7 +137,7 @@ public class GraphicalElementItemProvider extends DefinitionItemProvider impleme
*/
@Override
public String getText(Object object) {
- String label = getLabel((GraphicalElement) object);
+ String label = getLabel((GraphicalElement)object);
return label == null || label.length() == 0 ? getString("_UI_GraphicalElement_type") : getString("_UI_GraphicalElement_type") + " " + label;
}
@@ -148,16 +145,16 @@ public class GraphicalElementItemProvider extends DefinitionItemProvider impleme
* Get the label of the given graphical element
*
* @param element
- * The graphical element
+ * The graphical element
* @return String label of the graphical element
*/
protected String getLabel(GraphicalElement element) {
String label = "";
- if (element.getId() != null) {
+ if(element.getId() != null) {
label += "id=" + element.getId();
}
- if (!element.getClasses().isEmpty()) {
- if (label.length() > 0) {
+ if(!element.getClasses().isEmpty()) {
+ if(label.length() > 0) {
label += ", ";
}
label += joinString("class", element.getClasses(), ",");
@@ -167,7 +164,7 @@ public class GraphicalElementItemProvider extends DefinitionItemProvider impleme
private String joinString(String key, Collection<String> values, String sep) {
String s = "";
- for (String v : values) {
+ for(String v : values) {
s += (s.length() > 0) ? ", " + v : v;
}
return key + "=" + s;
@@ -184,7 +181,7 @@ public class GraphicalElementItemProvider extends DefinitionItemProvider impleme
@Override
public void notifyChanged(Notification notification) {
updateChildren(notification);
- switch (notification.getFeatureID(GraphicalElement.class)) {
+ switch(notification.getFeatureID(GraphicalElement.class)) {
case DGPackage.GRAPHICAL_ELEMENT__CLASS:
case DGPackage.GRAPHICAL_ELEMENT__LAYOUT_DATA:
fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), false, true));
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 0fb67d18452..af3a328cf61 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
@@ -16,7 +16,9 @@ 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.ComposeableAdapterFactory;
import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
import org.eclipse.emf.edit.provider.IItemColorProvider;
@@ -28,6 +30,7 @@ import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;
import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
import org.eclipse.emf.edit.provider.ItemPropertyDescriptor;
import org.eclipse.emf.edit.provider.ViewerNotification;
+
import org.eclipse.papyrus.dd.dg.DGFactory;
import org.eclipse.papyrus.dd.dg.DGPackage;
import org.eclipse.papyrus.dd.dg.Group;
@@ -59,7 +62,7 @@ public class GroupItemProvider extends GraphicalElementItemProvider implements I
*/
@Override
public List<IItemPropertyDescriptor> getPropertyDescriptors(Object object) {
- if (itemPropertyDescriptors == null) {
+ if(itemPropertyDescriptors == null) {
super.getPropertyDescriptors(object);
addLayoutPropertyDescriptor(object);
}
@@ -74,12 +77,12 @@ public class GroupItemProvider extends GraphicalElementItemProvider implements I
* @generated
*/
protected void addLayoutPropertyDescriptor(Object object) {
- itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(), getString("_UI_Group_layout_feature"),
- getString("_UI_PropertyDescriptor_description", "_UI_Group_layout_feature", "_UI_Group_type"), DGPackage.Literals.GROUP__LAYOUT, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null));
+ itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(), getResourceLocator(), getString("_UI_Group_layout_feature"), getString("_UI_PropertyDescriptor_description", "_UI_Group_layout_feature", "_UI_Group_type"), DGPackage.Literals.GROUP__LAYOUT, 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
+ * 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 -->
*
@@ -87,7 +90,7 @@ public class GroupItemProvider extends GraphicalElementItemProvider implements I
*/
@Override
public Collection<? extends EStructuralFeature> getChildrenFeatures(Object object) {
- if (childrenFeatures == null) {
+ if(childrenFeatures == null) {
super.getChildrenFeatures(object);
childrenFeatures.add(DGPackage.Literals.GROUP__MEMBER);
}
@@ -126,7 +129,7 @@ public class GroupItemProvider extends GraphicalElementItemProvider implements I
*/
@Override
public String getText(Object object) {
- String label = getLabel((Group) object);
+ String label = getLabel((Group)object);
return label == null || label.length() == 0 ? getString("_UI_Group_type") : getString("_UI_Group_type") + " " + label;
}
@@ -141,7 +144,7 @@ public class GroupItemProvider extends GraphicalElementItemProvider implements I
@Override
public void notifyChanged(Notification notification) {
updateChildren(notification);
- switch (notification.getFeatureID(Group.class)) {
+ switch(notification.getFeatureID(Group.class)) {
case DGPackage.GROUP__LAYOUT:
fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), false, true));
return;
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 21796e8c30f..da886cf32af 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
@@ -16,7 +16,9 @@ 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.ComposeableAdapterFactory;
import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
import org.eclipse.emf.edit.provider.IItemColorProvider;
@@ -28,7 +30,9 @@ import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;
import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
import org.eclipse.emf.edit.provider.ItemPropertyDescriptor;
import org.eclipse.emf.edit.provider.ViewerNotification;
+
import org.eclipse.papyrus.dd.dc.DCFactory;
+
import org.eclipse.papyrus.dd.dg.DGPackage;
import org.eclipse.papyrus.dd.dg.Image;
@@ -59,7 +63,7 @@ public class ImageItemProvider extends GraphicalElementItemProvider implements I
*/
@Override
public List<IItemPropertyDescriptor> getPropertyDescriptors(Object object) {
- if (itemPropertyDescriptors == null) {
+ if(itemPropertyDescriptors == null) {
super.getPropertyDescriptors(object);
addSourcePropertyDescriptor(object);
addIsAspectRatioPreservedPropertyDescriptor(object);
@@ -74,8 +78,7 @@ public class ImageItemProvider extends GraphicalElementItemProvider implements I
* @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));
}
/**
@@ -85,12 +88,12 @@ public class ImageItemProvider extends GraphicalElementItemProvider implements I
* @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
+ * 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 -->
*
@@ -98,7 +101,7 @@ public class ImageItemProvider extends GraphicalElementItemProvider implements I
*/
@Override
public Collection<? extends EStructuralFeature> getChildrenFeatures(Object object) {
- if (childrenFeatures == null) {
+ if(childrenFeatures == null) {
super.getChildrenFeatures(object);
childrenFeatures.add(DGPackage.Literals.IMAGE__BOUNDS);
}
@@ -137,7 +140,7 @@ public class ImageItemProvider extends GraphicalElementItemProvider implements I
*/
@Override
public String getText(Object object) {
- String label = ((Image) object).getId();
+ String label = ((Image)object).getId();
return label == null || label.length() == 0 ? getString("_UI_Image_type") : getString("_UI_Image_type") + " " + label;
}
@@ -152,7 +155,7 @@ public class ImageItemProvider extends GraphicalElementItemProvider implements I
@Override
public void notifyChanged(Notification notification) {
updateChildren(notification);
- switch (notification.getFeatureID(Image.class)) {
+ switch(notification.getFeatureID(Image.class)) {
case DGPackage.IMAGE__SOURCE:
case DGPackage.IMAGE__IS_ASPECT_RATIO_PRESERVED:
fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), false, true));
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 5034bd870f1..d774b67915f 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
@@ -16,7 +16,9 @@ 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;
@@ -26,7 +28,9 @@ 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.Line;
@@ -57,14 +61,15 @@ public class LineItemProvider extends MarkedElementItemProvider implements IEdit
*/
@Override
public List<IItemPropertyDescriptor> getPropertyDescriptors(Object object) {
- if (itemPropertyDescriptors == null) {
+ if(itemPropertyDescriptors == null) {
super.getPropertyDescriptors(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
+ * 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 -->
*
@@ -72,7 +77,7 @@ public class LineItemProvider extends MarkedElementItemProvider implements IEdit
*/
@Override
public Collection<? extends EStructuralFeature> getChildrenFeatures(Object object) {
- if (childrenFeatures == null) {
+ if(childrenFeatures == null) {
super.getChildrenFeatures(object);
childrenFeatures.add(DGPackage.Literals.LINE__START);
childrenFeatures.add(DGPackage.Literals.LINE__END);
@@ -112,7 +117,7 @@ public class LineItemProvider extends MarkedElementItemProvider implements IEdit
*/
@Override
public String getText(Object object) {
- String label = ((Line) object).getId();
+ String label = ((Line)object).getId();
return label == null || label.length() == 0 ? getString("_UI_Line_type") : getString("_UI_Line_type") + " " + label;
}
@@ -127,7 +132,7 @@ public class LineItemProvider extends MarkedElementItemProvider implements IEdit
@Override
public void notifyChanged(Notification notification) {
updateChildren(notification);
- switch (notification.getFeatureID(Line.class)) {
+ switch(notification.getFeatureID(Line.class)) {
case DGPackage.LINE__START:
case DGPackage.LINE__END:
fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), true, false));
@@ -161,8 +166,8 @@ public class LineItemProvider extends MarkedElementItemProvider implements IEdit
Object childFeature = feature;
Object childObject = child;
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) });
+ if(qualify) {
+ 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 8f22bb620f5..f67bf88b210 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
@@ -16,7 +16,9 @@ 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;
@@ -26,7 +28,9 @@ 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.LineTo;
@@ -57,14 +61,15 @@ public class LineToItemProvider extends PathCommandItemProvider implements IEdit
*/
@Override
public List<IItemPropertyDescriptor> getPropertyDescriptors(Object object) {
- if (itemPropertyDescriptors == null) {
+ if(itemPropertyDescriptors == null) {
super.getPropertyDescriptors(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
+ * 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 -->
*
@@ -72,7 +77,7 @@ public class LineToItemProvider extends PathCommandItemProvider implements IEdit
*/
@Override
public Collection<? extends EStructuralFeature> getChildrenFeatures(Object object) {
- if (childrenFeatures == null) {
+ if(childrenFeatures == null) {
super.getChildrenFeatures(object);
childrenFeatures.add(DGPackage.Literals.LINE_TO__POINT);
}
@@ -111,7 +116,7 @@ public class LineToItemProvider extends PathCommandItemProvider implements IEdit
*/
@Override
public String getText(Object object) {
- LineTo lineTo = (LineTo) object;
+ LineTo lineTo = (LineTo)object;
return getString("_UI_LineTo_type") + " " + lineTo.isRelative();
}
@@ -126,7 +131,7 @@ public class LineToItemProvider extends PathCommandItemProvider implements IEdit
@Override
public void notifyChanged(Notification notification) {
updateChildren(notification);
- switch (notification.getFeatureID(LineTo.class)) {
+ switch(notification.getFeatureID(LineTo.class)) {
case DGPackage.LINE_TO__POINT:
fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), true, false));
return;
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 64545d5edb5..5f86fd32d3f 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,7 +13,6 @@ 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;
@@ -57,14 +56,15 @@ public class LinearGradientItemProvider extends GradientItemProvider implements
*/
@Override
public List<IItemPropertyDescriptor> getPropertyDescriptors(Object object) {
- if (itemPropertyDescriptors == null) {
+ if(itemPropertyDescriptors == null) {
super.getPropertyDescriptors(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
+ * 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 -->
*
@@ -72,7 +72,7 @@ public class LinearGradientItemProvider extends GradientItemProvider implements
*/
@Override
public Collection<? extends EStructuralFeature> getChildrenFeatures(Object object) {
- if (childrenFeatures == null) {
+ if(childrenFeatures == null) {
super.getChildrenFeatures(object);
childrenFeatures.add(DGPackage.Literals.LINEAR_GRADIENT__START);
childrenFeatures.add(DGPackage.Literals.LINEAR_GRADIENT__END);
@@ -113,7 +113,7 @@ public class LinearGradientItemProvider extends GradientItemProvider implements
*/
@Override
public String getText(Object object) {
- String label = ((LinearGradient) object).getId();
+ String label = ((LinearGradient)object).getId();
return label == null || label.length() == 0 ? getString("_UI_LinearGradient_type") : getString("_UI_LinearGradient_type") + " " + label;
}
@@ -128,7 +128,7 @@ public class LinearGradientItemProvider extends GradientItemProvider implements
@Override
public void notifyChanged(Notification notification) {
updateChildren(notification);
- switch (notification.getFeatureID(LinearGradient.class)) {
+ switch(notification.getFeatureID(LinearGradient.class)) {
case DGPackage.LINEAR_GRADIENT__START:
case DGPackage.LINEAR_GRADIENT__END:
fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), true, false));
@@ -162,8 +162,8 @@ 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;
- if (qualify) {
- return getString("_UI_CreateChild_text2", new Object[] { getTypeText(childObject), getFeatureText(childFeature), getTypeText(owner) });
+ if(qualify) {
+ 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 8826109e9ac..7d79f6a6e18 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
@@ -16,6 +16,7 @@ import java.util.List;
import org.eclipse.emf.common.notify.AdapterFactory;
import org.eclipse.emf.common.notify.Notification;
+
import org.eclipse.emf.edit.provider.ComposeableAdapterFactory;
import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
import org.eclipse.emf.edit.provider.IItemColorProvider;
@@ -25,6 +26,7 @@ import org.eclipse.emf.edit.provider.IItemPropertyDescriptor;
import org.eclipse.emf.edit.provider.IItemPropertySource;
import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;
import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
+
import org.eclipse.papyrus.dd.dg.DGPackage;
import org.eclipse.papyrus.dd.dg.MarkedElement;
@@ -55,7 +57,7 @@ public class MarkedElementItemProvider extends GraphicalElementItemProvider impl
*/
@Override
public List<IItemPropertyDescriptor> getPropertyDescriptors(Object object) {
- if (itemPropertyDescriptors == null) {
+ if(itemPropertyDescriptors == null) {
super.getPropertyDescriptors(object);
addEndMarkerPropertyDescriptor(object);
addMidMarkerPropertyDescriptor(object);
@@ -71,8 +73,7 @@ public class MarkedElementItemProvider extends GraphicalElementItemProvider impl
* @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));
}
/**
@@ -82,8 +83,7 @@ public class MarkedElementItemProvider extends GraphicalElementItemProvider impl
* @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));
}
/**
@@ -93,8 +93,7 @@ public class MarkedElementItemProvider extends GraphicalElementItemProvider impl
* @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));
}
/**
@@ -106,7 +105,7 @@ public class MarkedElementItemProvider extends GraphicalElementItemProvider impl
*/
@Override
public String getText(Object object) {
- String label = ((MarkedElement) object).getId();
+ String label = ((MarkedElement)object).getId();
return label == null || label.length() == 0 ? getString("_UI_MarkedElement_type") : getString("_UI_MarkedElement_type") + " " + label;
}
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 4e6d4b36b0a..da25267e1c7 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
@@ -16,7 +16,9 @@ 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;
@@ -26,7 +28,9 @@ 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.Marker;
@@ -57,14 +61,15 @@ public class MarkerItemProvider extends GroupItemProvider implements IEditingDom
*/
@Override
public List<IItemPropertyDescriptor> getPropertyDescriptors(Object object) {
- if (itemPropertyDescriptors == null) {
+ if(itemPropertyDescriptors == null) {
super.getPropertyDescriptors(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
+ * 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 -->
*
@@ -72,7 +77,7 @@ public class MarkerItemProvider extends GroupItemProvider implements IEditingDom
*/
@Override
public Collection<? extends EStructuralFeature> getChildrenFeatures(Object object) {
- if (childrenFeatures == null) {
+ if(childrenFeatures == null) {
super.getChildrenFeatures(object);
childrenFeatures.add(DGPackage.Literals.MARKER__SIZE);
childrenFeatures.add(DGPackage.Literals.MARKER__REFERENCE);
@@ -112,7 +117,7 @@ public class MarkerItemProvider extends GroupItemProvider implements IEditingDom
*/
@Override
public String getText(Object object) {
- String label = ((Marker) object).getId();
+ String label = ((Marker)object).getId();
return label == null || label.length() == 0 ? getString("_UI_Marker_type") : getString("_UI_Marker_type") + " " + label;
}
@@ -127,7 +132,7 @@ public class MarkerItemProvider extends GroupItemProvider implements IEditingDom
@Override
public void notifyChanged(Notification notification) {
updateChildren(notification);
- switch (notification.getFeatureID(Marker.class)) {
+ switch(notification.getFeatureID(Marker.class)) {
case DGPackage.MARKER__SIZE:
case DGPackage.MARKER__REFERENCE:
fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), true, false));
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 536f93e59ce..cc635b37052 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
@@ -16,6 +16,7 @@ import java.util.List;
import org.eclipse.emf.common.notify.AdapterFactory;
import org.eclipse.emf.common.notify.Notification;
+
import org.eclipse.emf.edit.provider.ComposeableAdapterFactory;
import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
import org.eclipse.emf.edit.provider.IItemColorProvider;
@@ -27,6 +28,7 @@ import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;
import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
import org.eclipse.emf.edit.provider.ItemPropertyDescriptor;
import org.eclipse.emf.edit.provider.ViewerNotification;
+
import org.eclipse.papyrus.dd.dg.DGPackage;
import org.eclipse.papyrus.dd.dg.Matrix;
@@ -57,7 +59,7 @@ public class MatrixItemProvider extends TransformItemProvider implements IEditin
*/
@Override
public List<IItemPropertyDescriptor> getPropertyDescriptors(Object object) {
- if (itemPropertyDescriptors == null) {
+ if(itemPropertyDescriptors == null) {
super.getPropertyDescriptors(object);
addAPropertyDescriptor(object);
addBPropertyDescriptor(object);
@@ -77,8 +79,7 @@ public class MatrixItemProvider extends TransformItemProvider implements IEditin
* @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));
}
/**
@@ -89,8 +90,7 @@ public class MatrixItemProvider extends TransformItemProvider implements IEditin
* @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));
}
/**
@@ -101,8 +101,7 @@ public class MatrixItemProvider extends TransformItemProvider implements IEditin
* @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));
}
/**
@@ -113,8 +112,7 @@ public class MatrixItemProvider extends TransformItemProvider implements IEditin
* @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));
}
/**
@@ -125,8 +123,7 @@ public class MatrixItemProvider extends TransformItemProvider implements IEditin
* @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));
}
/**
@@ -137,8 +134,7 @@ public class MatrixItemProvider extends TransformItemProvider implements IEditin
* @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));
}
/**
@@ -161,7 +157,7 @@ public class MatrixItemProvider extends TransformItemProvider implements IEditin
*/
@Override
public String getText(Object object) {
- Matrix matrix = (Matrix) object;
+ Matrix matrix = (Matrix)object;
return getString("_UI_Matrix_type") + " " + matrix.getA();
}
@@ -176,7 +172,7 @@ public class MatrixItemProvider extends TransformItemProvider implements IEditin
@Override
public void notifyChanged(Notification notification) {
updateChildren(notification);
- switch (notification.getFeatureID(Matrix.class)) {
+ switch(notification.getFeatureID(Matrix.class)) {
case DGPackage.MATRIX__A:
case DGPackage.MATRIX__B:
case DGPackage.MATRIX__C:
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 a0493f978e1..7a452720b4f 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
@@ -16,7 +16,9 @@ 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;
@@ -26,7 +28,9 @@ 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.MoveTo;
@@ -57,14 +61,15 @@ public class MoveToItemProvider extends PathCommandItemProvider implements IEdit
*/
@Override
public List<IItemPropertyDescriptor> getPropertyDescriptors(Object object) {
- if (itemPropertyDescriptors == null) {
+ if(itemPropertyDescriptors == null) {
super.getPropertyDescriptors(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
+ * 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 -->
*
@@ -72,7 +77,7 @@ public class MoveToItemProvider extends PathCommandItemProvider implements IEdit
*/
@Override
public Collection<? extends EStructuralFeature> getChildrenFeatures(Object object) {
- if (childrenFeatures == null) {
+ if(childrenFeatures == null) {
super.getChildrenFeatures(object);
childrenFeatures.add(DGPackage.Literals.MOVE_TO__POINT);
}
@@ -111,7 +116,7 @@ public class MoveToItemProvider extends PathCommandItemProvider implements IEdit
*/
@Override
public String getText(Object object) {
- MoveTo moveTo = (MoveTo) object;
+ MoveTo moveTo = (MoveTo)object;
return getString("_UI_MoveTo_type") + " " + moveTo.isRelative();
}
@@ -126,7 +131,7 @@ public class MoveToItemProvider extends PathCommandItemProvider implements IEdit
@Override
public void notifyChanged(Notification notification) {
updateChildren(notification);
- switch (notification.getFeatureID(MoveTo.class)) {
+ switch(notification.getFeatureID(MoveTo.class)) {
case DGPackage.MOVE_TO__POINT:
fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), true, false));
return;
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 2809a9399e8..eb47124fcb1 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
@@ -12,12 +12,15 @@
package org.eclipse.papyrus.dd.dg.provider;
import java.awt.Color;
+
import java.util.Collection;
import java.util.List;
import org.eclipse.emf.common.notify.AdapterFactory;
import org.eclipse.emf.common.notify.Notification;
+
import org.eclipse.emf.common.util.ResourceLocator;
+
import org.eclipse.emf.edit.provider.ComposeableAdapterFactory;
import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
import org.eclipse.emf.edit.provider.IItemColorProvider;
@@ -30,8 +33,10 @@ import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
import org.eclipse.emf.edit.provider.ItemPropertyDescriptor;
import org.eclipse.emf.edit.provider.ItemProviderAdapter;
import org.eclipse.emf.edit.provider.ViewerNotification;
+
import org.eclipse.papyrus.dd.dg.DGPackage;
import org.eclipse.papyrus.dd.dg.Paint;
+
import org.eclipse.papyrus.dd.edit.DDEditPlugin;
/**
@@ -61,7 +66,7 @@ public class PaintItemProvider extends ItemProviderAdapter implements IEditingDo
*/
@Override
public List<IItemPropertyDescriptor> getPropertyDescriptors(Object object) {
- if (itemPropertyDescriptors == null) {
+ if(itemPropertyDescriptors == null) {
super.getPropertyDescriptors(object);
addColorPropertyDescriptor(object);
addPaintServerPropertyDescriptor(object);
@@ -76,8 +81,7 @@ public class PaintItemProvider extends ItemProviderAdapter implements IEditingDo
* @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));
}
/**
@@ -87,8 +91,7 @@ public class PaintItemProvider extends ItemProviderAdapter implements IEditingDo
* @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));
}
/**
@@ -111,7 +114,7 @@ public class PaintItemProvider extends ItemProviderAdapter implements IEditingDo
*/
@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;
}
@@ -127,7 +130,7 @@ public class PaintItemProvider extends ItemProviderAdapter implements IEditingDo
@Override
public void notifyChanged(Notification notification) {
updateChildren(notification);
- switch (notification.getFeatureID(Paint.class)) {
+ switch(notification.getFeatureID(Paint.class)) {
case DGPackage.PAINT__COLOR:
fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), false, true));
return;
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 d9120757a29..b8ba9a9ca8b 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
@@ -16,7 +16,9 @@ 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;
@@ -26,6 +28,7 @@ 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.PaintServer;
@@ -57,14 +60,15 @@ public class PaintServerItemProvider extends DefinitionItemProvider implements I
*/
@Override
public List<IItemPropertyDescriptor> getPropertyDescriptors(Object object) {
- if (itemPropertyDescriptors == null) {
+ if(itemPropertyDescriptors == null) {
super.getPropertyDescriptors(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
+ * 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 -->
*
@@ -72,7 +76,7 @@ public class PaintServerItemProvider extends DefinitionItemProvider implements I
*/
@Override
public Collection<? extends EStructuralFeature> getChildrenFeatures(Object object) {
- if (childrenFeatures == null) {
+ if(childrenFeatures == null) {
super.getChildrenFeatures(object);
childrenFeatures.add(DGPackage.Literals.PAINT_SERVER__TRANSFORM);
}
@@ -100,7 +104,7 @@ public class PaintServerItemProvider extends DefinitionItemProvider implements I
*/
@Override
public String getText(Object object) {
- String label = ((PaintServer) object).getId();
+ String label = ((PaintServer)object).getId();
return label == null || label.length() == 0 ? getString("_UI_PaintServer_type") : getString("_UI_PaintServer_type") + " " + label;
}
@@ -115,7 +119,7 @@ public class PaintServerItemProvider extends DefinitionItemProvider implements I
@Override
public void notifyChanged(Notification notification) {
updateChildren(notification);
- switch (notification.getFeatureID(PaintServer.class)) {
+ switch(notification.getFeatureID(PaintServer.class)) {
case DGPackage.PAINT_SERVER__TRANSFORM:
fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), true, false));
return;
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 564ed12a14a..45f01fd11d6 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
@@ -16,7 +16,9 @@ import java.util.List;
import org.eclipse.emf.common.notify.AdapterFactory;
import org.eclipse.emf.common.notify.Notification;
+
import org.eclipse.emf.common.util.ResourceLocator;
+
import org.eclipse.emf.edit.provider.ComposeableAdapterFactory;
import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
import org.eclipse.emf.edit.provider.IItemColorProvider;
@@ -29,8 +31,10 @@ import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
import org.eclipse.emf.edit.provider.ItemPropertyDescriptor;
import org.eclipse.emf.edit.provider.ItemProviderAdapter;
import org.eclipse.emf.edit.provider.ViewerNotification;
+
import org.eclipse.papyrus.dd.dg.DGPackage;
import org.eclipse.papyrus.dd.dg.PathCommand;
+
import org.eclipse.papyrus.dd.edit.DDEditPlugin;
/**
@@ -60,7 +64,7 @@ public class PathCommandItemProvider extends ItemProviderAdapter implements IEdi
*/
@Override
public List<IItemPropertyDescriptor> getPropertyDescriptors(Object object) {
- if (itemPropertyDescriptors == null) {
+ if(itemPropertyDescriptors == null) {
super.getPropertyDescriptors(object);
addIsRelativePropertyDescriptor(object);
}
@@ -74,8 +78,7 @@ public class PathCommandItemProvider extends ItemProviderAdapter implements IEdi
* @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));
}
/**
@@ -87,7 +90,7 @@ public class PathCommandItemProvider extends ItemProviderAdapter implements IEdi
*/
@Override
public String getText(Object object) {
- PathCommand pathCommand = (PathCommand) object;
+ PathCommand pathCommand = (PathCommand)object;
return getString("_UI_PathCommand_type") + " " + pathCommand.isRelative();
}
@@ -102,7 +105,7 @@ public class PathCommandItemProvider extends ItemProviderAdapter implements IEdi
@Override
public void notifyChanged(Notification notification) {
updateChildren(notification);
- switch (notification.getFeatureID(PathCommand.class)) {
+ switch(notification.getFeatureID(PathCommand.class)) {
case DGPackage.PATH_COMMAND__IS_RELATIVE:
fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), false, true));
return;
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 f3b6cd8166a..3a25413ec3b 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
@@ -16,7 +16,9 @@ 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;
@@ -26,6 +28,7 @@ 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.Path;
@@ -57,14 +60,15 @@ public class PathItemProvider extends MarkedElementItemProvider implements IEdit
*/
@Override
public List<IItemPropertyDescriptor> getPropertyDescriptors(Object object) {
- if (itemPropertyDescriptors == null) {
+ if(itemPropertyDescriptors == null) {
super.getPropertyDescriptors(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
+ * 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 -->
*
@@ -72,7 +76,7 @@ public class PathItemProvider extends MarkedElementItemProvider implements IEdit
*/
@Override
public Collection<? extends EStructuralFeature> getChildrenFeatures(Object object) {
- if (childrenFeatures == null) {
+ if(childrenFeatures == null) {
super.getChildrenFeatures(object);
childrenFeatures.add(DGPackage.Literals.PATH__COMMAND);
}
@@ -111,7 +115,7 @@ public class PathItemProvider extends MarkedElementItemProvider implements IEdit
*/
@Override
public String getText(Object object) {
- String label = ((Path) object).getId();
+ String label = ((Path)object).getId();
return label == null || label.length() == 0 ? getString("_UI_Path_type") : getString("_UI_Path_type") + " " + label;
}
@@ -126,7 +130,7 @@ public class PathItemProvider extends MarkedElementItemProvider implements IEdit
@Override
public void notifyChanged(Notification notification) {
updateChildren(notification);
- switch (notification.getFeatureID(Path.class)) {
+ switch(notification.getFeatureID(Path.class)) {
case DGPackage.PATH__COMMAND:
fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), true, false));
return;
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 eeb4d7b1f0c..3d8d0b36677 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
@@ -16,7 +16,9 @@ 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;
@@ -26,7 +28,9 @@ 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.DGFactory;
import org.eclipse.papyrus.dd.dg.DGPackage;
import org.eclipse.papyrus.dd.dg.Pattern;
@@ -58,14 +62,15 @@ public class PatternItemProvider extends PaintServerItemProvider implements IEdi
*/
@Override
public List<IItemPropertyDescriptor> getPropertyDescriptors(Object object) {
- if (itemPropertyDescriptors == null) {
+ if(itemPropertyDescriptors == null) {
super.getPropertyDescriptors(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
+ * 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 -->
*
@@ -73,7 +78,7 @@ public class PatternItemProvider extends PaintServerItemProvider implements IEdi
*/
@Override
public Collection<? extends EStructuralFeature> getChildrenFeatures(Object object) {
- if (childrenFeatures == null) {
+ if(childrenFeatures == null) {
super.getChildrenFeatures(object);
childrenFeatures.add(DGPackage.Literals.PATTERN__BOUNDS);
childrenFeatures.add(DGPackage.Literals.PATTERN__TILE);
@@ -113,7 +118,7 @@ public class PatternItemProvider extends PaintServerItemProvider implements IEdi
*/
@Override
public String getText(Object object) {
- String label = ((Pattern) object).getId();
+ String label = ((Pattern)object).getId();
return label == null || label.length() == 0 ? getString("_UI_Pattern_type") : getString("_UI_Pattern_type") + " " + label;
}
@@ -128,7 +133,7 @@ public class PatternItemProvider extends PaintServerItemProvider implements IEdi
@Override
public void notifyChanged(Notification notification) {
updateChildren(notification);
- switch (notification.getFeatureID(Pattern.class)) {
+ switch(notification.getFeatureID(Pattern.class)) {
case DGPackage.PATTERN__BOUNDS:
case DGPackage.PATTERN__TILE:
fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), true, false));
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 dae4c16ad9a..7de11e6f552 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
@@ -16,7 +16,9 @@ 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;
@@ -26,7 +28,9 @@ 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.Polygon;
@@ -57,14 +61,15 @@ public class PolygonItemProvider extends MarkedElementItemProvider implements IE
*/
@Override
public List<IItemPropertyDescriptor> getPropertyDescriptors(Object object) {
- if (itemPropertyDescriptors == null) {
+ if(itemPropertyDescriptors == null) {
super.getPropertyDescriptors(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
+ * 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 -->
*
@@ -72,7 +77,7 @@ public class PolygonItemProvider extends MarkedElementItemProvider implements IE
*/
@Override
public Collection<? extends EStructuralFeature> getChildrenFeatures(Object object) {
- if (childrenFeatures == null) {
+ if(childrenFeatures == null) {
super.getChildrenFeatures(object);
childrenFeatures.add(DGPackage.Literals.POLYGON__POINT);
}
@@ -111,7 +116,7 @@ public class PolygonItemProvider extends MarkedElementItemProvider implements IE
*/
@Override
public String getText(Object object) {
- String label = ((Polygon) object).getId();
+ String label = ((Polygon)object).getId();
return label == null || label.length() == 0 ? getString("_UI_Polygon_type") : getString("_UI_Polygon_type") + " " + label;
}
@@ -126,7 +131,7 @@ public class PolygonItemProvider extends MarkedElementItemProvider implements IE
@Override
public void notifyChanged(Notification notification) {
updateChildren(notification);
- switch (notification.getFeatureID(Polygon.class)) {
+ switch(notification.getFeatureID(Polygon.class)) {
case DGPackage.POLYGON__POINT:
fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), true, false));
return;
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 34ca08c49ae..f354d09bd63 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
@@ -16,7 +16,9 @@ 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;
@@ -26,7 +28,9 @@ 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.Polyline;
@@ -57,14 +61,15 @@ public class PolylineItemProvider extends MarkedElementItemProvider implements I
*/
@Override
public List<IItemPropertyDescriptor> getPropertyDescriptors(Object object) {
- if (itemPropertyDescriptors == null) {
+ if(itemPropertyDescriptors == null) {
super.getPropertyDescriptors(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
+ * 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 -->
*
@@ -72,7 +77,7 @@ public class PolylineItemProvider extends MarkedElementItemProvider implements I
*/
@Override
public Collection<? extends EStructuralFeature> getChildrenFeatures(Object object) {
- if (childrenFeatures == null) {
+ if(childrenFeatures == null) {
super.getChildrenFeatures(object);
childrenFeatures.add(DGPackage.Literals.POLYLINE__POINT);
}
@@ -111,7 +116,7 @@ public class PolylineItemProvider extends MarkedElementItemProvider implements I
*/
@Override
public String getText(Object object) {
- String label = ((Polyline) object).getId();
+ String label = ((Polyline)object).getId();
return label == null || label.length() == 0 ? getString("_UI_Polyline_type") : getString("_UI_Polyline_type") + " " + label;
}
@@ -126,7 +131,7 @@ public class PolylineItemProvider extends MarkedElementItemProvider implements I
@Override
public void notifyChanged(Notification notification) {
updateChildren(notification);
- switch (notification.getFeatureID(Polyline.class)) {
+ switch(notification.getFeatureID(Polyline.class)) {
case DGPackage.POLYLINE__POINT:
fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), true, false));
return;
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 49727d5bdb0..29872e25422 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
@@ -16,7 +16,9 @@ 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;
@@ -26,7 +28,9 @@ 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.QuadraticCurveTo;
@@ -56,14 +60,15 @@ public class QuadraticCurveToItemProvider extends PathCommandItemProvider implem
*/
@Override
public List<IItemPropertyDescriptor> getPropertyDescriptors(Object object) {
- if (itemPropertyDescriptors == null) {
+ if(itemPropertyDescriptors == null) {
super.getPropertyDescriptors(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
+ * 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 -->
*
@@ -71,7 +76,7 @@ public class QuadraticCurveToItemProvider extends PathCommandItemProvider implem
*/
@Override
public Collection<? extends EStructuralFeature> getChildrenFeatures(Object object) {
- if (childrenFeatures == null) {
+ if(childrenFeatures == null) {
super.getChildrenFeatures(object);
childrenFeatures.add(DGPackage.Literals.QUADRATIC_CURVE_TO__CONTROL);
childrenFeatures.add(DGPackage.Literals.QUADRATIC_CURVE_TO__POINT);
@@ -112,7 +117,7 @@ public class QuadraticCurveToItemProvider extends PathCommandItemProvider implem
*/
@Override
public String getText(Object object) {
- QuadraticCurveTo quadraticCurveTo = (QuadraticCurveTo) object;
+ QuadraticCurveTo quadraticCurveTo = (QuadraticCurveTo)object;
return getString("_UI_QuadraticCurveTo_type") + " " + quadraticCurveTo.isRelative();
}
@@ -127,7 +132,7 @@ public class QuadraticCurveToItemProvider extends PathCommandItemProvider implem
@Override
public void notifyChanged(Notification notification) {
updateChildren(notification);
- switch (notification.getFeatureID(QuadraticCurveTo.class)) {
+ switch(notification.getFeatureID(QuadraticCurveTo.class)) {
case DGPackage.QUADRATIC_CURVE_TO__CONTROL:
case DGPackage.QUADRATIC_CURVE_TO__POINT:
fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), true, false));
@@ -161,8 +166,8 @@ public class QuadraticCurveToItemProvider extends PathCommandItemProvider implem
Object childFeature = feature;
Object childObject = child;
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) });
+ if(qualify) {
+ 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 f807d4425b0..70b3d1be845 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
@@ -16,6 +16,7 @@ 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.ComposeableAdapterFactory;
import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
@@ -28,6 +29,7 @@ import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;
import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
import org.eclipse.emf.edit.provider.ItemPropertyDescriptor;
import org.eclipse.emf.edit.provider.ViewerNotification;
+
import org.eclipse.papyrus.dd.dc.DCFactory;
import org.eclipse.papyrus.dd.dg.DGPackage;
import org.eclipse.papyrus.dd.dg.RadialGradient;
@@ -59,7 +61,7 @@ public class RadialGradientItemProvider extends GradientItemProvider implements
*/
@Override
public List<IItemPropertyDescriptor> getPropertyDescriptors(Object object) {
- if (itemPropertyDescriptors == null) {
+ if(itemPropertyDescriptors == null) {
super.getPropertyDescriptors(object);
addRadiusPropertyDescriptor(object);
}
@@ -73,12 +75,12 @@ 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
+ * 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 -->
*
@@ -86,7 +88,7 @@ public class RadialGradientItemProvider extends GradientItemProvider implements
*/
@Override
public Collection<? extends EStructuralFeature> getChildrenFeatures(Object object) {
- if (childrenFeatures == null) {
+ if(childrenFeatures == null) {
super.getChildrenFeatures(object);
childrenFeatures.add(DGPackage.Literals.RADIAL_GRADIENT__CENTER);
childrenFeatures.add(DGPackage.Literals.RADIAL_GRADIENT__FOCUS);
@@ -127,7 +129,7 @@ public class RadialGradientItemProvider extends GradientItemProvider implements
*/
@Override
public String getText(Object object) {
- String label = ((RadialGradient) object).getId();
+ String label = ((RadialGradient)object).getId();
return label == null || label.length() == 0 ? getString("_UI_RadialGradient_type") : getString("_UI_RadialGradient_type") + " " + label;
}
@@ -142,7 +144,7 @@ public class RadialGradientItemProvider extends GradientItemProvider implements
@Override
public void notifyChanged(Notification notification) {
updateChildren(notification);
- switch (notification.getFeatureID(RadialGradient.class)) {
+ switch(notification.getFeatureID(RadialGradient.class)) {
case DGPackage.RADIAL_GRADIENT__RADIUS:
fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), false, true));
return;
@@ -179,8 +181,8 @@ 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;
- if (qualify) {
- return getString("_UI_CreateChild_text2", new Object[] { getTypeText(childObject), getFeatureText(childFeature), getTypeText(owner) });
+ if(qualify) {
+ 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 a5a8ab39434..9398a0a7dfd 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
@@ -16,7 +16,9 @@ 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.ComposeableAdapterFactory;
import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
import org.eclipse.emf.edit.provider.IItemColorProvider;
@@ -28,7 +30,9 @@ import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;
import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
import org.eclipse.emf.edit.provider.ItemPropertyDescriptor;
import org.eclipse.emf.edit.provider.ViewerNotification;
+
import org.eclipse.papyrus.dd.dc.DCFactory;
+
import org.eclipse.papyrus.dd.dg.DGPackage;
import org.eclipse.papyrus.dd.dg.Rectangle;
@@ -59,7 +63,7 @@ public class RectangleItemProvider extends GraphicalElementItemProvider implemen
*/
@Override
public List<IItemPropertyDescriptor> getPropertyDescriptors(Object object) {
- if (itemPropertyDescriptors == null) {
+ if(itemPropertyDescriptors == null) {
super.getPropertyDescriptors(object);
addCornerRadiusPropertyDescriptor(object);
}
@@ -73,12 +77,12 @@ public class RectangleItemProvider extends GraphicalElementItemProvider implemen
* @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
+ * 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 -->
*
@@ -86,7 +90,7 @@ public class RectangleItemProvider extends GraphicalElementItemProvider implemen
*/
@Override
public Collection<? extends EStructuralFeature> getChildrenFeatures(Object object) {
- if (childrenFeatures == null) {
+ if(childrenFeatures == null) {
super.getChildrenFeatures(object);
childrenFeatures.add(DGPackage.Literals.RECTANGLE__BOUNDS);
}
@@ -125,7 +129,7 @@ public class RectangleItemProvider extends GraphicalElementItemProvider implemen
*/
@Override
public String getText(Object object) {
- String label = ((Rectangle) object).getId();
+ String label = ((Rectangle)object).getId();
return label == null || label.length() == 0 ? getString("_UI_Rectangle_type") : getString("_UI_Rectangle_type") + " " + label;
}
@@ -140,7 +144,7 @@ public class RectangleItemProvider extends GraphicalElementItemProvider implemen
@Override
public void notifyChanged(Notification notification) {
updateChildren(notification);
- switch (notification.getFeatureID(Rectangle.class)) {
+ switch(notification.getFeatureID(Rectangle.class)) {
case DGPackage.RECTANGLE__CORNER_RADIUS:
fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), false, true));
return;
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 995aaada5b5..5444450ed87 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
@@ -16,7 +16,9 @@ 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.ComposeableAdapterFactory;
import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
import org.eclipse.emf.edit.provider.IItemColorProvider;
@@ -28,6 +30,7 @@ import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;
import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
import org.eclipse.emf.edit.provider.ItemPropertyDescriptor;
import org.eclipse.emf.edit.provider.ViewerNotification;
+
import org.eclipse.papyrus.dd.dg.DGFactory;
import org.eclipse.papyrus.dd.dg.DGPackage;
import org.eclipse.papyrus.dd.dg.RootCanvas;
@@ -59,7 +62,7 @@ public class RootCanvasItemProvider extends CanvasItemProvider implements IEditi
*/
@Override
public List<IItemPropertyDescriptor> getPropertyDescriptors(Object object) {
- if (itemPropertyDescriptors == null) {
+ if(itemPropertyDescriptors == null) {
super.getPropertyDescriptors(object);
addBackgroundColorPropertyDescriptor(object);
addExternalStyleSheetPropertyDescriptor(object);
@@ -75,8 +78,7 @@ public class RootCanvasItemProvider extends CanvasItemProvider implements IEditi
* @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));
}
/**
@@ -86,8 +88,7 @@ public class RootCanvasItemProvider extends CanvasItemProvider implements IEditi
* @generated
*/
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));
+ 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));
}
/**
@@ -98,12 +99,12 @@ public class RootCanvasItemProvider extends CanvasItemProvider implements IEditi
* @generated
*/
protected void addScriptPropertyDescriptor(Object object) {
- itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(), getString("_UI_RootCanvas_script_feature"),
- getString("_UI_PropertyDescriptor_description", "_UI_RootCanvas_script_feature", "_UI_RootCanvas_type"), DGPackage.Literals.ROOT_CANVAS__SCRIPT, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null));
+ itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(), getResourceLocator(), getString("_UI_RootCanvas_script_feature"), getString("_UI_PropertyDescriptor_description", "_UI_RootCanvas_script_feature", "_UI_RootCanvas_type"), DGPackage.Literals.ROOT_CANVAS__SCRIPT, 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
+ * 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 -->
*
@@ -111,7 +112,7 @@ public class RootCanvasItemProvider extends CanvasItemProvider implements IEditi
*/
@Override
public Collection<? extends EStructuralFeature> getChildrenFeatures(Object object) {
- if (childrenFeatures == null) {
+ if(childrenFeatures == null) {
super.getChildrenFeatures(object);
childrenFeatures.add(DGPackage.Literals.ROOT_CANVAS__DEFINITIONS);
}
@@ -150,7 +151,7 @@ public class RootCanvasItemProvider extends CanvasItemProvider implements IEditi
*/
@Override
public String getText(Object object) {
- String label = ((RootCanvas) object).getId();
+ String label = ((RootCanvas)object).getId();
return label == null || label.length() == 0 ? getString("_UI_RootCanvas_type") : getString("_UI_RootCanvas_type") + " " + label;
}
@@ -165,7 +166,7 @@ public class RootCanvasItemProvider extends CanvasItemProvider implements IEditi
@Override
public void notifyChanged(Notification notification) {
updateChildren(notification);
- switch (notification.getFeatureID(RootCanvas.class)) {
+ switch(notification.getFeatureID(RootCanvas.class)) {
case DGPackage.ROOT_CANVAS__BACKGROUND_COLOR:
case DGPackage.ROOT_CANVAS__SCRIPT:
fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), false, true));
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 640ab6426be..82b23b067ec 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
@@ -16,7 +16,9 @@ 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.ComposeableAdapterFactory;
import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
import org.eclipse.emf.edit.provider.IItemColorProvider;
@@ -28,7 +30,9 @@ import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;
import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
import org.eclipse.emf.edit.provider.ItemPropertyDescriptor;
import org.eclipse.emf.edit.provider.ViewerNotification;
+
import org.eclipse.papyrus.dd.dc.DCFactory;
+
import org.eclipse.papyrus.dd.dg.DGPackage;
import org.eclipse.papyrus.dd.dg.Rotate;
@@ -59,7 +63,7 @@ public class RotateItemProvider extends TransformItemProvider implements IEditin
*/
@Override
public List<IItemPropertyDescriptor> getPropertyDescriptors(Object object) {
- if (itemPropertyDescriptors == null) {
+ if(itemPropertyDescriptors == null) {
super.getPropertyDescriptors(object);
addAnglePropertyDescriptor(object);
}
@@ -73,12 +77,12 @@ public class RotateItemProvider extends TransformItemProvider implements IEditin
* @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
+ * 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 -->
*
@@ -86,7 +90,7 @@ public class RotateItemProvider extends TransformItemProvider implements IEditin
*/
@Override
public Collection<? extends EStructuralFeature> getChildrenFeatures(Object object) {
- if (childrenFeatures == null) {
+ if(childrenFeatures == null) {
super.getChildrenFeatures(object);
childrenFeatures.add(DGPackage.Literals.ROTATE__CENTER);
}
@@ -125,7 +129,7 @@ public class RotateItemProvider extends TransformItemProvider implements IEditin
*/
@Override
public String getText(Object object) {
- Rotate rotate = (Rotate) object;
+ Rotate rotate = (Rotate)object;
return getString("_UI_Rotate_type") + " " + rotate.getAngle();
}
@@ -140,7 +144,7 @@ public class RotateItemProvider extends TransformItemProvider implements IEditin
@Override
public void notifyChanged(Notification notification) {
updateChildren(notification);
- switch (notification.getFeatureID(Rotate.class)) {
+ switch(notification.getFeatureID(Rotate.class)) {
case DGPackage.ROTATE__ANGLE:
fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), false, true));
return;
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 7b5e34cee65..5d1b4f8ede6 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
@@ -16,6 +16,7 @@ import java.util.List;
import org.eclipse.emf.common.notify.AdapterFactory;
import org.eclipse.emf.common.notify.Notification;
+
import org.eclipse.emf.edit.provider.ComposeableAdapterFactory;
import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
import org.eclipse.emf.edit.provider.IItemColorProvider;
@@ -27,6 +28,7 @@ import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;
import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
import org.eclipse.emf.edit.provider.ItemPropertyDescriptor;
import org.eclipse.emf.edit.provider.ViewerNotification;
+
import org.eclipse.papyrus.dd.dg.DGPackage;
import org.eclipse.papyrus.dd.dg.Scale;
@@ -57,7 +59,7 @@ public class ScaleItemProvider extends TransformItemProvider implements IEditing
*/
@Override
public List<IItemPropertyDescriptor> getPropertyDescriptors(Object object) {
- if (itemPropertyDescriptors == null) {
+ if(itemPropertyDescriptors == null) {
super.getPropertyDescriptors(object);
addFactorXPropertyDescriptor(object);
addFactorYPropertyDescriptor(object);
@@ -72,8 +74,7 @@ public class ScaleItemProvider extends TransformItemProvider implements IEditing
* @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));
}
/**
@@ -83,8 +84,7 @@ public class ScaleItemProvider extends TransformItemProvider implements IEditing
* @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));
}
/**
@@ -107,7 +107,7 @@ public class ScaleItemProvider extends TransformItemProvider implements IEditing
*/
@Override
public String getText(Object object) {
- Scale scale = (Scale) object;
+ Scale scale = (Scale)object;
return getString("_UI_Scale_type") + " " + scale.getFactorX();
}
@@ -122,7 +122,7 @@ public class ScaleItemProvider extends TransformItemProvider implements IEditing
@Override
public void notifyChanged(Notification notification) {
updateChildren(notification);
- switch (notification.getFeatureID(Scale.class)) {
+ switch(notification.getFeatureID(Scale.class)) {
case DGPackage.SCALE__FACTOR_X:
case DGPackage.SCALE__FACTOR_Y:
fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), false, true));
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 5bbfe988f82..f7a09d2d58d 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
@@ -16,6 +16,7 @@ import java.util.List;
import org.eclipse.emf.common.notify.AdapterFactory;
import org.eclipse.emf.common.notify.Notification;
+
import org.eclipse.emf.edit.provider.ComposeableAdapterFactory;
import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
import org.eclipse.emf.edit.provider.IItemColorProvider;
@@ -27,6 +28,7 @@ import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;
import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
import org.eclipse.emf.edit.provider.ItemPropertyDescriptor;
import org.eclipse.emf.edit.provider.ViewerNotification;
+
import org.eclipse.papyrus.dd.dg.DGPackage;
import org.eclipse.papyrus.dd.dg.Skew;
@@ -57,7 +59,7 @@ public class SkewItemProvider extends TransformItemProvider implements IEditingD
*/
@Override
public List<IItemPropertyDescriptor> getPropertyDescriptors(Object object) {
- if (itemPropertyDescriptors == null) {
+ if(itemPropertyDescriptors == null) {
super.getPropertyDescriptors(object);
addAngleXPropertyDescriptor(object);
addAngleYPropertyDescriptor(object);
@@ -72,8 +74,7 @@ public class SkewItemProvider extends TransformItemProvider implements IEditingD
* @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));
}
/**
@@ -83,8 +84,7 @@ public class SkewItemProvider extends TransformItemProvider implements IEditingD
* @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));
}
/**
@@ -107,7 +107,7 @@ public class SkewItemProvider extends TransformItemProvider implements IEditingD
*/
@Override
public String getText(Object object) {
- Skew skew = (Skew) object;
+ Skew skew = (Skew)object;
return getString("_UI_Skew_type") + " " + skew.getAngleX();
}
@@ -122,7 +122,7 @@ public class SkewItemProvider extends TransformItemProvider implements IEditingD
@Override
public void notifyChanged(Notification notification) {
updateChildren(notification);
- switch (notification.getFeatureID(Skew.class)) {
+ switch(notification.getFeatureID(Skew.class)) {
case DGPackage.SKEW__ANGLE_X:
case DGPackage.SKEW__ANGLE_Y:
fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), false, true));
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 4ecc2f6b5ba..20ec6337737 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
@@ -16,8 +16,11 @@ import java.util.List;
import org.eclipse.emf.common.notify.AdapterFactory;
import org.eclipse.emf.common.notify.Notification;
+
import org.eclipse.emf.common.util.ResourceLocator;
+
import org.eclipse.emf.ecore.EStructuralFeature;
+
import org.eclipse.emf.edit.provider.ComposeableAdapterFactory;
import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
import org.eclipse.emf.edit.provider.IItemColorProvider;
@@ -30,9 +33,11 @@ import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
import org.eclipse.emf.edit.provider.ItemPropertyDescriptor;
import org.eclipse.emf.edit.provider.ItemProviderAdapter;
import org.eclipse.emf.edit.provider.ViewerNotification;
+
import org.eclipse.papyrus.dd.dg.DGFactory;
import org.eclipse.papyrus.dd.dg.DGPackage;
import org.eclipse.papyrus.dd.dg.Style;
+
import org.eclipse.papyrus.dd.edit.DDEditPlugin;
/**
@@ -62,7 +67,7 @@ public class StyleItemProvider extends ItemProviderAdapter implements IEditingDo
*/
@Override
public List<IItemPropertyDescriptor> getPropertyDescriptors(Object object) {
- if (itemPropertyDescriptors == null) {
+ if(itemPropertyDescriptors == null) {
super.getPropertyDescriptors(object);
addFillPropertyDescriptor(object);
addFillOpacityPropertyDescriptor(object);
@@ -87,8 +92,7 @@ public class StyleItemProvider extends ItemProviderAdapter implements IEditingDo
* @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));
}
/**
@@ -98,8 +102,7 @@ public class StyleItemProvider extends ItemProviderAdapter implements IEditingDo
* @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));
}
/**
@@ -109,8 +112,7 @@ public class StyleItemProvider extends ItemProviderAdapter implements IEditingDo
* @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));
}
/**
@@ -120,8 +122,7 @@ public class StyleItemProvider extends ItemProviderAdapter implements IEditingDo
* @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));
}
/**
@@ -131,8 +132,7 @@ public class StyleItemProvider extends ItemProviderAdapter implements IEditingDo
* @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));
}
/**
@@ -142,8 +142,7 @@ public class StyleItemProvider extends ItemProviderAdapter implements IEditingDo
* @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));
}
/**
@@ -153,8 +152,7 @@ public class StyleItemProvider extends ItemProviderAdapter implements IEditingDo
* @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));
}
/**
@@ -164,8 +162,7 @@ public class StyleItemProvider extends ItemProviderAdapter implements IEditingDo
* @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));
}
/**
@@ -175,8 +172,7 @@ public class StyleItemProvider extends ItemProviderAdapter implements IEditingDo
* @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));
}
/**
@@ -186,8 +182,7 @@ public class StyleItemProvider extends ItemProviderAdapter implements IEditingDo
* @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));
}
/**
@@ -197,12 +192,12 @@ public class StyleItemProvider extends ItemProviderAdapter implements IEditingDo
* @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
+ * 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 -->
*
@@ -210,7 +205,7 @@ public class StyleItemProvider extends ItemProviderAdapter implements IEditingDo
*/
@Override
public Collection<? extends EStructuralFeature> getChildrenFeatures(Object object) {
- if (childrenFeatures == null) {
+ if(childrenFeatures == null) {
super.getChildrenFeatures(object);
childrenFeatures.add(DGPackage.Literals.STYLE__FILL);
childrenFeatures.add(DGPackage.Literals.STYLE__STROKE);
@@ -250,7 +245,7 @@ public class StyleItemProvider extends ItemProviderAdapter implements IEditingDo
*/
@Override
public String getText(Object object) {
- String label = ((Style) object).getFontName();
+ String label = ((Style)object).getFontName();
return label == null || label.length() == 0 ? getString("_UI_Style_type") : getString("_UI_Style_type") + " " + label;
}
@@ -265,7 +260,7 @@ public class StyleItemProvider extends ItemProviderAdapter implements IEditingDo
@Override
public void notifyChanged(Notification notification) {
updateChildren(notification);
- switch (notification.getFeatureID(Style.class)) {
+ switch(notification.getFeatureID(Style.class)) {
case DGPackage.STYLE__FILL_OPACITY:
case DGPackage.STYLE__STROKE_WIDTH:
case DGPackage.STYLE__STROKE_OPACITY:
@@ -310,8 +305,8 @@ public class StyleItemProvider extends ItemProviderAdapter implements IEditingDo
Object childFeature = feature;
Object childObject = child;
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) });
+ if(qualify) {
+ 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 8709873c1df..e0bc9fba2a9 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
@@ -16,8 +16,11 @@ import java.util.List;
import org.eclipse.emf.common.notify.AdapterFactory;
import org.eclipse.emf.common.notify.Notification;
+
import org.eclipse.emf.common.util.ResourceLocator;
+
import org.eclipse.emf.ecore.EStructuralFeature;
+
import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
import org.eclipse.emf.edit.provider.IItemColorProvider;
import org.eclipse.emf.edit.provider.IItemFontProvider;
@@ -28,9 +31,11 @@ import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;
import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
import org.eclipse.emf.edit.provider.ItemProviderAdapter;
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.StyleRule;
+
import org.eclipse.papyrus.dd.edit.DDEditPlugin;
/**
@@ -60,14 +65,15 @@ public class StyleRuleItemProvider extends ItemProviderAdapter implements IEditi
*/
@Override
public List<IItemPropertyDescriptor> getPropertyDescriptors(Object object) {
- if (itemPropertyDescriptors == null) {
+ if(itemPropertyDescriptors == null) {
super.getPropertyDescriptors(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
+ * 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 -->
*
@@ -75,7 +81,7 @@ public class StyleRuleItemProvider extends ItemProviderAdapter implements IEditi
*/
@Override
public Collection<? extends EStructuralFeature> getChildrenFeatures(Object object) {
- if (childrenFeatures == null) {
+ if(childrenFeatures == null) {
super.getChildrenFeatures(object);
childrenFeatures.add(DGPackage.Literals.STYLE_RULE__SELECTOR);
childrenFeatures.add(DGPackage.Literals.STYLE_RULE__STYLE);
@@ -129,7 +135,7 @@ public class StyleRuleItemProvider extends ItemProviderAdapter implements IEditi
@Override
public void notifyChanged(Notification notification) {
updateChildren(notification);
- switch (notification.getFeatureID(StyleRule.class)) {
+ switch(notification.getFeatureID(StyleRule.class)) {
case DGPackage.STYLE_RULE__SELECTOR:
case DGPackage.STYLE_RULE__STYLE:
fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), true, false));
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 04d2078d08f..e99d2c9df5e 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
@@ -16,7 +16,9 @@ import java.util.List;
import org.eclipse.emf.common.notify.AdapterFactory;
import org.eclipse.emf.common.notify.Notification;
+
import org.eclipse.emf.common.util.ResourceLocator;
+
import org.eclipse.emf.edit.provider.ComposeableAdapterFactory;
import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
import org.eclipse.emf.edit.provider.IItemColorProvider;
@@ -29,9 +31,11 @@ import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
import org.eclipse.emf.edit.provider.ItemPropertyDescriptor;
import org.eclipse.emf.edit.provider.ItemProviderAdapter;
import org.eclipse.emf.edit.provider.ViewerNotification;
+
import org.eclipse.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;
/**
@@ -61,7 +65,7 @@ public class StyleSelectorItemProvider extends ItemProviderAdapter implements IE
*/
@Override
public List<IItemPropertyDescriptor> getPropertyDescriptors(Object object) {
- if (itemPropertyDescriptors == null) {
+ if(itemPropertyDescriptors == null) {
super.getPropertyDescriptors(object);
addKindPropertyDescriptor(object);
addClassPropertyDescriptor(object);
@@ -77,8 +81,7 @@ public class StyleSelectorItemProvider extends ItemProviderAdapter implements IE
* @generated
*/
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));
+ 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));
}
/**
@@ -88,8 +91,7 @@ public class StyleSelectorItemProvider extends ItemProviderAdapter implements IE
* @generated
*/
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));
+ 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));
}
/**
@@ -112,7 +114,7 @@ public class StyleSelectorItemProvider extends ItemProviderAdapter implements IE
*/
@Override
public String getText(Object object) {
- ElementKind labelValue = ((StyleSelector) object).getKind();
+ 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;
}
@@ -128,7 +130,7 @@ public class StyleSelectorItemProvider extends ItemProviderAdapter implements IE
@Override
public void notifyChanged(Notification notification) {
updateChildren(notification);
- switch (notification.getFeatureID(StyleSelector.class)) {
+ switch(notification.getFeatureID(StyleSelector.class)) {
case DGPackage.STYLE_SELECTOR__KIND:
case DGPackage.STYLE_SELECTOR__CLASS:
fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), false, true));
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 a856d31f53f..955238c75ff 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
@@ -16,8 +16,11 @@ import java.util.List;
import org.eclipse.emf.common.notify.AdapterFactory;
import org.eclipse.emf.common.notify.Notification;
+
import org.eclipse.emf.common.util.ResourceLocator;
+
import org.eclipse.emf.ecore.EStructuralFeature;
+
import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
import org.eclipse.emf.edit.provider.IItemColorProvider;
import org.eclipse.emf.edit.provider.IItemFontProvider;
@@ -28,9 +31,11 @@ import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;
import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
import org.eclipse.emf.edit.provider.ItemProviderAdapter;
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.StyleSheet;
+
import org.eclipse.papyrus.dd.edit.DDEditPlugin;
/**
@@ -60,14 +65,15 @@ public class StyleSheetItemProvider extends ItemProviderAdapter implements IEdit
*/
@Override
public List<IItemPropertyDescriptor> getPropertyDescriptors(Object object) {
- if (itemPropertyDescriptors == null) {
+ if(itemPropertyDescriptors == null) {
super.getPropertyDescriptors(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
+ * 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 -->
*
@@ -75,7 +81,7 @@ public class StyleSheetItemProvider extends ItemProviderAdapter implements IEdit
*/
@Override
public Collection<? extends EStructuralFeature> getChildrenFeatures(Object object) {
- if (childrenFeatures == null) {
+ if(childrenFeatures == null) {
super.getChildrenFeatures(object);
childrenFeatures.add(DGPackage.Literals.STYLE_SHEET__RULE);
}
@@ -128,7 +134,7 @@ public class StyleSheetItemProvider extends ItemProviderAdapter implements IEdit
@Override
public void notifyChanged(Notification notification) {
updateChildren(notification);
- switch (notification.getFeatureID(StyleSheet.class)) {
+ switch(notification.getFeatureID(StyleSheet.class)) {
case DGPackage.STYLE_SHEET__RULE:
fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), true, false));
return;
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 24ba53368d3..035d7c93325 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
@@ -16,7 +16,9 @@ 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.ComposeableAdapterFactory;
import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
import org.eclipse.emf.edit.provider.IItemColorProvider;
@@ -28,7 +30,9 @@ import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;
import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
import org.eclipse.emf.edit.provider.ItemPropertyDescriptor;
import org.eclipse.emf.edit.provider.ViewerNotification;
+
import org.eclipse.papyrus.dd.dc.DCFactory;
+
import org.eclipse.papyrus.dd.dg.DGPackage;
import org.eclipse.papyrus.dd.dg.Text;
@@ -59,7 +63,7 @@ public class TextItemProvider extends GraphicalElementItemProvider implements IE
*/
@Override
public List<IItemPropertyDescriptor> getPropertyDescriptors(Object object) {
- if (itemPropertyDescriptors == null) {
+ if(itemPropertyDescriptors == null) {
super.getPropertyDescriptors(object);
addDataPropertyDescriptor(object);
addAnchorPropertyDescriptor(object);
@@ -75,8 +79,7 @@ public class TextItemProvider extends GraphicalElementItemProvider implements IE
* @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));
}
/**
@@ -87,12 +90,12 @@ public class TextItemProvider extends GraphicalElementItemProvider implements IE
* @generated
*/
protected void addAnchorPropertyDescriptor(Object object) {
- itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(), getString("_UI_Text_anchor_feature"),
- getString("_UI_PropertyDescriptor_description", "_UI_Text_anchor_feature", "_UI_Text_type"), DGPackage.Literals.TEXT__ANCHOR, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null));
+ itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(), getResourceLocator(), getString("_UI_Text_anchor_feature"), getString("_UI_PropertyDescriptor_description", "_UI_Text_anchor_feature", "_UI_Text_type"), DGPackage.Literals.TEXT__ANCHOR, 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
+ * 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 -->
*
@@ -100,9 +103,9 @@ public class TextItemProvider extends GraphicalElementItemProvider implements IE
*/
@Override
public Collection<? extends EStructuralFeature> getChildrenFeatures(Object object) {
- if (childrenFeatures == null) {
+ if(childrenFeatures == null) {
super.getChildrenFeatures(object);
- childrenFeatures.add(DGPackage.Literals.TEXT__POSITION);
+ childrenFeatures.add(DGPackage.Literals.TEXT__BOUNDS);
}
return childrenFeatures;
}
@@ -139,7 +142,7 @@ public class TextItemProvider extends GraphicalElementItemProvider implements IE
*/
@Override
public String getText(Object object) {
- String label = ((Text) object).getId();
+ String label = ((Text)object).getId();
return label == null || label.length() == 0 ? getString("_UI_Text_type") : getString("_UI_Text_type") + " " + label;
}
@@ -154,12 +157,12 @@ public class TextItemProvider extends GraphicalElementItemProvider implements IE
@Override
public void notifyChanged(Notification notification) {
updateChildren(notification);
- switch (notification.getFeatureID(Text.class)) {
+ switch(notification.getFeatureID(Text.class)) {
case DGPackage.TEXT__DATA:
case DGPackage.TEXT__ANCHOR:
fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), false, true));
return;
- case DGPackage.TEXT__POSITION:
+ case DGPackage.TEXT__BOUNDS:
fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), true, false));
return;
}
@@ -176,6 +179,6 @@ public class TextItemProvider extends GraphicalElementItemProvider implements IE
@Override
protected void collectNewChildDescriptors(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__BOUNDS, DCFactory.eINSTANCE.createBounds()));
}
}
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 41b7d40ad84..058fac78790 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
@@ -16,7 +16,9 @@ import java.util.List;
import org.eclipse.emf.common.notify.AdapterFactory;
import org.eclipse.emf.common.notify.Notification;
+
import org.eclipse.emf.common.util.ResourceLocator;
+
import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
import org.eclipse.emf.edit.provider.IItemColorProvider;
import org.eclipse.emf.edit.provider.IItemFontProvider;
@@ -26,6 +28,7 @@ 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.ItemProviderAdapter;
+
import org.eclipse.papyrus.dd.edit.DDEditPlugin;
/**
@@ -55,7 +58,7 @@ public class TransformItemProvider extends ItemProviderAdapter implements IEditi
*/
@Override
public List<IItemPropertyDescriptor> getPropertyDescriptors(Object object) {
- if (itemPropertyDescriptors == null) {
+ if(itemPropertyDescriptors == null) {
super.getPropertyDescriptors(object);
}
return itemPropertyDescriptors;
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 0d31128ab0e..b93d9540432 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
@@ -16,6 +16,7 @@ import java.util.List;
import org.eclipse.emf.common.notify.AdapterFactory;
import org.eclipse.emf.common.notify.Notification;
+
import org.eclipse.emf.edit.provider.ComposeableAdapterFactory;
import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
import org.eclipse.emf.edit.provider.IItemColorProvider;
@@ -27,6 +28,7 @@ import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;
import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
import org.eclipse.emf.edit.provider.ItemPropertyDescriptor;
import org.eclipse.emf.edit.provider.ViewerNotification;
+
import org.eclipse.papyrus.dd.dg.DGPackage;
import org.eclipse.papyrus.dd.dg.Translate;
@@ -57,7 +59,7 @@ public class TranslateItemProvider extends TransformItemProvider implements IEdi
*/
@Override
public List<IItemPropertyDescriptor> getPropertyDescriptors(Object object) {
- if (itemPropertyDescriptors == null) {
+ if(itemPropertyDescriptors == null) {
super.getPropertyDescriptors(object);
addDeltaXPropertyDescriptor(object);
addDeltaYPropertyDescriptor(object);
@@ -72,8 +74,7 @@ public class TranslateItemProvider extends TransformItemProvider implements IEdi
* @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));
}
/**
@@ -83,8 +84,7 @@ public class TranslateItemProvider extends TransformItemProvider implements IEdi
* @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));
}
/**
@@ -107,7 +107,7 @@ public class TranslateItemProvider extends TransformItemProvider implements IEdi
*/
@Override
public String getText(Object object) {
- Translate translate = (Translate) object;
+ Translate translate = (Translate)object;
return getString("_UI_Translate_type") + " " + translate.getDeltaX();
}
@@ -122,7 +122,7 @@ public class TranslateItemProvider extends TransformItemProvider implements IEdi
@Override
public void notifyChanged(Notification notification) {
updateChildren(notification);
- switch (notification.getFeatureID(Translate.class)) {
+ switch(notification.getFeatureID(Translate.class)) {
case DGPackage.TRANSLATE__DELTA_X:
case DGPackage.TRANSLATE__DELTA_Y:
fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), false, true));
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 015d8bf6c86..6ec237471a2 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
@@ -16,7 +16,9 @@ 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.ComposeableAdapterFactory;
import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
import org.eclipse.emf.edit.provider.IItemColorProvider;
@@ -27,7 +29,9 @@ 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.Use;
@@ -57,7 +61,7 @@ public class UseItemProvider extends GraphicalElementItemProvider implements IEd
*/
@Override
public List<IItemPropertyDescriptor> getPropertyDescriptors(Object object) {
- if (itemPropertyDescriptors == null) {
+ if(itemPropertyDescriptors == null) {
super.getPropertyDescriptors(object);
addReferencedElementPropertyDescriptor(object);
}
@@ -71,12 +75,12 @@ public class UseItemProvider extends GraphicalElementItemProvider implements IEd
* @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));
+ 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
+ * 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 -->
*
@@ -84,7 +88,7 @@ public class UseItemProvider extends GraphicalElementItemProvider implements IEd
*/
@Override
public Collection<? extends EStructuralFeature> getChildrenFeatures(Object object) {
- if (childrenFeatures == null) {
+ if(childrenFeatures == null) {
super.getChildrenFeatures(object);
childrenFeatures.add(DGPackage.Literals.USE__BOUNDS);
}
@@ -123,7 +127,7 @@ public class UseItemProvider extends GraphicalElementItemProvider implements IEd
*/
@Override
public String getText(Object object) {
- String label = ((Use) object).getId();
+ String label = ((Use)object).getId();
return label == null || label.length() == 0 ? getString("_UI_Use_type") : getString("_UI_Use_type") + " " + label;
}
@@ -138,7 +142,7 @@ public class UseItemProvider extends GraphicalElementItemProvider implements IEd
@Override
public void notifyChanged(Notification notification) {
updateChildren(notification);
- switch (notification.getFeatureID(Use.class)) {
+ switch(notification.getFeatureID(Use.class)) {
case DGPackage.USE__BOUNDS:
fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), true, false));
return;
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 187596115a8..cd217dd44d0 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
@@ -17,6 +17,7 @@ import java.util.Collection;
import org.eclipse.emf.common.notify.Adapter;
import org.eclipse.emf.common.notify.Notification;
import org.eclipse.emf.common.notify.Notifier;
+
import org.eclipse.emf.edit.provider.ChangeNotifier;
import org.eclipse.emf.edit.provider.ComposeableAdapterFactory;
import org.eclipse.emf.edit.provider.ComposedAdapterFactory;
@@ -30,6 +31,7 @@ import org.eclipse.emf.edit.provider.IItemPropertySource;
import org.eclipse.emf.edit.provider.INotifyChangedListener;
import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;
import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
+
import org.eclipse.papyrus.dd.di.util.DIAdapterFactory;
/**
@@ -135,9 +137,9 @@ public class DIItemProviderAdapterFactory extends DIAdapterFactory implements Co
*/
@Override
public Object adapt(Object object, Object type) {
- if (isFactoryForType(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;
}
}
@@ -175,7 +177,7 @@ public class DIItemProviderAdapterFactory extends DIAdapterFactory implements Co
@Override
public void fireNotifyChanged(Notification notification) {
changeNotifier.fireNotifyChanged(notification);
- if (parentAdapterFactory != null) {
+ if(parentAdapterFactory != null) {
parentAdapterFactory.fireNotifyChanged(notification);
}
}
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 9a12e4c3046..05bb100d7f6 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
@@ -13,7 +13,6 @@ package org.eclipse.papyrus.dd.di.provider;
import java.util.Collection;
import java.util.List;
-
import org.eclipse.emf.common.notify.AdapterFactory;
import org.eclipse.emf.common.notify.Notification;
import org.eclipse.emf.common.util.ResourceLocator;
@@ -55,7 +54,7 @@ public class DiagramElementItemProvider extends ItemProviderAdapter implements I
*/
@Override
public List<IItemPropertyDescriptor> getPropertyDescriptors(Object object) {
- if (itemPropertyDescriptors == null) {
+ if(itemPropertyDescriptors == null) {
super.getPropertyDescriptors(object);
}
return itemPropertyDescriptors;
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 5267f529963..cee6bb9a11f 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
@@ -16,6 +16,7 @@ import java.util.List;
import org.eclipse.emf.common.notify.AdapterFactory;
import org.eclipse.emf.common.notify.Notification;
+
import org.eclipse.emf.edit.provider.ComposeableAdapterFactory;
import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
import org.eclipse.emf.edit.provider.IItemColorProvider;
@@ -27,6 +28,7 @@ import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;
import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
import org.eclipse.emf.edit.provider.ItemPropertyDescriptor;
import org.eclipse.emf.edit.provider.ViewerNotification;
+
import org.eclipse.papyrus.dd.di.DIPackage;
import org.eclipse.papyrus.dd.di.Diagram;
@@ -57,7 +59,7 @@ public class DiagramItemProvider extends ShapeItemProvider implements IEditingDo
*/
@Override
public List<IItemPropertyDescriptor> getPropertyDescriptors(Object object) {
- if (itemPropertyDescriptors == null) {
+ if(itemPropertyDescriptors == null) {
super.getPropertyDescriptors(object);
addNamePropertyDescriptor(object);
addDocumentationPropertyDescriptor(object);
@@ -74,8 +76,7 @@ public class DiagramItemProvider extends ShapeItemProvider implements IEditingDo
* @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));
}
/**
@@ -85,8 +86,7 @@ public class DiagramItemProvider extends ShapeItemProvider implements IEditingDo
* @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));
}
/**
@@ -96,8 +96,7 @@ public class DiagramItemProvider extends ShapeItemProvider implements IEditingDo
* @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));
}
/**
@@ -109,7 +108,7 @@ public class DiagramItemProvider extends ShapeItemProvider implements IEditingDo
*/
@Override
public String getText(Object object) {
- String label = ((Diagram) object).getName();
+ String label = ((Diagram)object).getName();
return label == null || label.length() == 0 ? getString("_UI_Diagram_type") : getString("_UI_Diagram_type") + " " + label;
}
@@ -124,7 +123,7 @@ public class DiagramItemProvider extends ShapeItemProvider implements IEditingDo
@Override
public void notifyChanged(Notification notification) {
updateChildren(notification);
- switch (notification.getFeatureID(Diagram.class)) {
+ switch(notification.getFeatureID(Diagram.class)) {
case DIPackage.DIAGRAM__NAME:
case DIPackage.DIAGRAM__DOCUMENTATION:
case DIPackage.DIAGRAM__RESOLUTION:
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 93341de8db8..8bdfad715e5 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
@@ -13,7 +13,6 @@ package org.eclipse.papyrus.dd.di.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;
@@ -57,14 +56,15 @@ public class EdgeItemProvider extends DiagramElementItemProvider implements IEdi
*/
@Override
public List<IItemPropertyDescriptor> getPropertyDescriptors(Object object) {
- if (itemPropertyDescriptors == null) {
+ if(itemPropertyDescriptors == null) {
super.getPropertyDescriptors(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
+ * 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 -->
*
@@ -72,7 +72,7 @@ public class EdgeItemProvider extends DiagramElementItemProvider implements IEdi
*/
@Override
public Collection<? extends EStructuralFeature> getChildrenFeatures(Object object) {
- if (childrenFeatures == null) {
+ if(childrenFeatures == null) {
super.getChildrenFeatures(object);
childrenFeatures.add(DIPackage.Literals.EDGE__WAYPOINT);
}
@@ -114,7 +114,7 @@ public class EdgeItemProvider extends DiagramElementItemProvider implements IEdi
@Override
public void notifyChanged(Notification notification) {
updateChildren(notification);
- switch (notification.getFeatureID(Edge.class)) {
+ switch(notification.getFeatureID(Edge.class)) {
case DIPackage.EDGE__WAYPOINT:
fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), true, false));
return;
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 d1cde4c45cf..48342b3d0cb 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
@@ -16,7 +16,9 @@ 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;
@@ -26,7 +28,9 @@ 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.di.DIPackage;
import org.eclipse.papyrus.dd.di.Shape;
@@ -57,14 +61,15 @@ public class ShapeItemProvider extends DiagramElementItemProvider implements IEd
*/
@Override
public List<IItemPropertyDescriptor> getPropertyDescriptors(Object object) {
- if (itemPropertyDescriptors == null) {
+ if(itemPropertyDescriptors == null) {
super.getPropertyDescriptors(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
+ * 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 -->
*
@@ -72,7 +77,7 @@ public class ShapeItemProvider extends DiagramElementItemProvider implements IEd
*/
@Override
public Collection<? extends EStructuralFeature> getChildrenFeatures(Object object) {
- if (childrenFeatures == null) {
+ if(childrenFeatures == null) {
super.getChildrenFeatures(object);
childrenFeatures.add(DIPackage.Literals.SHAPE__BOUNDS);
}
@@ -114,7 +119,7 @@ public class ShapeItemProvider extends DiagramElementItemProvider implements IEd
@Override
public void notifyChanged(Notification notification) {
updateChildren(notification);
- switch (notification.getFeatureID(Shape.class)) {
+ switch(notification.getFeatureID(Shape.class)) {
case DIPackage.SHAPE__BOUNDS:
fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), true, false));
return;
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 ba459e2b1ae..d66a66cd32f 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
@@ -16,7 +16,9 @@ import java.util.List;
import org.eclipse.emf.common.notify.AdapterFactory;
import org.eclipse.emf.common.notify.Notification;
+
import org.eclipse.emf.common.util.ResourceLocator;
+
import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
import org.eclipse.emf.edit.provider.IItemColorProvider;
import org.eclipse.emf.edit.provider.IItemFontProvider;
@@ -26,6 +28,7 @@ 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.ItemProviderAdapter;
+
import org.eclipse.papyrus.dd.edit.DDEditPlugin;
/**
@@ -55,7 +58,7 @@ public class StyleItemProvider extends ItemProviderAdapter implements IEditingDo
*/
@Override
public List<IItemPropertyDescriptor> getPropertyDescriptors(Object object) {
- if (itemPropertyDescriptors == null) {
+ if(itemPropertyDescriptors == null) {
super.getPropertyDescriptors(object);
}
return itemPropertyDescriptors;
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 97c075906c0..34f29420a11 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
@@ -12,6 +12,7 @@
package org.eclipse.papyrus.dd.edit;
import org.eclipse.emf.common.EMFPlugin;
+
import org.eclipse.emf.common.util.ResourceLocator;
import org.eclipse.emf.ecore.provider.EcoreEditPlugin;
@@ -46,7 +47,7 @@ public final class DDEditPlugin extends EMFPlugin {
* @generated NOT
*/
public DDEditPlugin() {
- super(new ResourceLocator[] { EcoreEditPlugin.INSTANCE, });
+ super(new ResourceLocator[]{ EcoreEditPlugin.INSTANCE, });
}
/**
diff --git a/extraplugins/diagram-definition/org.eclipse.papyrus.dd.editor/META-INF/MANIFEST.MF b/extraplugins/diagram-definition/org.eclipse.papyrus.dd.editor/META-INF/MANIFEST.MF
index 5a507db81d4..e89f541aa21 100644
--- a/extraplugins/diagram-definition/org.eclipse.papyrus.dd.editor/META-INF/MANIFEST.MF
+++ b/extraplugins/diagram-definition/org.eclipse.papyrus.dd.editor/META-INF/MANIFEST.MF
@@ -1,55 +1,53 @@
-Manifest-Version: 1.0
-Export-Package: org.eclipse.papyrus.dd.dg.editor,
- org.eclipse.papyrus.dd.editor
-Require-Bundle: org.eclipse.core.runtime;visibility:=reexport,
- org.eclipse.core.resources;visibility:=reexport,
- org.eclipse.papyrus.dd.edit;bundle-version="1.1.0";visibility:=reexport,
- org.eclipse.emf.ecore.xmi;visibility:=reexport,
- org.eclipse.emf.edit.ui;visibility:=reexport,
- org.eclipse.ui.ide;visibility:=reexport,
- org.eclipse.emf.ecore.edit;visibility:=reexport,
- org.eclipse.ui.forms;bundle-version="3.6.1";visibility:=reexport,
- org.eclipse.jface.text;bundle-version="3.8.101";visibility:=reexport,
- org.eclipse.help;bundle-version="3.6.0";visibility:=reexport
-Bundle-Vendor: %providerName
-Bundle-ActivationPolicy: lazy
-Bundle-ClassPath: .,
- batik-1.7/batik-rasterizer.jar,
- batik-1.7/batik-slideshow.jar,
- batik-1.7/batik-squiggle.jar,
- batik-1.7/batik-svgpp.jar,
- batik-1.7/batik-ttf2svg.jar,
- batik-1.7/batik.jar,
- batik-1.7/lib/batik-anim.jar,
- batik-1.7/lib/batik-awt-util.jar,
- batik-1.7/lib/batik-bridge.jar,
- batik-1.7/lib/batik-codec.jar,
- batik-1.7/lib/batik-css.jar,
- batik-1.7/lib/batik-dom.jar,
- batik-1.7/lib/batik-ext.jar,
- batik-1.7/lib/batik-extension.jar,
- batik-1.7/lib/batik-gui-util.jar,
- batik-1.7/lib/batik-gvt.jar,
- batik-1.7/lib/batik-parser.jar,
- batik-1.7/lib/batik-script.jar,
- batik-1.7/lib/batik-svg-dom.jar,
- batik-1.7/lib/batik-svggen.jar,
- batik-1.7/lib/batik-swing.jar,
- batik-1.7/lib/batik-transcoder.jar,
- batik-1.7/lib/batik-util.jar,
- batik-1.7/lib/batik-xml.jar,
- batik-1.7/lib/js.jar,
- batik-1.7/lib/pdf-transcoder.jar,
- batik-1.7/lib/xalan-2.6.0.jar,
- batik-1.7/lib/xerces_2_5_0.jar,
- batik-1.7/lib/xml-apis-ext.jar,
- batik-1.7/lib/xml-apis.jar
-Bundle-Version: 1.1.0.qualifier
-Bundle-Name: %pluginName
-Bundle-Localization: plugin
-Bundle-ManifestVersion: 2
-Bundle-Activator: org.eclipse.papyrus.dd.editor.DDEditorPlugin$Impleme
- ntation
-Bundle-SymbolicName: org.eclipse.papyrus.dd.editor;singleton:=true
-Bundle-RequiredExecutionEnvironment: JavaSE-1.7
-
+Manifest-Version: 1.0
+Bundle-ManifestVersion: 2
+Bundle-Name: %pluginName
+Bundle-SymbolicName: org.eclipse.papyrus.dd.editor;singleton:=true
+Bundle-Version: 1.0.0.qualifier
+Bundle-ClassPath: .,
+ batik-1.7/batik-rasterizer.jar,
+ batik-1.7/batik-slideshow.jar,
+ batik-1.7/batik-squiggle.jar,
+ batik-1.7/batik-svgpp.jar,
+ batik-1.7/batik-ttf2svg.jar,
+ batik-1.7/batik.jar,
+ batik-1.7/lib/batik-anim.jar,
+ batik-1.7/lib/batik-awt-util.jar,
+ batik-1.7/lib/batik-bridge.jar,
+ batik-1.7/lib/batik-codec.jar,
+ batik-1.7/lib/batik-css.jar,
+ batik-1.7/lib/batik-dom.jar,
+ batik-1.7/lib/batik-ext.jar,
+ batik-1.7/lib/batik-extension.jar,
+ batik-1.7/lib/batik-gui-util.jar,
+ batik-1.7/lib/batik-gvt.jar,
+ batik-1.7/lib/batik-parser.jar,
+ batik-1.7/lib/batik-script.jar,
+ batik-1.7/lib/batik-svg-dom.jar,
+ batik-1.7/lib/batik-svggen.jar,
+ batik-1.7/lib/batik-swing.jar,
+ batik-1.7/lib/batik-transcoder.jar,
+ batik-1.7/lib/batik-util.jar,
+ batik-1.7/lib/batik-xml.jar,
+ batik-1.7/lib/js.jar,
+ batik-1.7/lib/pdf-transcoder.jar,
+ batik-1.7/lib/xalan-2.6.0.jar,
+ batik-1.7/lib/xerces_2_5_0.jar,
+ batik-1.7/lib/xml-apis-ext.jar,
+ batik-1.7/lib/xml-apis.jar
+Bundle-Activator: org.eclipse.papyrus.dd.editor.DDEditorPlugin$Implementation
+Bundle-Vendor: %providerName
+Bundle-Localization: plugin
+Bundle-RequiredExecutionEnvironment: JavaSE-1.7
+Export-Package: org.eclipse.papyrus.dd.dg.editor,
+ org.eclipse.papyrus.dd.editor
+Require-Bundle: org.eclipse.core.runtime;visibility:=reexport,
+ org.eclipse.core.resources;visibility:=reexport,
+ org.eclipse.papyrus.dd.edit;visibility:=reexport,
+ org.eclipse.emf.ecore.xmi;visibility:=reexport,
+ org.eclipse.emf.edit.ui;visibility:=reexport,
+ org.eclipse.ui.ide;visibility:=reexport,
+ org.eclipse.emf.ecore.edit;visibility:=reexport,
+ org.eclipse.ui.forms;bundle-version="3.6.1";visibility:=reexport,
+ org.eclipse.jface.text;bundle-version="3.8.101";visibility:=reexport,
+ org.eclipse.help;bundle-version="3.6.0";visibility:=reexport
+Bundle-ActivationPolicy: lazy
diff --git a/extraplugins/diagram-definition/org.eclipse.papyrus.dd.editor/scripts/Layout.js b/extraplugins/diagram-definition/org.eclipse.papyrus.dd.editor/scripts/Layout.js
new file mode 100644
index 00000000000..96576986b95
--- /dev/null
+++ b/extraplugins/diagram-definition/org.eclipse.papyrus.dd.editor/scripts/Layout.js
@@ -0,0 +1,156 @@
+/**
+ * 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
+ */
+
+function validate(parent) {
+ layout(parent);
+ var children = getChildren(parent);
+ for (var i=0; i<children.length; i++)
+ validate(children[i]);
+}
+
+function layout(parent) {
+ var lm = parent.getAttribute("layout");
+ if (lm != null && lm.length>0)
+ eval(lm);
+ else if (parent.tagName == "text")
+ layoutText(parent);
+}
+
+function getChildren(parent) {
+ var children = [];
+ var elements = parent.childNodes;
+ for (var i=0; i<elements.length; i++) {
+ var element = elements.item(i);
+ if (element.tagName != "script" && element.tagName != "defs" && element.nodeType != 3)
+ children.push(element);
+ }
+ return children;
+}
+
+function getPreferredSize(parent) {
+ var lm = parent.getAttribute("layout");
+ if (lm != null && lm.length>0) {
+ var prefSize = eval("getPreferredSize_"+lm);
+ return prefSize;
+ }
+ var bbox = parent.getBBox();
+ return new Dimension(bbox.width+10, bbox.height+10);
+}
+
+function getBounds(element) {
+ var bbox = element.getBBox();
+ return new Rectangle(bbox.x, bbox.y, bbox.width, bbox.height);
+}
+
+function setBounds(element, x, y, width, height) {
+
+ if (element.tagName == "rect")
+ setRectBounds(element, x, y, width, height);
+ else if (element.tagName == "svg")
+ setSvgBounds(element, x, y, width, height);
+ else if (element.tagName == "g")
+ setGBounds(element, x, y, width, height);
+ else if (element.tagName == "circle")
+ setCircleBounds(element, x, y, width, height);
+ else if (element.tagName == "text")
+ setTextBounds(element, x, y, width, height);
+}
+
+function setSvgBounds(element, x, y, width, height) {
+ element.setAttribute("x", x);
+ element.setAttribute("y", y);
+ element.setAttribute("width", width+1);
+ element.setAttribute("height", height);
+}
+
+function setGBounds(element, x, y, width, height) {
+ element.setAttribute("x", x);
+ element.setAttribute("y", y);
+ element.setAttribute("width", width);
+ element.setAttribute("height", height);
+}
+
+function setRectBounds(element, x, y, width, height) {
+ element.setAttribute("x", x);
+ element.setAttribute("y", y);
+ element.setAttribute("width", width);
+ element.setAttribute("height", height);
+}
+
+function setCircleBounds(element, x, y, width, height) {
+ element.setAttribute("cx", x+width/2);
+ element.setAttribute("cy", y+height/2);
+ if (width <= height)
+ element.setAttribute("r", width/2);
+ else
+ element.setAttribute("r", height/2);
+}
+
+function setTextBounds(element, x, y, width, height) {
+ var bbox = element.getBBox();
+ var anchor = element.getAttribute("text-anchor");
+ if (anchor == "middle")
+ element.setAttribute("x", x+width/2);
+ else if (anchor == "end")
+ element.setAttribute("x", x+width);
+ else
+ element.setAttribute("x", x);
+ element.setAttribute("y", y+height/2);
+}
+
+function layoutText(element) {
+ var x = +element.getAttribute("x");
+ var y = +element.getAttribute("y");
+ var width = +element.getAttribute("width");
+ var height = +element.getAttribute("height");
+ var anchor = element.getAttribute("text-anchor");
+ var text = element.getTextContent();
+
+ if (anchor == "middle")
+ x = x+width/2;
+ else if (anchor == "end")
+ x = x+width;
+
+ element.setAttribute("x", x);
+ element.setAttribute("y", y);
+ //element.setAttribute("dx", "0.2em");
+ element.setAttribute("dy", "0.9em");
+
+ var split = text.split("\\n");
+ element.setTextContent("");
+ for (var i=0; i<split.length; i++) {
+ var tspan = document.createElementNS("http://www.w3.org/2000/svg", "tspan");
+ tspan.setTextContent(split[i]);
+ if (i > 0) {
+ tspan.setAttribute("x", x);
+ tspan.setAttribute("dy", "1em");
+ }
+ element.appendChild(tspan);
+ }
+}
+
+function Rectangle(x, y, width, height) {
+ this.x = x;
+ this.y = y;
+ this.width = width;
+ this.height = height;
+}
+
+function Point(x, y) {
+ this.x = x;
+ this.y = y;
+}
+
+function Dimension(width, height) {
+ this.width = width;
+ this.height = height;
+}
diff --git a/extraplugins/diagram-definition/org.eclipse.papyrus.dd.editor/src/org/eclipse/papyrus/dd/dg/editor/DGModelWizard.java b/extraplugins/diagram-definition/org.eclipse.papyrus.dd.editor/src/org/eclipse/papyrus/dd/dg/editor/DGModelWizard.java
index dbf8ff4739d..faf21f109b9 100644
--- a/extraplugins/diagram-definition/org.eclipse.papyrus.dd.editor/src/org/eclipse/papyrus/dd/dg/editor/DGModelWizard.java
+++ b/extraplugins/diagram-definition/org.eclipse.papyrus.dd.editor/src/org/eclipse/papyrus/dd/dg/editor/DGModelWizard.java
@@ -21,53 +21,78 @@ import java.util.Map;
import java.util.MissingResourceException;
import java.util.StringTokenizer;
-import org.eclipse.core.resources.IContainer;
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.resources.IFolder;
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.resources.IResource;
-import org.eclipse.core.resources.ResourcesPlugin;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.Path;
import org.eclipse.emf.common.CommonPlugin;
+
import org.eclipse.emf.common.util.URI;
+
import org.eclipse.emf.ecore.EClass;
import org.eclipse.emf.ecore.EClassifier;
-import org.eclipse.emf.ecore.EObject;
+
import org.eclipse.emf.ecore.resource.Resource;
import org.eclipse.emf.ecore.resource.ResourceSet;
+
import org.eclipse.emf.ecore.resource.impl.ResourceSetImpl;
+
+import org.eclipse.emf.ecore.EObject;
+
import org.eclipse.emf.ecore.xmi.XMLResource;
+
import org.eclipse.emf.edit.ui.provider.ExtendedImageRegistry;
+
+import org.eclipse.core.resources.IContainer;
+import org.eclipse.core.resources.IFile;
+import org.eclipse.core.resources.IFolder;
+import org.eclipse.core.resources.IProject;
+import org.eclipse.core.resources.IResource;
+import org.eclipse.core.resources.ResourcesPlugin;
+
+import org.eclipse.core.runtime.IProgressMonitor;
+
import org.eclipse.jface.dialogs.MessageDialog;
-import org.eclipse.jface.viewers.ISelection;
+
import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.jface.viewers.StructuredSelection;
+
import org.eclipse.jface.wizard.Wizard;
import org.eclipse.jface.wizard.WizardPage;
-import org.eclipse.papyrus.dd.dg.DGFactory;
-import org.eclipse.papyrus.dd.dg.DGPackage;
-import org.eclipse.papyrus.dd.edit.DDEditPlugin;
-import org.eclipse.papyrus.dd.editor.DDEditorPlugin;
+
import org.eclipse.swt.SWT;
-import org.eclipse.swt.events.ModifyEvent;
+
import org.eclipse.swt.events.ModifyListener;
+import org.eclipse.swt.events.ModifyEvent;
+
import org.eclipse.swt.layout.GridData;
import org.eclipse.swt.layout.GridLayout;
+
import org.eclipse.swt.widgets.Combo;
import org.eclipse.swt.widgets.Composite;
import org.eclipse.swt.widgets.Label;
+
import org.eclipse.ui.INewWizard;
import org.eclipse.ui.IWorkbench;
-import org.eclipse.ui.IWorkbenchPage;
-import org.eclipse.ui.IWorkbenchPart;
-import org.eclipse.ui.IWorkbenchWindow;
-import org.eclipse.ui.PartInitException;
+
import org.eclipse.ui.actions.WorkspaceModifyOperation;
+
import org.eclipse.ui.dialogs.WizardNewFileCreationPage;
+
import org.eclipse.ui.part.FileEditorInput;
import org.eclipse.ui.part.ISetSelectionTarget;
+import org.eclipse.papyrus.dd.dg.DGFactory;
+import org.eclipse.papyrus.dd.dg.DGPackage;
+import org.eclipse.papyrus.dd.edit.DDEditPlugin;
+
+import org.eclipse.core.runtime.Path;
+
+import org.eclipse.jface.viewers.ISelection;
+import org.eclipse.jface.viewers.StructuredSelection;
+
+import org.eclipse.papyrus.dd.editor.DDEditorPlugin;
+
+import org.eclipse.ui.IWorkbenchPage;
+import org.eclipse.ui.IWorkbenchPart;
+import org.eclipse.ui.IWorkbenchWindow;
+import org.eclipse.ui.PartInitException;
+
/**
* This is a wizard to create a new DG model file.
*/
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 be412eb9118..1ae98db187f 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
@@ -1047,6 +1047,19 @@ public class DGToSVGConverter extends DGSwitch<Object> implements SVGSyntax {
svgDocument.insertBefore(pi, svgDocument.getDocumentElement());
}
+ try {
+ URL url = DDEditorPlugin.getPlugin().getBundle()
+ .getEntry("/scripts/Layout.js");
+ url = FileLocator.toFileURL(url);
+ Element script = svgDocument.createElementNS(SVG_NAMESPACE_URI,
+ SVG_SCRIPT_TAG);
+ script.setAttributeNS(XLINK_NAMESPACE_URI, XLINK_HREF_QNAME,
+ url.toString());
+ svg.appendChild(script);
+ } catch (IOException e) {
+ DDEditorPlugin.getPlugin().log(e);
+ }
+
for (String s : object.getScripts()) {
try {
URL url = FileLocator.toFileURL(new URL(s));
@@ -1314,15 +1327,23 @@ public class DGToSVGConverter extends DGSwitch<Object> implements SVGSyntax {
text.setTextContent(object.getData());
}
- if (object.getPosition() != null) {
- Point position = object.getPosition();
- if (position.eIsSet(DCPackage.Literals.POINT__X)) {
+ if (object.getBounds() != null) {
+ Bounds bounds = object.getBounds();
+ if (bounds.eIsSet(DCPackage.Literals.BOUNDS__X)) {
text.setAttribute(SVG_X_ATTRIBUTE,
- convertDoubleToString(position.getX()));
+ convertDoubleToString(bounds.getX()));
}
- if (position.eIsSet(DCPackage.Literals.POINT__Y)) {
+ if (bounds.eIsSet(DCPackage.Literals.BOUNDS__Y)) {
text.setAttribute(SVG_Y_ATTRIBUTE,
- convertDoubleToString(position.getY()));
+ convertDoubleToString(bounds.getY()));
+ }
+ if (bounds.eIsSet(DCPackage.Literals.BOUNDS__WIDTH)) {
+ text.setAttribute(SVG_WIDTH_ATTRIBUTE,
+ convertDoubleToString(bounds.getWidth()));
+ }
+ if (bounds.eIsSet(DCPackage.Literals.BOUNDS__HEIGHT)) {
+ text.setAttribute(SVG_HEIGHT_ATTRIBUTE,
+ convertDoubleToString(bounds.getHeight()));
}
}
diff --git a/extraplugins/diagram-definition/org.eclipse.papyrus.dd.examples/.project b/extraplugins/diagram-definition/org.eclipse.papyrus.dd.examples/.project
new file mode 100644
index 00000000000..fd438078f32
--- /dev/null
+++ b/extraplugins/diagram-definition/org.eclipse.papyrus.dd.examples/.project
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+ <name>org.eclipse.papyrus.dd.examples</name>
+ <comment></comment>
+ <projects>
+ </projects>
+ <buildSpec>
+ </buildSpec>
+ <natures>
+ </natures>
+</projectDescription>
diff --git a/extraplugins/diagram-definition/org.eclipse.papyrus.dd.examples/Basic Shapes.dg b/extraplugins/diagram-definition/org.eclipse.papyrus.dd.examples/Basic Shapes.dg
new file mode 100644
index 00000000000..8b644c7eccd
--- /dev/null
+++ b/extraplugins/diagram-definition/org.eclipse.papyrus.dd.examples/Basic Shapes.dg
@@ -0,0 +1,134 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<dg:RootCanvas xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:dg="http://www.omg.org/spec/DD/20110901/DG">
+ <member xsi:type="dg:Circle" radius="40.0">
+ <center x="50.0" y="50.0"/>
+ </member>
+ <member xsi:type="dg:Ellipse">
+ <center x="150.0" y="50.0"/>
+ <radii width="50.0" height="30.0"/>
+ </member>
+ <member xsi:type="dg:Rectangle">
+ <bounds x="210.0" y="25.0" width="80.0" height="50.0"/>
+ </member>
+ <member xsi:type="dg:Rectangle" cornerRadius="10.0">
+ <bounds x="300.0" y="25.0" width="80.0" height="50.0"/>
+ </member>
+ <member xsi:type="dg:Line">
+ <style>
+ <stroke color="#000000"/>
+ </style>
+ <start x="390.0" y="80.0"/>
+ <end x="440.0" y="20.0"/>
+ </member>
+ <member xsi:type="dg:Polyline">
+ <style>
+ <fill/>
+ <stroke color="#000000"/>
+ </style>
+ <point x="450.0" y="80.0"/>
+ <point x="450.0" y="20.0"/>
+ <point x="480.0" y="50.0"/>
+ <point x="510.0" y="20.0"/>
+ <point x="510.0" y="80.0"/>
+ </member>
+ <member xsi:type="dg:Polygon">
+ <point x="520.0" y="40.0"/>
+ <point x="550.0" y="20.0"/>
+ <point x="580.0" y="40.0"/>
+ <point x="580.0" y="70.0"/>
+ <point x="550.0" y="90.0"/>
+ <point x="520.0" y="70.0"/>
+ </member>
+ <member xsi:type="dg:Path">
+ <command xsi:type="dg:MoveTo">
+ <point x="10.0" y="100.0"/>
+ </command>
+ <command xsi:type="dg:LineTo">
+ <point x="90.0" y="100.0"/>
+ </command>
+ <command xsi:type="dg:LineTo">
+ <point x="50.0" y="150.0"/>
+ </command>
+ <command xsi:type="dg:ClosePath"/>
+ </member>
+ <member xsi:type="dg:Path">
+ <command xsi:type="dg:MoveTo" isRelative="true">
+ <point x="140.0" y="100.0"/>
+ </command>
+ <command xsi:type="dg:LineTo" isRelative="true">
+ <point x="40.0" y="50.0"/>
+ </command>
+ <command xsi:type="dg:LineTo" isRelative="true">
+ <point x="-80.0" y="0.0"/>
+ </command>
+ <command xsi:type="dg:ClosePath" isRelative="true"/>
+ </member>
+ <member xsi:type="dg:Path">
+ <style>
+ <fill/>
+ <stroke color="#000000"/>
+ </style>
+ <command xsi:type="dg:MoveTo">
+ <point x="200.0" y="125.0"/>
+ </command>
+ <command xsi:type="dg:CubicCurveTo" isRelative="true">
+ <startControl x="0.0" y="-50.0"/>
+ <endControl x="75.0" y="50.0"/>
+ <point x="75.0" y="0.0"/>
+ </command>
+ </member>
+ <member xsi:type="dg:Path">
+ <style>
+ <fill/>
+ <stroke color="#000000"/>
+ </style>
+ <command xsi:type="dg:MoveTo">
+ <point x="300.0" y="150.0"/>
+ </command>
+ <command xsi:type="dg:QuadraticCurveTo" isRelative="true">
+ <control x="25.0" y="-100.0"/>
+ <point x="50.0" y="0.0"/>
+ </command>
+ </member>
+ <member xsi:type="dg:Path">
+ <command xsi:type="dg:MoveTo">
+ <point x="400.0" y="125.0"/>
+ </command>
+ <command xsi:type="dg:LineTo" isRelative="true">
+ <point x="-25.0" y="0.0"/>
+ </command>
+ <command xsi:type="dg:EllipticalArcTo" isRelative="true" isLargeArc="true">
+ <radii width="25.0" height="25.0"/>
+ <point x="25.0" y="-25.0"/>
+ </command>
+ <command xsi:type="dg:ClosePath" isRelative="true"/>
+ </member>
+ <member xsi:type="dg:Text" data="Hello World!">
+ <bounds x="450.0" y="100.0"/>
+ </member>
+ <member xsi:type="dg:Image" source="Tiger.jpg" isAspectRatioPreserved="true">
+ <bounds x="10.0" y="180.0" width="300.0" height="200.0"/>
+ </member>
+ <definitions>
+ <styleSheet>
+ <rule>
+ <selector/>
+ <style>
+ <fill color="#0000FF"/>
+ <stroke color="#FF0000"/>
+ </style>
+ </rule>
+ <rule>
+ <selector kind="text"/>
+ <style fontSize="40.0" fontName="Times New Roman" fontItalic="true" fontBold="true" fontDecoration="underline"/>
+ </rule>
+ <rule>
+ <selector kind="ellipse"/>
+ <style fillOpacity="0.25" strokeWidth="5.0" strokeOpacity="0.5">
+ <strokeDashLength>5.0</strokeDashLength>
+ <strokeDashLength>5.0</strokeDashLength>
+ </style>
+ </rule>
+ </styleSheet>
+ </definitions>
+</dg:RootCanvas>
diff --git a/extraplugins/diagram-definition/org.eclipse.papyrus.dd.examples/Group Shapes.dg b/extraplugins/diagram-definition/org.eclipse.papyrus.dd.examples/Group Shapes.dg
new file mode 100644
index 00000000000..660d91f3468
--- /dev/null
+++ b/extraplugins/diagram-definition/org.eclipse.papyrus.dd.examples/Group Shapes.dg
@@ -0,0 +1,162 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<dg:RootCanvas xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:dg="http://www.omg.org/spec/DD/20110901/DG" backgroundColor="#00FFFF">
+ <member xsi:type="dg:Group">
+ <member xsi:type="dg:Use" referencedElement="head"/>
+ </member>
+ <member xsi:type="dg:Canvas">
+ <member xsi:type="dg:Use" referencedElement="head"/>
+ <bounds x="120.0"/>
+ </member>
+ <member xsi:type="dg:Use" clipPath="clip1" referencedElement="head">
+ <bounds x="240.0" y="0.0"/>
+ </member>
+ <member xsi:type="dg:Use" referencedElement="head">
+ <style strokeWidth="3.0"/>
+ <bounds x="360.0"/>
+ </member>
+ <member xsi:type="dg:Use" referencedElement="head">
+ <transform xsi:type="dg:Translate" deltaY="100.0"/>
+ <transform xsi:type="dg:Scale" factorX="2.0" factorY="2.0"/>
+ <transform xsi:type="dg:Rotate" angle="90.0">
+ <center x="50.0" y="50.0"/>
+ </transform>
+ <transform xsi:type="dg:Skew" angleX="20.0"/>
+ </member>
+ <member xsi:type="dg:Use" referencedElement="head">
+ <transform xsi:type="dg:Matrix" a="2.0" d="2.0" e="200.0" f="100.0"/>
+ </member>
+ <definitions>
+ <definition xsi:type="dg:Group" id="head">
+ <member xsi:type="dg:Ellipse">
+ <class>ear</class>
+ <center x="92.0" y="50.0"/>
+ <radii width="5.0" height="10.0"/>
+ </member>
+ <member xsi:type="dg:Ellipse">
+ <class>ear</class>
+ <center x="8.0" y="50.0"/>
+ <radii width="5.0" height="10.0"/>
+ </member>
+ <member xsi:type="dg:Circle" radius="40.0">
+ <class>face</class>
+ <center x="50.0" y="50.0"/>
+ </member>
+ <member xsi:type="dg:Ellipse">
+ <class>eye</class>
+ <center x="30.0" y="40.0"/>
+ <radii width="10.0" height="5.0"/>
+ </member>
+ <member xsi:type="dg:Ellipse">
+ <class>eye</class>
+ <center x="70.0" y="40.0"/>
+ <radii width="10.0" height="5.0"/>
+ </member>
+ <member xsi:type="dg:Circle" radius="5.0">
+ <class>pupil</class>
+ <center x="30.0" y="40.0"/>
+ </member>
+ <member xsi:type="dg:Circle" radius="5.0">
+ <class>pupil</class>
+ <center x="70.0" y="40.0"/>
+ </member>
+ <member xsi:type="dg:Polygon">
+ <class>nose</class>
+ <point x="50.0" y="50.0"/>
+ <point x="55.0" y="60.0"/>
+ <point x="45.0" y="60.0"/>
+ </member>
+ <member xsi:type="dg:Path">
+ <class>mouth</class>
+ <command xsi:type="dg:MoveTo">
+ <point x="60.0" y="70.0"/>
+ </command>
+ <command xsi:type="dg:LineTo" isRelative="true">
+ <point x="-20.0"/>
+ </command>
+ <command xsi:type="dg:EllipticalArcTo" isRelative="true" isLargeArc="true">
+ <radii width="10.0" height="10.0"/>
+ <point x="20.0"/>
+ </command>
+ </member>
+ <member xsi:type="dg:Path">
+ <class>eyebrow</class>
+ <command xsi:type="dg:MoveTo">
+ <point x="22.0" y="28.0"/>
+ </command>
+ <command xsi:type="dg:CubicCurveTo" isRelative="true">
+ <startControl y="-10.0"/>
+ <endControl x="20.0" y="10.0"/>
+ <point x="20.0"/>
+ </command>
+ </member>
+ <member xsi:type="dg:Path">
+ <class>eyebrow</class>
+ <command xsi:type="dg:MoveTo">
+ <point x="58.0" y="28.0"/>
+ </command>
+ <command xsi:type="dg:CubicCurveTo" isRelative="true">
+ <startControl y="10.0"/>
+ <endControl x="20.0" y="-10.0"/>
+ <point x="20.0"/>
+ </command>
+ </member>
+ </definition>
+ <definition xsi:type="dg:ClipPath" id="clip1">
+ <member xsi:type="dg:Rectangle">
+ <bounds x="0.5" width="0.5" height="1.0"/>
+ </member>
+ </definition>
+ <styleSheet>
+ <rule>
+ <selector/>
+ <style>
+ <fill/>
+ <stroke color="#000000"/>
+ </style>
+ </rule>
+ <rule>
+ <selector>
+ <class>face</class>
+ </selector>
+ <style>
+ <fill color="#FFD197"/>
+ </style>
+ </rule>
+ <rule>
+ <selector>
+ <class>eye</class>
+ </selector>
+ <style>
+ <fill color="#FFFFFF"/>
+ </style>
+ </rule>
+ <rule>
+ <selector>
+ <class>pupil</class>
+ </selector>
+ <style>
+ <fill color="#0000FF"/>
+ </style>
+ </rule>
+ <rule>
+ <selector>
+ <class>nose</class>
+ </selector>
+ <selector>
+ <class>ear</class>
+ </selector>
+ <style>
+ <fill color="#FFCC00"/>
+ </style>
+ </rule>
+ <rule>
+ <selector>
+ <class>mouth</class>
+ </selector>
+ <style>
+ <fill color="#FF0000"/>
+ </style>
+ </rule>
+ </styleSheet>
+ </definitions>
+</dg:RootCanvas>
diff --git a/extraplugins/diagram-definition/org.eclipse.papyrus.dd.examples/Markers.dg b/extraplugins/diagram-definition/org.eclipse.papyrus.dd.examples/Markers.dg
new file mode 100644
index 00000000000..1f6ae2e562c
--- /dev/null
+++ b/extraplugins/diagram-definition/org.eclipse.papyrus.dd.examples/Markers.dg
@@ -0,0 +1,137 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<dg:RootCanvas xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:dg="http://www.omg.org/spec/DD/20110901/DG">
+ <member xsi:type="dg:Line" endMarker="white-closed-arrow">
+ <start x="0.0" y="30.0"/>
+ <end x="90.0" y="30.0"/>
+ </member>
+ <member xsi:type="dg:Polyline" endMarker="open-arrow" midMarker="white-circle">
+ <transform xsi:type="dg:Translate" deltaX="100.0"/>
+ <point x="0.0" y="30.0"/>
+ <point x="70.0" y="30.0"/>
+ <point x="90.0" y="60.0"/>
+ </member>
+ <member xsi:type="dg:Path" endMarker="black-closed-arrow" midMarker="black-circle" startMarker="black-diamond">
+ <transform xsi:type="dg:Translate" deltaX="200.0"/>
+ <command xsi:type="dg:MoveTo">
+ <point x="0.0" y="60.0"/>
+ </command>
+ <command xsi:type="dg:LineTo">
+ <point x="50.0" y="30.0"/>
+ </command>
+ <command xsi:type="dg:LineTo">
+ <point x="90.0" y="60.0"/>
+ </command>
+ </member>
+ <member xsi:type="dg:Path" endMarker="black-closed-arrow" startMarker="white-diamond">
+ <transform xsi:type="dg:Translate" deltaX="300.0"/>
+ <command xsi:type="dg:MoveTo">
+ <point x="0.0" y="60.0"/>
+ </command>
+ <command xsi:type="dg:LineTo">
+ <point x="50.0" y="30.0"/>
+ </command>
+ </member>
+ <member xsi:type="dg:Path" endMarker="black-closed-arrow" midMarker="white-circle" startMarker="black-diamond">
+ <style strokeWidth="3.0"/>
+ <transform xsi:type="dg:Translate" deltaX="10.0" deltaY="50.0"/>
+ <command xsi:type="dg:MoveTo">
+ <point x="0.0" y="60.0"/>
+ </command>
+ <command xsi:type="dg:LineTo">
+ <point x="100.0" y="30.0"/>
+ </command>
+ <command xsi:type="dg:LineTo">
+ <point x="200.0" y="60.0"/>
+ </command>
+ </member>
+ <definitions>
+ <definition xsi:type="dg:Marker" id="open-arrow">
+ <member xsi:type="dg:Polyline">
+ <point/>
+ <point x="12.0" y="5.0"/>
+ <point y="10.0"/>
+ </member>
+ <size width="12.0" height="10.0"/>
+ <reference x="12.0" y="5.0"/>
+ </definition>
+ <definition xsi:type="dg:Marker" id="white-closed-arrow">
+ <member xsi:type="dg:Polygon">
+ <style>
+ <fill color="#FFFFFF"/>
+ </style>
+ <point/>
+ <point x="12.0" y="5.0"/>
+ <point y="10.0"/>
+ </member>
+ <size width="12.0" height="10.0"/>
+ <reference x="12.0" y="5.0"/>
+ </definition>
+ <definition xsi:type="dg:Marker" id="black-closed-arrow">
+ <member xsi:type="dg:Polygon">
+ <style>
+ <fill color="#000000"/>
+ </style>
+ <point/>
+ <point x="12.0" y="5.0"/>
+ <point y="10.0"/>
+ </member>
+ <size width="12.0" height="10.0"/>
+ <reference x="12.0" y="5.0"/>
+ </definition>
+ <definition xsi:type="dg:Marker" id="white-diamond">
+ <member xsi:type="dg:Polygon">
+ <style>
+ <fill color="#FFFFFF"/>
+ </style>
+ <point y="5.0"/>
+ <point x="8.0" y="0.0"/>
+ <point x="16.0" y="5.0"/>
+ <point x="8.0" y="10.0"/>
+ </member>
+ <size width="16.0" height="10.0"/>
+ <reference x="0.0" y="5.0"/>
+ </definition>
+ <definition xsi:type="dg:Marker" id="black-diamond">
+ <member xsi:type="dg:Polygon">
+ <style>
+ <fill color="#000000"/>
+ </style>
+ <point y="5.0"/>
+ <point x="8.0" y="0.0"/>
+ <point x="16.0" y="5.0"/>
+ <point x="8.0" y="10.0"/>
+ </member>
+ <size width="16.0" height="10.0"/>
+ <reference x="0.0" y="5.0"/>
+ </definition>
+ <definition xsi:type="dg:Marker" id="white-circle">
+ <member xsi:type="dg:Circle" radius="5.0">
+ <style>
+ <fill color="#FFFFFF"/>
+ </style>
+ <center x="5.0" y="5.0"/>
+ </member>
+ <size width="10.0" height="10.0"/>
+ <reference x="5.0" y="5.0"/>
+ </definition>
+ <definition xsi:type="dg:Marker" id="black-circle">
+ <member xsi:type="dg:Circle" radius="5.0">
+ <style>
+ <fill color="#000000"/>
+ </style>
+ <center x="5.0" y="5.0"/>
+ </member>
+ <size width="10.0" height="10.0"/>
+ <reference x="5.0" y="5.0"/>
+ </definition>
+ <styleSheet>
+ <rule>
+ <selector/>
+ <style strokeWidth="1.0">
+ <fill/>
+ <stroke color="#000000"/>
+ </style>
+ </rule>
+ </styleSheet>
+ </definitions>
+</dg:RootCanvas>
diff --git a/extraplugins/diagram-definition/org.eclipse.papyrus.dd.examples/Paints.dg b/extraplugins/diagram-definition/org.eclipse.papyrus.dd.examples/Paints.dg
new file mode 100644
index 00000000000..d222bfe2e22
--- /dev/null
+++ b/extraplugins/diagram-definition/org.eclipse.papyrus.dd.examples/Paints.dg
@@ -0,0 +1,55 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<dg:RootCanvas xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:dg="http://www.omg.org/spec/DD/20110901/DG">
+ <member xsi:type="dg:Rectangle">
+ <style strokeWidth="2.0">
+ <fill paintServer="linear1"/>
+ <stroke color="#000000"/>
+ </style>
+ <bounds x="10.0" y="10.0" width="200.0" height="100.0"/>
+ </member>
+ <member xsi:type="dg:Ellipse">
+ <style strokeWidth="2.0">
+ <fill paintServer="radial1"/>
+ <stroke color="#000000"/>
+ </style>
+ <center x="300.0" y="60.0"/>
+ <radii width="50.0" height="50.0"/>
+ </member>
+ <member xsi:type="dg:Ellipse">
+ <style strokeWidth="2.0">
+ <fill paintServer="pattern1"/>
+ <stroke color="#000000"/>
+ </style>
+ <center x="450.0" y="60.0"/>
+ <radii width="75.0" height="50.0"/>
+ </member>
+ <definitions>
+ <definition xsi:type="dg:LinearGradient" id="linear1">
+ <transform xsi:type="dg:Rotate" angle="10.0"/>
+ <stop color="#FF0000" offset="5.0"/>
+ <stop color="#00FF00" offset="95.0"/>
+ <start x="10.0" y="10.0"/>
+ <end x="90.0" y="90.0"/>
+ </definition>
+ <definition xsi:type="dg:RadialGradient" id="radial1" radius="50.0">
+ <stop color="#FF0000" offset="0.0"/>
+ <stop color="#0000FF" offset="50.0"/>
+ <stop color="#FF0000" offset="100.0"/>
+ <center x="50.0" y="50.0"/>
+ <focus x="50.0" y="50.0"/>
+ </definition>
+ <definition xsi:type="dg:Pattern" id="pattern1">
+ <transform xsi:type="dg:Rotate" angle="45.0"/>
+ <bounds x="0.0" y="0.0" width="20.0" height="20.0"/>
+ <tile xsi:type="dg:Polygon">
+ <style>
+ <fill color="#FF0000"/>
+ <stroke color="#0000FF"/>
+ </style>
+ <point/>
+ <point x="10.0"/>
+ <point x="5.0" y="10.0"/>
+ </tile>
+ </definition>
+ </definitions>
+</dg:RootCanvas>
diff --git a/extraplugins/diagram-definition/org.eclipse.papyrus.dd.examples/Tiger.jpg b/extraplugins/diagram-definition/org.eclipse.papyrus.dd.examples/Tiger.jpg
new file mode 100644
index 00000000000..687e5de4875
--- /dev/null
+++ b/extraplugins/diagram-definition/org.eclipse.papyrus.dd.examples/Tiger.jpg
Binary files differ
diff --git a/extraplugins/diagram-definition/org.eclipse.papyrus.umldi2dg/.classpath b/extraplugins/diagram-definition/org.eclipse.papyrus.dd.qvt/.classpath
index 3bc247511f0..098194ca4b7 100644
--- a/extraplugins/diagram-definition/org.eclipse.papyrus.umldi2dg/.classpath
+++ b/extraplugins/diagram-definition/org.eclipse.papyrus.dd.qvt/.classpath
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
- <classpathentry kind="src" path="src"/>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.7"/>
<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
+ <classpathentry kind="src" path="src"/>
<classpathentry kind="output" path="bin"/>
</classpath>
diff --git a/extraplugins/diagram-definition/org.eclipse.papyrus.dd.qvt/.project b/extraplugins/diagram-definition/org.eclipse.papyrus.dd.qvt/.project
new file mode 100644
index 00000000000..07633c20b27
--- /dev/null
+++ b/extraplugins/diagram-definition/org.eclipse.papyrus.dd.qvt/.project
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+ <name>org.eclipse.papyrus.dd.qvt</name>
+ <comment></comment>
+ <projects>
+ </projects>
+ <buildSpec>
+ <buildCommand>
+ <name>org.eclipse.jdt.core.javabuilder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
+ <buildCommand>
+ <name>org.eclipse.pde.ManifestBuilder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
+ <buildCommand>
+ <name>org.eclipse.pde.SchemaBuilder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
+ </buildSpec>
+ <natures>
+ <nature>org.eclipse.pde.PluginNature</nature>
+ <nature>org.eclipse.jdt.core.javanature</nature>
+ </natures>
+</projectDescription>
diff --git a/extraplugins/diagram-definition/org.eclipse.papyrus.dd.qvt/.settings/org.eclipse.jdt.core.prefs b/extraplugins/diagram-definition/org.eclipse.papyrus.dd.qvt/.settings/org.eclipse.jdt.core.prefs
new file mode 100644
index 00000000000..f42de363afa
--- /dev/null
+++ b/extraplugins/diagram-definition/org.eclipse.papyrus.dd.qvt/.settings/org.eclipse.jdt.core.prefs
@@ -0,0 +1,7 @@
+eclipse.preferences.version=1
+org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.7
+org.eclipse.jdt.core.compiler.compliance=1.7
+org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
+org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
+org.eclipse.jdt.core.compiler.source=1.7
diff --git a/extraplugins/diagram-definition/org.eclipse.papyrus.dd.qvt/META-INF/MANIFEST.MF b/extraplugins/diagram-definition/org.eclipse.papyrus.dd.qvt/META-INF/MANIFEST.MF
new file mode 100644
index 00000000000..305a4edb0b5
--- /dev/null
+++ b/extraplugins/diagram-definition/org.eclipse.papyrus.dd.qvt/META-INF/MANIFEST.MF
@@ -0,0 +1,9 @@
+Manifest-Version: 1.0
+Bundle-ManifestVersion: 2
+Bundle-Name: %pluginName
+Bundle-SymbolicName: org.eclipse.papyrus.dd.qvt;singleton:=true
+Bundle-Version: 1.0.0.qualifier
+Require-Bundle: org.eclipse.m2m.qvt.oml,
+ org.eclipse.papyrus.dd
+Bundle-RequiredExecutionEnvironment: JavaSE-1.7
+Bundle-Vendor: %providerName
diff --git a/extraplugins/diagram-definition/org.eclipse.papyrus.dd.qvt/build.properties b/extraplugins/diagram-definition/org.eclipse.papyrus.dd.qvt/build.properties
new file mode 100644
index 00000000000..0b993cf881f
--- /dev/null
+++ b/extraplugins/diagram-definition/org.eclipse.papyrus.dd.qvt/build.properties
@@ -0,0 +1,17 @@
+# 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
+
+bin.includes = .,\
+ META-INF/,\
+ plugin.xml,\
+ plugin.properties
+source.. = src/
+output.. = bin
+ \ No newline at end of file
diff --git a/extraplugins/diagram-definition/org.eclipse.papyrus.dd.qvt/plugin.properties b/extraplugins/diagram-definition/org.eclipse.papyrus.dd.qvt/plugin.properties
new file mode 100644
index 00000000000..fc3566417d1
--- /dev/null
+++ b/extraplugins/diagram-definition/org.eclipse.papyrus.dd.qvt/plugin.properties
@@ -0,0 +1,13 @@
+###############################################################################
+# Copyright (c) 2008, 2009 Borland Software Corporation and others.
+#
+# 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:
+# Borland Software Corporation - initial API and implementation
+###############################################################################
+pluginName=DD QVT Plugin
+providerName=CEA LIST
diff --git a/extraplugins/diagram-definition/org.eclipse.papyrus.umldi2dg/plugin.xml b/extraplugins/diagram-definition/org.eclipse.papyrus.dd.qvt/plugin.xml
index 76a4c4fdba5..db5235c3244 100644
--- a/extraplugins/diagram-definition/org.eclipse.papyrus.umldi2dg/plugin.xml
+++ b/extraplugins/diagram-definition/org.eclipse.papyrus.dd.qvt/plugin.xml
@@ -15,8 +15,8 @@
<plugin>
<extension point="org.eclipse.m2m.qvt.oml.javaBlackboxUnits">
- <unit name="UtilitiesLibrary" namespace="org.eclipse.papyrus.umldi2dg">
- <library name="UtilitiesLibrary" class="org.eclipse.papyrus.umldi2dg.UtilitiesLibrary">
+ <unit name="UtilitiesLibrary" namespace="org.eclipse.papyrus.dd.qvt">
+ <library name="UtilitiesLibrary" class="org.eclipse.papyrus.dd.qvt.UtilitiesLibrary">
<metamodel nsURI="http://www.omg.org/spec/DD/20110901/DC"/>
</library>
</unit>
diff --git a/extraplugins/diagram-definition/org.eclipse.papyrus.umldi2dg/src/org/eclipse/papyrus/umldi2dg/UtilitiesLibrary.java b/extraplugins/diagram-definition/org.eclipse.papyrus.dd.qvt/src/org/eclipse/papyrus/dd/qvt/UtilitiesLibrary.java
index 57539f0fd21..5c0a657be60 100644
--- a/extraplugins/diagram-definition/org.eclipse.papyrus.umldi2dg/src/org/eclipse/papyrus/umldi2dg/UtilitiesLibrary.java
+++ b/extraplugins/diagram-definition/org.eclipse.papyrus.dd.qvt/src/org/eclipse/papyrus/dd/qvt/UtilitiesLibrary.java
@@ -1,15 +1,15 @@
/**
* 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.umldi2dg;
+package org.eclipse.papyrus.dd.qvt;
import java.awt.Color;
diff --git a/extraplugins/diagram-definition/org.eclipse.papyrus.dd/.settings/org.eclipse.jdt.core.prefs b/extraplugins/diagram-definition/org.eclipse.papyrus.dd/.settings/org.eclipse.jdt.core.prefs
index 11f6e462df7..56b6907735f 100644
--- a/extraplugins/diagram-definition/org.eclipse.papyrus.dd/.settings/org.eclipse.jdt.core.prefs
+++ b/extraplugins/diagram-definition/org.eclipse.papyrus.dd/.settings/org.eclipse.jdt.core.prefs
@@ -1,7 +1,287 @@
-eclipse.preferences.version=1
-org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.7
-org.eclipse.jdt.core.compiler.compliance=1.7
-org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
-org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
-org.eclipse.jdt.core.compiler.source=1.7
+eclipse.preferences.version=1
+org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.7
+org.eclipse.jdt.core.compiler.compliance=1.7
+org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
+org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
+org.eclipse.jdt.core.compiler.source=1.7
+org.eclipse.jdt.core.formatter.align_type_members_on_columns=false
+org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression=0
+org.eclipse.jdt.core.formatter.alignment_for_arguments_in_annotation=0
+org.eclipse.jdt.core.formatter.alignment_for_arguments_in_enum_constant=0
+org.eclipse.jdt.core.formatter.alignment_for_arguments_in_explicit_constructor_call=0
+org.eclipse.jdt.core.formatter.alignment_for_arguments_in_method_invocation=0
+org.eclipse.jdt.core.formatter.alignment_for_arguments_in_qualified_allocation_expression=0
+org.eclipse.jdt.core.formatter.alignment_for_assignment=0
+org.eclipse.jdt.core.formatter.alignment_for_binary_expression=0
+org.eclipse.jdt.core.formatter.alignment_for_compact_if=0
+org.eclipse.jdt.core.formatter.alignment_for_conditional_expression=0
+org.eclipse.jdt.core.formatter.alignment_for_enum_constants=0
+org.eclipse.jdt.core.formatter.alignment_for_expressions_in_array_initializer=0
+org.eclipse.jdt.core.formatter.alignment_for_method_declaration=0
+org.eclipse.jdt.core.formatter.alignment_for_multiple_fields=16
+org.eclipse.jdt.core.formatter.alignment_for_parameters_in_constructor_declaration=0
+org.eclipse.jdt.core.formatter.alignment_for_parameters_in_method_declaration=0
+org.eclipse.jdt.core.formatter.alignment_for_resources_in_try=80
+org.eclipse.jdt.core.formatter.alignment_for_selector_in_method_invocation=0
+org.eclipse.jdt.core.formatter.alignment_for_superclass_in_type_declaration=0
+org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_enum_declaration=0
+org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_type_declaration=0
+org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_constructor_declaration=0
+org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_method_declaration=0
+org.eclipse.jdt.core.formatter.alignment_for_union_type_in_multicatch=16
+org.eclipse.jdt.core.formatter.blank_lines_after_imports=1
+org.eclipse.jdt.core.formatter.blank_lines_after_package=1
+org.eclipse.jdt.core.formatter.blank_lines_before_field=1
+org.eclipse.jdt.core.formatter.blank_lines_before_first_class_body_declaration=1
+org.eclipse.jdt.core.formatter.blank_lines_before_imports=1
+org.eclipse.jdt.core.formatter.blank_lines_before_member_type=1
+org.eclipse.jdt.core.formatter.blank_lines_before_method=1
+org.eclipse.jdt.core.formatter.blank_lines_before_new_chunk=1
+org.eclipse.jdt.core.formatter.blank_lines_before_package=0
+org.eclipse.jdt.core.formatter.blank_lines_between_import_groups=1
+org.eclipse.jdt.core.formatter.blank_lines_between_type_declarations=1
+org.eclipse.jdt.core.formatter.brace_position_for_annotation_type_declaration=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_anonymous_type_declaration=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_array_initializer=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_block=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_block_in_case=next_line
+org.eclipse.jdt.core.formatter.brace_position_for_constructor_declaration=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_enum_constant=next_line
+org.eclipse.jdt.core.formatter.brace_position_for_enum_declaration=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_method_declaration=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_switch=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_type_declaration=end_of_line
+org.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_block_comment=false
+org.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_javadoc_comment=false
+org.eclipse.jdt.core.formatter.comment.format_block_comments=true
+org.eclipse.jdt.core.formatter.comment.format_header=false
+org.eclipse.jdt.core.formatter.comment.format_html=true
+org.eclipse.jdt.core.formatter.comment.format_javadoc_comments=true
+org.eclipse.jdt.core.formatter.comment.format_line_comments=false
+org.eclipse.jdt.core.formatter.comment.format_source_code=true
+org.eclipse.jdt.core.formatter.comment.indent_parameter_description=false
+org.eclipse.jdt.core.formatter.comment.indent_root_tags=true
+org.eclipse.jdt.core.formatter.comment.insert_new_line_before_root_tags=insert
+org.eclipse.jdt.core.formatter.comment.insert_new_line_for_parameter=insert
+org.eclipse.jdt.core.formatter.comment.line_length=150
+org.eclipse.jdt.core.formatter.comment.new_lines_at_block_boundaries=true
+org.eclipse.jdt.core.formatter.comment.new_lines_at_javadoc_boundaries=true
+org.eclipse.jdt.core.formatter.comment.preserve_white_space_between_code_and_line_comments=false
+org.eclipse.jdt.core.formatter.compact_else_if=true
+org.eclipse.jdt.core.formatter.continuation_indentation=1
+org.eclipse.jdt.core.formatter.continuation_indentation_for_array_initializer=1
+org.eclipse.jdt.core.formatter.disabling_tag=@formatter\:off
+org.eclipse.jdt.core.formatter.enabling_tag=@formatter\:on
+org.eclipse.jdt.core.formatter.format_guardian_clause_on_one_line=false
+org.eclipse.jdt.core.formatter.format_line_comment_starting_on_first_column=true
+org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_annotation_declaration_header=true
+org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_enum_constant_header=true
+org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_enum_declaration_header=true
+org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_type_header=true
+org.eclipse.jdt.core.formatter.indent_breaks_compare_to_cases=true
+org.eclipse.jdt.core.formatter.indent_empty_lines=false
+org.eclipse.jdt.core.formatter.indent_statements_compare_to_block=true
+org.eclipse.jdt.core.formatter.indent_statements_compare_to_body=true
+org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_cases=true
+org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_switch=false
+org.eclipse.jdt.core.formatter.indentation.size=4
+org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_field=insert
+org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_local_variable=insert
+org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_method=insert
+org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_package=insert
+org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_parameter=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_type=insert
+org.eclipse.jdt.core.formatter.insert_new_line_after_label=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_after_opening_brace_in_array_initializer=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_at_end_of_file_if_missing=insert
+org.eclipse.jdt.core.formatter.insert_new_line_before_catch_in_try_statement=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_before_closing_brace_in_array_initializer=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_before_else_in_if_statement=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_before_finally_in_try_statement=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_before_while_in_do_statement=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_in_empty_annotation_declaration=insert
+org.eclipse.jdt.core.formatter.insert_new_line_in_empty_anonymous_type_declaration=insert
+org.eclipse.jdt.core.formatter.insert_new_line_in_empty_block=insert
+org.eclipse.jdt.core.formatter.insert_new_line_in_empty_enum_constant=insert
+org.eclipse.jdt.core.formatter.insert_new_line_in_empty_enum_declaration=insert
+org.eclipse.jdt.core.formatter.insert_new_line_in_empty_method_body=insert
+org.eclipse.jdt.core.formatter.insert_new_line_in_empty_type_declaration=insert
+org.eclipse.jdt.core.formatter.insert_space_after_and_in_type_parameter=insert
+org.eclipse.jdt.core.formatter.insert_space_after_assignment_operator=insert
+org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation_type_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_binary_operator=insert
+org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_arguments=insert
+org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_parameters=insert
+org.eclipse.jdt.core.formatter.insert_space_after_closing_brace_in_block=insert
+org.eclipse.jdt.core.formatter.insert_space_after_closing_paren_in_cast=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_colon_in_assert=insert
+org.eclipse.jdt.core.formatter.insert_space_after_colon_in_case=insert
+org.eclipse.jdt.core.formatter.insert_space_after_colon_in_conditional=insert
+org.eclipse.jdt.core.formatter.insert_space_after_colon_in_for=insert
+org.eclipse.jdt.core.formatter.insert_space_after_colon_in_labeled_statement=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_allocation_expression=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_annotation=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_array_initializer=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_constructor_declaration_parameters=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_constructor_declaration_throws=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_enum_constant_arguments=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_enum_declarations=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_explicitconstructorcall_arguments=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_for_increments=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_for_inits=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_declaration_parameters=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_declaration_throws=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_invocation_arguments=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_multiple_field_declarations=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_multiple_local_declarations=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_parameterized_type_reference=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_superinterfaces=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_arguments=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_parameters=insert
+org.eclipse.jdt.core.formatter.insert_space_after_ellipsis=insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_parameterized_type_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_arguments=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_parameters=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_brace_in_array_initializer=insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_bracket_in_array_allocation_expression=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_bracket_in_array_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_annotation=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_cast=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_catch=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_constructor_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_enum_constant=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_for=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_if=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_method_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_method_invocation=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_parenthesized_expression=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_switch=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_synchronized=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_try=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_while=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_postfix_operator=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_prefix_operator=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_question_in_conditional=insert
+org.eclipse.jdt.core.formatter.insert_space_after_question_in_wildcard=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_semicolon_in_for=insert
+org.eclipse.jdt.core.formatter.insert_space_after_semicolon_in_try_resources=insert
+org.eclipse.jdt.core.formatter.insert_space_after_unary_operator=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_and_in_type_parameter=insert
+org.eclipse.jdt.core.formatter.insert_space_before_assignment_operator=insert
+org.eclipse.jdt.core.formatter.insert_space_before_at_in_annotation_type_declaration=insert
+org.eclipse.jdt.core.formatter.insert_space_before_binary_operator=insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_parameterized_type_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_arguments=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_parameters=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_brace_in_array_initializer=insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_bracket_in_array_allocation_expression=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_bracket_in_array_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_annotation=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_cast=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_catch=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_constructor_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_enum_constant=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_for=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_if=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_method_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_method_invocation=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_parenthesized_expression=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_switch=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_synchronized=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_try=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_while=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_colon_in_assert=insert
+org.eclipse.jdt.core.formatter.insert_space_before_colon_in_case=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_colon_in_conditional=insert
+org.eclipse.jdt.core.formatter.insert_space_before_colon_in_default=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_colon_in_for=insert
+org.eclipse.jdt.core.formatter.insert_space_before_colon_in_labeled_statement=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_allocation_expression=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_annotation=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_array_initializer=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_constructor_declaration_parameters=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_constructor_declaration_throws=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_enum_constant_arguments=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_enum_declarations=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_explicitconstructorcall_arguments=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_for_increments=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_for_inits=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_declaration_parameters=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_declaration_throws=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_invocation_arguments=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_multiple_field_declarations=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_multiple_local_declarations=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_parameterized_type_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_superinterfaces=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_arguments=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_parameters=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_ellipsis=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_parameterized_type_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_arguments=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_parameters=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_annotation_type_declaration=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_anonymous_type_declaration=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_array_initializer=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_block=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_constructor_declaration=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_enum_constant=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_enum_declaration=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_method_declaration=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_switch=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_type_declaration=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_allocation_expression=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_type_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_annotation=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_annotation_type_member_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_catch=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_constructor_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_enum_constant=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_for=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_if=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_method_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_method_invocation=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_parenthesized_expression=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_switch=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_synchronized=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_try=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_while=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_parenthesized_expression_in_return=insert
+org.eclipse.jdt.core.formatter.insert_space_before_parenthesized_expression_in_throw=insert
+org.eclipse.jdt.core.formatter.insert_space_before_postfix_operator=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_prefix_operator=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_question_in_conditional=insert
+org.eclipse.jdt.core.formatter.insert_space_before_question_in_wildcard=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_semicolon=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_semicolon_in_for=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_semicolon_in_try_resources=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_unary_operator=do not insert
+org.eclipse.jdt.core.formatter.insert_space_between_brackets_in_array_type_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_between_empty_braces_in_array_initializer=do not insert
+org.eclipse.jdt.core.formatter.insert_space_between_empty_brackets_in_array_allocation_expression=do not insert
+org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_annotation_type_member_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_constructor_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_enum_constant=do not insert
+org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_invocation=do not insert
+org.eclipse.jdt.core.formatter.join_lines_in_comments=false
+org.eclipse.jdt.core.formatter.join_wrapped_lines=true
+org.eclipse.jdt.core.formatter.keep_else_statement_on_same_line=false
+org.eclipse.jdt.core.formatter.keep_empty_array_initializer_on_one_line=false
+org.eclipse.jdt.core.formatter.keep_imple_if_on_one_line=false
+org.eclipse.jdt.core.formatter.keep_then_statement_on_same_line=false
+org.eclipse.jdt.core.formatter.lineSplit=200
+org.eclipse.jdt.core.formatter.never_indent_block_comments_on_first_column=false
+org.eclipse.jdt.core.formatter.never_indent_line_comments_on_first_column=false
+org.eclipse.jdt.core.formatter.number_of_blank_lines_at_beginning_of_method_body=0
+org.eclipse.jdt.core.formatter.number_of_empty_lines_to_preserve=0
+org.eclipse.jdt.core.formatter.put_empty_statement_on_new_line=false
+org.eclipse.jdt.core.formatter.tabulation.char=tab
+org.eclipse.jdt.core.formatter.tabulation.size=4
+org.eclipse.jdt.core.formatter.use_on_off_tags=false
+org.eclipse.jdt.core.formatter.use_tabs_only_for_leading_indentations=false
+org.eclipse.jdt.core.formatter.wrap_before_binary_operator=true
+org.eclipse.jdt.core.formatter.wrap_before_or_operator_multicatch=true
+org.eclipse.jdt.core.formatter.wrap_outer_expressions_when_nested=true
diff --git a/extraplugins/diagram-definition/org.eclipse.papyrus.dd/.settings/org.eclipse.jdt.ui.prefs b/extraplugins/diagram-definition/org.eclipse.papyrus.dd/.settings/org.eclipse.jdt.ui.prefs
new file mode 100644
index 00000000000..b5f980cae55
--- /dev/null
+++ b/extraplugins/diagram-definition/org.eclipse.papyrus.dd/.settings/org.eclipse.jdt.ui.prefs
@@ -0,0 +1,3 @@
+eclipse.preferences.version=1
+formatter_profile=_Zero blank Papyrus Formatter Profile CDM
+formatter_settings_version=12
diff --git a/extraplugins/diagram-definition/org.eclipse.papyrus.dd/META-INF/MANIFEST.MF b/extraplugins/diagram-definition/org.eclipse.papyrus.dd/META-INF/MANIFEST.MF
index c25fe78314c..cc32e5a6f2b 100644
--- a/extraplugins/diagram-definition/org.eclipse.papyrus.dd/META-INF/MANIFEST.MF
+++ b/extraplugins/diagram-definition/org.eclipse.papyrus.dd/META-INF/MANIFEST.MF
@@ -1,25 +1,24 @@
-Manifest-Version: 1.0
-Require-Bundle: org.eclipse.core.runtime,
- org.eclipse.emf.ecore;visibility:=reexport,
- org.eclipse.papyrus.dd;bundle-version="1.1.0";visibility:=reexport,
- org.eclipse.uml2.common;visibility:=reexport,
- org.eclipse.ocl.ecore;visibility:=reexport
-Export-Package: org.eclipse.papyrus.dd.dc,
- org.eclipse.papyrus.dd.dc.impl,
- org.eclipse.papyrus.dd.dc.util,
- org.eclipse.papyrus.dd.dg,
- org.eclipse.papyrus.dd.dg.impl,
- org.eclipse.papyrus.dd.dg.util,
- org.eclipse.papyrus.dd.di,
- org.eclipse.papyrus.dd.di.impl,
- org.eclipse.papyrus.dd.di.util
-Bundle-Vendor: %providerName
-Bundle-ActivationPolicy: lazy
-Bundle-ClassPath: .
-Bundle-Version: 1.1.0.qualifier
-Bundle-Name: %pluginName
-Bundle-Localization: plugin
-Bundle-ManifestVersion: 2
-Bundle-SymbolicName: org.eclipse.papyrus.dd;singleton:=true
-Bundle-RequiredExecutionEnvironment: JavaSE-1.7
-
+Manifest-Version: 1.0
+Bundle-ManifestVersion: 2
+Bundle-Name: %pluginName
+Bundle-SymbolicName: org.eclipse.papyrus.dd;singleton:=true
+Bundle-Version: 1.0.0.qualifier
+Bundle-ClassPath: .
+Bundle-Vendor: %providerName
+Bundle-Localization: plugin
+Require-Bundle: org.eclipse.core.runtime,
+ org.eclipse.emf.ecore;visibility:=reexport,
+ org.eclipse.papyrus.dd;visibility:=reexport,
+ org.eclipse.uml2.common;visibility:=reexport,
+ org.eclipse.ocl.ecore;visibility:=reexport
+Bundle-ActivationPolicy: lazy
+Bundle-RequiredExecutionEnvironment: JavaSE-1.7
+Export-Package: org.eclipse.papyrus.dd.dc,
+ org.eclipse.papyrus.dd.dc.impl,
+ org.eclipse.papyrus.dd.dc.util,
+ org.eclipse.papyrus.dd.dg,
+ org.eclipse.papyrus.dd.dg.impl,
+ org.eclipse.papyrus.dd.dg.util,
+ org.eclipse.papyrus.dd.di,
+ org.eclipse.papyrus.dd.di.impl,
+ org.eclipse.papyrus.dd.di.util
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 6dd9995ef00..c3b26ebe8ed 100644
--- a/extraplugins/diagram-definition/org.eclipse.papyrus.dd/model/DG.ecore
+++ b/extraplugins/diagram-definition/org.eclipse.papyrus.dd/model/DG.ecore
@@ -463,7 +463,7 @@
</eStructuralFeatures>
</eClassifiers>
<eClassifiers xsi:type="ecore:EClass" name="Definitions">
- <eStructuralFeatures xsi:type="ecore:EReference" name="defnition" upperBound="-1"
+ <eStructuralFeatures xsi:type="ecore:EReference" name="definition" upperBound="-1"
eType="#//Definition" containment="true">
<eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
<details key="documentation" value="A set of clip paths that are referenced by graphical elements in the containing canvas."/>
@@ -1241,8 +1241,8 @@
<details key="documentation" value="the text as a string of characters."/>
</eAnnotations>
</eStructuralFeatures>
- <eStructuralFeatures xsi:type="ecore:EReference" name="position" ordered="false"
- lowerBound="1" eType="ecore:EClass DC.ecore#//Point" containment="true">
+ <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">
<details key="documentation" value="the bounds inside which the text is rendered (possibly wrapped into multiple lines)"/>
</eAnnotations>
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 709d716ee4f..cc2d3052b22 100644
--- a/extraplugins/diagram-definition/org.eclipse.papyrus.dd/model/DG.genmodel
+++ b/extraplugins/diagram-definition/org.eclipse.papyrus.dd/model/DG.genmodel
@@ -170,7 +170,7 @@
</genClasses>
<genClasses xsi:type="genmodel:GenClass" ecoreClass="DG.ecore#//Definitions">
<genFeatures xsi:type="genmodel:GenFeature" property="None" children="true"
- createChild="true" ecoreFeature="ecore:EReference DG.ecore#//Definitions/defnition"/>
+ createChild="true" ecoreFeature="ecore:EReference DG.ecore#//Definitions/definition"/>
<genFeatures xsi:type="genmodel:GenFeature" property="None" children="true"
createChild="true" ecoreFeature="ecore:EReference DG.ecore#//Definitions/styleSheet"/>
</genClasses>
@@ -368,7 +368,7 @@
<genClasses xsi:type="genmodel:GenClass" ecoreClass="DG.ecore#//Text">
<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"/>
+ createChild="true" ecoreFeature="ecore:EReference DG.ecore#//Text/bounds"/>
<genFeatures xsi:type="genmodel:GenFeature" createChild="false" ecoreFeature="ecore:EAttribute DG.ecore#//Text/anchor"/>
<genOperations xsi:type="genmodel:GenOperation" ecoreOperation="DG.ecore#//Text/dataCannotBeEmpty">
<genParameters xsi:type="genmodel:GenParameter" ecoreParameter="DG.ecore#//Text/dataCannotBeEmpty/diagnostics"/>
diff --git a/extraplugins/diagram-definition/org.eclipse.papyrus.dd/model/DG.uml b/extraplugins/diagram-definition/org.eclipse.papyrus.dd/model/DG.uml
index d1b4b920849..9933394853b 100644
--- a/extraplugins/diagram-definition/org.eclipse.papyrus.dd/model/DG.uml
+++ b/extraplugins/diagram-definition/org.eclipse.papyrus.dd/model/DG.uml
@@ -1,25 +1,25 @@
<?xml version="1.0" encoding="UTF-8"?>
<xmi:XMI xmi:version="20110701" xmlns:xmi="http://www.omg.org/spec/XMI/20110701" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:Ecore="http://www.eclipse.org/uml2/schemas/Ecore/5" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" xmlns:uml="http://www.eclipse.org/uml2/4.0.0/UML" xsi:schemaLocation="http://www.eclipse.org/uml2/schemas/Ecore/5 pathmap://UML_PROFILES/Ecore.profile.uml#_z1OFcHjqEdy8S4Cr8Rc_NA">
<uml:Package xmi:id="_0" name="DG" URI="http://www.omg.org/spec/DD/20110901/DG">
- <ownedComment xmi:id="_ownedComment.0" annotatedElement="_0">
+ <ownedComment xmi:type="uml:Comment" xmi:id="_ownedComment.0" annotatedElement="_0">
<body>The Diagram Graphics (DG) package contains a model of graphical primitives that can be instantiated when mapping from a language abstract syntax models and diagram interchange (DI) models to visual presentations. The mapping effectively defines the concrete syntax of a language. This specification does not restrict how the mappings are done, or what languages are used to define them.</body>
</ownedComment>
- <packageImport xmi:id="_packageImport.0">
- <importedPackage href="DC.uml#_0"/>
+ <packageImport xmi:type="uml:PackageImport" xmi:id="_packageImport.0">
+ <importedPackage xmi:type="uml:Package" href="DC.uml#_0"/>
</packageImport>
<packagedElement xmi:type="uml:Class" xmi:id="Canvas" name="Canvas">
- <ownedComment xmi:id="Canvas-_ownedComment.0" annotatedElement="Canvas">
+ <ownedComment xmi:type="uml:Comment" xmi:id="Canvas-_ownedComment.0" annotatedElement="Canvas">
<body>Canvas is a kind of group that has bounds.</body>
</ownedComment>
- <ownedRule xmi:id="_roVmMOjLEeO6TvQHODg78w" name="canvas_cannot_have_transforms" constrainedElement="Canvas">
+ <ownedRule xmi:type="uml:Constraint" xmi:id="_roVmMOjLEeO6TvQHODg78w" name="canvas_cannot_have_transforms" constrainedElement="Canvas">
<specification xmi:type="uml:OpaqueExpression" xmi:id="_roVmMejLEeO6TvQHODg78w">
<language>OCL</language>
<body>transform->isEmpty()</body>
</specification>
</ownedRule>
- <generalization xmi:id="_2PhcIPo2EeOw_Nx9vOEGaA" general="Group"/>
- <ownedAttribute xmi:id="_loGuQNTkEeO3TMM_EGdzeA" name="bounds" visibility="public">
- <ownedComment xmi:id="_loGuQdTkEeO3TMM_EGdzeA" annotatedElement="_loGuQNTkEeO3TMM_EGdzeA">
+ <generalization xmi:type="uml:Generalization" xmi:id="_2PhcIPo2EeOw_Nx9vOEGaA" general="Group"/>
+ <ownedAttribute xmi:type="uml:Property" xmi:id="_loGuQNTkEeO3TMM_EGdzeA" name="bounds" visibility="public">
+ <ownedComment xmi:type="uml:Comment" xmi:id="_loGuQdTkEeO3TMM_EGdzeA" annotatedElement="_loGuQNTkEeO3TMM_EGdzeA">
<body>the bounds of the canvas in the x-y coordinate system.</body>
</ownedComment>
<type xmi:type="uml:DataType" href="DC.uml#Bounds"/>
@@ -27,11 +27,11 @@
</ownedAttribute>
</packagedElement>
<packagedElement xmi:type="uml:Class" xmi:id="Circle" name="Circle">
- <ownedComment xmi:id="Circle-_ownedComment.0" annotatedElement="Circle">
+ <ownedComment xmi:type="uml:Comment" xmi:id="Circle-_ownedComment.0" annotatedElement="Circle">
<body>Circle is a graphical element that defines a circular shape with a given center point and a radius.</body>
</ownedComment>
- <ownedRule xmi:id="Circle-non_negative_radius" name="non_negative_radius" constrainedElement="Circle">
- <ownedComment xmi:id="Circle-non_negative_radius-_ownedComment.0" annotatedElement="Circle-non_negative_radius">
+ <ownedRule xmi:type="uml:Constraint" xmi:id="Circle-non_negative_radius" name="non_negative_radius" constrainedElement="Circle">
+ <ownedComment xmi:type="uml:Comment" xmi:id="Circle-non_negative_radius-_ownedComment.0" annotatedElement="Circle-non_negative_radius">
<body>The radius of a circle cannot be negative</body>
</ownedComment>
<specification xmi:type="uml:OpaqueExpression" xmi:id="Circle-non_negative_radius-_specification">
@@ -39,15 +39,15 @@
<body>radius >= 0</body>
</specification>
</ownedRule>
- <generalization xmi:id="_2PhcIfo2EeOw_Nx9vOEGaA" general="GraphicalElement"/>
- <ownedAttribute xmi:id="Circle-center" name="center" visibility="public">
- <ownedComment xmi:id="Circle-center-_ownedComment.0" annotatedElement="Circle-center">
+ <generalization xmi:type="uml:Generalization" xmi:id="_2PhcIfo2EeOw_Nx9vOEGaA" general="GraphicalElement"/>
+ <ownedAttribute xmi:type="uml:Property" xmi:id="Circle-center" name="center" visibility="public">
+ <ownedComment xmi:type="uml:Comment" xmi:id="Circle-center-_ownedComment.0" annotatedElement="Circle-center">
<body>the center point of the circle in the x-y coordinate system.</body>
</ownedComment>
<type xmi:type="uml:DataType" href="DC.uml#Point"/>
</ownedAttribute>
- <ownedAttribute xmi:id="Circle-radius" name="radius" visibility="public">
- <ownedComment xmi:id="Circle-radius-_ownedComment.0" annotatedElement="Circle-radius">
+ <ownedAttribute xmi:type="uml:Property" xmi:id="Circle-radius" name="radius" visibility="public">
+ <ownedComment xmi:type="uml:Comment" xmi:id="Circle-radius-_ownedComment.0" annotatedElement="Circle-radius">
<body>a real number (>=0) that represents the radius of the circle.</body>
</ownedComment>
<type xmi:type="uml:PrimitiveType" href="DC.uml#Real"/>
@@ -55,53 +55,53 @@
</ownedAttribute>
</packagedElement>
<packagedElement xmi:type="uml:Class" xmi:id="ClipPath" name="ClipPath">
- <ownedComment xmi:id="ClipPath-_ownedComment.0" annotatedElement="ClipPath">
+ <ownedComment xmi:type="uml:Comment" xmi:id="ClipPath-_ownedComment.0" annotatedElement="ClipPath">
<body>ClipPath is a kind of group whose members collectively define a painting mask for its referencing graphical elements.</body>
</ownedComment>
- <generalization xmi:id="_2PhcIvo2EeOw_Nx9vOEGaA" general="Group"/>
+ <generalization xmi:type="uml:Generalization" xmi:id="_2PhcIvo2EeOw_Nx9vOEGaA" general="Group"/>
</packagedElement>
<packagedElement xmi:type="uml:Class" xmi:id="ClosePath" name="ClosePath">
- <ownedComment xmi:id="ClosePath-_ownedComment.0" annotatedElement="ClosePath">
+ <ownedComment xmi:type="uml:Comment" xmi:id="ClosePath-_ownedComment.0" annotatedElement="ClosePath">
<body>ClosePath is a kind of path command that ends the current subpath and causes an automatic straight line to be drawn from the current point to the initial point of the current subpath.</body>
</ownedComment>
- <generalization xmi:id="_2PhcI_o2EeOw_Nx9vOEGaA" general="PathCommand"/>
+ <generalization xmi:type="uml:Generalization" xmi:id="_2PhcI_o2EeOw_Nx9vOEGaA" general="PathCommand"/>
</packagedElement>
<packagedElement xmi:type="uml:Class" xmi:id="CubicCurveTo" name="CubicCurveTo">
- <ownedComment 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 xmi:type="uml: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>
- <generalization xmi:id="_2PhcJPo2EeOw_Nx9vOEGaA" general="PathCommand"/>
- <ownedAttribute xmi:id="CubicCurveTo-startControl" name="startControl" visibility="public">
- <ownedComment xmi:id="CubicCurveTo-startControl-_ownedComment.0" annotatedElement="CubicCurveTo-startControl">
- <body>the start control point of the cubic bézier curve.</body>
+ <generalization xmi:type="uml:Generalization" xmi:id="_2PhcJPo2EeOw_Nx9vOEGaA" general="PathCommand"/>
+ <ownedAttribute xmi:type="uml:Property" xmi:id="CubicCurveTo-startControl" name="startControl" visibility="public">
+ <ownedComment xmi:type="uml:Comment" xmi:id="CubicCurveTo-startControl-_ownedComment.0" annotatedElement="CubicCurveTo-startControl">
+ <body>the start control point of the cubic b��zier curve.</body>
</ownedComment>
<type xmi:type="uml:DataType" href="DC.uml#Point"/>
</ownedAttribute>
- <ownedAttribute xmi:id="CubicCurveTo-endControl" name="endControl" visibility="public">
- <ownedComment xmi:id="CubicCurveTo-endControl-_ownedComment.0" annotatedElement="CubicCurveTo-endControl">
- <body>the end control point of the cubic bézier curve.</body>
+ <ownedAttribute xmi:type="uml:Property" xmi:id="CubicCurveTo-endControl" name="endControl" visibility="public">
+ <ownedComment xmi:type="uml:Comment" xmi:id="CubicCurveTo-endControl-_ownedComment.0" annotatedElement="CubicCurveTo-endControl">
+ <body>the end control point of the cubic b��zier curve.</body>
</ownedComment>
<type xmi:type="uml:DataType" href="DC.uml#Point"/>
</ownedAttribute>
- <ownedAttribute xmi:id="CubicCurveTo-point" name="point" visibility="public">
- <ownedComment 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>
+ <ownedAttribute xmi:type="uml:Property" xmi:id="CubicCurveTo-point" name="point" visibility="public">
+ <ownedComment xmi:type="uml: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="uml:DataType" href="DC.uml#Point"/>
</ownedAttribute>
</packagedElement>
<packagedElement xmi:type="uml:Class" xmi:id="_CwockM6jEeOqlr8E3pzO9g" name="Definition" isAbstract="true">
- <ownedComment xmi:id="_k77BMM6jEeOqlr8E3pzO9g" annotatedElement="MoveTo">
+ <ownedComment xmi:type="uml:Comment" xmi:id="_k77BMM6jEeOqlr8E3pzO9g" annotatedElement="MoveTo">
<body>Definition is an object with an id that can be nested under Definitions.</body>
</ownedComment>
- <ownedRule xmi:id="_0yDOEO08EeOCPtJ2AfZp5A" name="id_cannot_be_empty" constrainedElement="_CwockM6jEeOqlr8E3pzO9g">
+ <ownedRule xmi:type="uml:Constraint" xmi:id="_0yDOEO08EeOCPtJ2AfZp5A" name="id_cannot_be_empty" constrainedElement="_CwockM6jEeOqlr8E3pzO9g">
<specification xmi:type="uml:OpaqueExpression" xmi:id="_0yDOEe08EeOCPtJ2AfZp5A">
<language>OCL</language>
<body>id->notEmpty() implies id.size() > 0</body>
</specification>
</ownedRule>
- <ownedAttribute xmi:id="_3JUlwM6jEeOqlr8E3pzO9g" name="id" visibility="public" isID="true">
- <ownedComment xmi:id="_3JUlwc6jEeOqlr8E3pzO9g" annotatedElement="_3JUlwM6jEeOqlr8E3pzO9g">
+ <ownedAttribute xmi:type="uml:Property" xmi:id="_3JUlwM6jEeOqlr8E3pzO9g" name="id" visibility="public" isID="true">
+ <ownedComment xmi:type="uml:Comment" xmi:id="_3JUlwc6jEeOqlr8E3pzO9g" annotatedElement="_3JUlwM6jEeOqlr8E3pzO9g">
<body>a point to move to in the coordinate system</body>
</ownedComment>
<type xmi:type="uml:PrimitiveType" href="DC.uml#String"/>
@@ -109,84 +109,84 @@
</ownedAttribute>
</packagedElement>
<packagedElement xmi:type="uml:Class" xmi:id="_DH0DwM5yEeOqlr8E3pzO9g" name="Definitions">
- <ownedComment xmi:id="_dKczUM5_EeOqlr8E3pzO9g" annotatedElement="CubicCurveTo">
+ <ownedComment xmi:type="uml:Comment" xmi:id="_dKczUM5_EeOqlr8E3pzO9g" annotatedElement="CubicCurveTo">
<body>Definitions nests definitions that are commonly referenced in the containing canvas. It can also nest an embedded stylesheet.</body>
</ownedComment>
- <ownedAttribute xmi:id="_zSdxIM5wEeOqlr8E3pzO9g" name="defnition" visibility="public" type="_CwockM6jEeOqlr8E3pzO9g" isOrdered="true" aggregation="composite" association="_Nti6EM53EeOqlr8E3pzO9g">
- <ownedComment xmi:id="_zSdxIc5wEeOqlr8E3pzO9g" annotatedElement="_zSdxIM5wEeOqlr8E3pzO9g">
+ <ownedAttribute xmi:type="uml:Property" xmi:id="_zSdxIM5wEeOqlr8E3pzO9g" name="definition" visibility="public" type="_CwockM6jEeOqlr8E3pzO9g" isOrdered="true" aggregation="composite" association="_Nti6EM53EeOqlr8E3pzO9g">
+ <ownedComment xmi:type="uml:Comment" xmi:id="_zSdxIc5wEeOqlr8E3pzO9g" annotatedElement="_zSdxIM5wEeOqlr8E3pzO9g">
<body>A set of clip paths that are referenced by graphical elements in the containing canvas.</body>
</ownedComment>
<lowerValue xmi:type="uml:LiteralInteger" xmi:id="_2Pb8kvo2EeOw_Nx9vOEGaA"/>
<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_2Pb8k_o2EeOw_Nx9vOEGaA" value="*"/>
</ownedAttribute>
- <ownedAttribute xmi:id="Canvas-packagedStyle" name="styleSheet" visibility="public" type="_4ytfwM2CEeOX1ohrWoozJQ" aggregation="composite" association="_packagedElement.47">
- <ownedComment xmi:id="Canvas-packagedStyle-_ownedComment.0" annotatedElement="Canvas-packagedStyle">
+ <ownedAttribute xmi:type="uml:Property" xmi:id="Canvas-packagedStyle" name="styleSheet" visibility="public" type="_4ytfwM2CEeOX1ohrWoozJQ" aggregation="composite" association="_packagedElement.47">
+ <ownedComment xmi:type="uml:Comment" xmi:id="Canvas-packagedStyle-_ownedComment.0" annotatedElement="Canvas-packagedStyle">
<body>An optional embdded style sheet that that apply to graphical elements in the containing canvas.</body>
</ownedComment>
<lowerValue xmi:type="uml:LiteralInteger" xmi:id="_2Pb8lPo2EeOw_Nx9vOEGaA"/>
</ownedAttribute>
</packagedElement>
<packagedElement xmi:type="uml:Class" xmi:id="Ellipse" name="Ellipse">
- <ownedComment xmi:id="Ellipse-_ownedComment.0" annotatedElement="Ellipse">
+ <ownedComment xmi:type="uml:Comment" xmi:id="Ellipse-_ownedComment.0" annotatedElement="Ellipse">
<body>Ellipse is a graphical element that defines an elliptical shape with a given center point and two radii on the x and y axes.</body>
</ownedComment>
- <generalization xmi:id="_2PhcJfo2EeOw_Nx9vOEGaA" general="GraphicalElement"/>
- <ownedAttribute xmi:id="Ellipse-center" name="center" visibility="public">
- <ownedComment xmi:id="Ellipse-center-_ownedComment.0" annotatedElement="Ellipse-center">
+ <generalization xmi:type="uml:Generalization" xmi:id="_2PhcJfo2EeOw_Nx9vOEGaA" general="GraphicalElement"/>
+ <ownedAttribute xmi:type="uml:Property" xmi:id="Ellipse-center" name="center" visibility="public">
+ <ownedComment xmi:type="uml:Comment" xmi:id="Ellipse-center-_ownedComment.0" annotatedElement="Ellipse-center">
<body>the center point of the ellipse in the x-y coordinate system.</body>
</ownedComment>
<type xmi:type="uml:DataType" href="DC.uml#Point"/>
</ownedAttribute>
- <ownedAttribute xmi:id="Ellipse-radii" name="radii" visibility="public">
- <ownedComment xmi:id="Ellipse-radii-_ownedComment.0" annotatedElement="Ellipse-radii">
+ <ownedAttribute xmi:type="uml:Property" xmi:id="Ellipse-radii" name="radii" visibility="public">
+ <ownedComment xmi:type="uml:Comment" xmi:id="Ellipse-radii-_ownedComment.0" annotatedElement="Ellipse-radii">
<body>a dimension that specifies the two radii of the ellipse (a width along the x-axis and a height along the y-axis)</body>
</ownedComment>
<type xmi:type="uml:DataType" href="DC.uml#Dimension"/>
</ownedAttribute>
</packagedElement>
<packagedElement xmi:type="uml:Class" xmi:id="EllipticalArcTo" name="EllipticalArcTo">
- <ownedComment xmi:id="EllipticalArcTo-_ownedComment.0" annotatedElement="CubicCurveTo QuadraticCurveTo">
+ <ownedComment xmi:type="uml: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>
- <generalization xmi:id="_2PhcJvo2EeOw_Nx9vOEGaA" general="PathCommand"/>
- <ownedAttribute xmi:id="EllipticalArcTo-radii" name="radii" visibility="public">
- <ownedComment xmi:id="EllipticalArcTo-radii-_ownedComment.0" annotatedElement="EllipticalArcTo-radii">
+ <generalization xmi:type="uml:Generalization" xmi:id="_2PhcJvo2EeOw_Nx9vOEGaA" general="PathCommand"/>
+ <ownedAttribute xmi:type="uml:Property" xmi:id="EllipticalArcTo-radii" name="radii" visibility="public">
+ <ownedComment xmi:type="uml:Comment" xmi:id="EllipticalArcTo-radii-_ownedComment.0" annotatedElement="EllipticalArcTo-radii">
<body>the two radii of the ellipse from which the arc is created.</body>
</ownedComment>
<type xmi:type="uml:DataType" href="DC.uml#Dimension"/>
</ownedAttribute>
- <ownedAttribute xmi:id="EllipticalArcTo-rotation" name="rotation" visibility="public">
- <ownedComment xmi:id="EllipticalArcTo-rotation-_ownedComment.0" annotatedElement="EllipticalArcTo-rotation">
+ <ownedAttribute xmi:type="uml:Property" xmi:id="EllipticalArcTo-rotation" name="rotation" visibility="public">
+ <ownedComment xmi:type="uml:Comment" xmi:id="EllipticalArcTo-rotation-_ownedComment.0" annotatedElement="EllipticalArcTo-rotation">
<body>a real number representing a rotation (in degrees) of the ellipse from which the arc is created.</body>
</ownedComment>
<type xmi:type="uml:PrimitiveType" href="DC.uml#Real"/>
</ownedAttribute>
- <ownedAttribute xmi:id="EllipticalArcTo-isLargeArc" name="isLargeArc" visibility="public">
- <ownedComment xmi:id="EllipticalArcTo-isLargeArc-_ownedComment.0" annotatedElement="EllipticalArcTo-isLargeArc">
+ <ownedAttribute xmi:type="uml:Property" xmi:id="EllipticalArcTo-isLargeArc" name="isLargeArc" visibility="public">
+ <ownedComment xmi:type="uml:Comment" xmi:id="EllipticalArcTo-isLargeArc-_ownedComment.0" annotatedElement="EllipticalArcTo-isLargeArc">
<body>whether the arc sweep is equal to or greater than 180 degrees (the large arc).</body>
</ownedComment>
<type xmi:type="uml:PrimitiveType" href="DC.uml#Boolean"/>
</ownedAttribute>
- <ownedAttribute xmi:id="EllipticalArcTo-isSweep" name="isSweep" visibility="public">
- <ownedComment xmi:id="EllipticalArcTo-isSweep-_ownedComment.0" annotatedElement="EllipticalArcTo-isSweep">
+ <ownedAttribute xmi:type="uml:Property" xmi:id="EllipticalArcTo-isSweep" name="isSweep" visibility="public">
+ <ownedComment xmi:type="uml:Comment" xmi:id="EllipticalArcTo-isSweep-_ownedComment.0" annotatedElement="EllipticalArcTo-isSweep">
<body>whether the arc is drawn in a positive-angle direction</body>
</ownedComment>
<type xmi:type="uml:PrimitiveType" href="DC.uml#Boolean"/>
</ownedAttribute>
- <ownedAttribute xmi:id="EllipticalArcTo-point" name="point" visibility="public">
- <ownedComment xmi:id="EllipticalArcTo-point-_ownedComment.0" annotatedElement="EllipticalArcTo-point">
+ <ownedAttribute xmi:type="uml:Property" xmi:id="EllipticalArcTo-point" name="point" visibility="public">
+ <ownedComment xmi:type="uml: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="uml:DataType" href="DC.uml#Point"/>
</ownedAttribute>
</packagedElement>
<packagedElement xmi:type="uml:Class" xmi:id="Gradient" name="Gradient" isAbstract="true">
- <ownedComment xmi:id="Gradient-_ownedComment.0" annotatedElement="Gradient">
+ <ownedComment xmi:type="uml:Comment" xmi:id="Gradient-_ownedComment.0" annotatedElement="Gradient">
<body>Gradient is a kind of paint server that serves a continuously smooth color transition along the gradient range from one color to the next.</body>
</ownedComment>
- <generalization xmi:id="_2PhcJ_o2EeOw_Nx9vOEGaA" general="Fill"/>
- <ownedAttribute xmi:id="Gradient-stop" name="stop" visibility="public" type="GradientStop" isOrdered="true" aggregation="composite" association="_hQOVgM41EeOqlr8E3pzO9g">
- <ownedComment xmi:id="Gradient-stop-_ownedComment.0" annotatedElement="Gradient-stop">
+ <generalization xmi:type="uml:Generalization" xmi:id="_2PhcJ_o2EeOw_Nx9vOEGaA" general="Fill"/>
+ <ownedAttribute xmi:type="uml:Property" xmi:id="Gradient-stop" name="stop" visibility="public" type="GradientStop" isOrdered="true" aggregation="composite" association="_hQOVgM41EeOqlr8E3pzO9g">
+ <ownedComment xmi:type="uml:Comment" xmi:id="Gradient-stop-_ownedComment.0" annotatedElement="Gradient-stop">
<body>a list of two or more gradient stops defining the color transitions of the gradient.</body>
</ownedComment>
<lowerValue xmi:type="uml:LiteralInteger" xmi:id="_2PcjoPo2EeOw_Nx9vOEGaA" value="2"/>
@@ -194,11 +194,11 @@
</ownedAttribute>
</packagedElement>
<packagedElement xmi:type="uml:Class" xmi:id="GradientStop" name="GradientStop">
- <ownedComment xmi:id="GradientStop-_ownedComment.0" annotatedElement="GradientStop">
+ <ownedComment xmi:type="uml:Comment" xmi:id="GradientStop-_ownedComment.0" annotatedElement="GradientStop">
<body>GradientStop defines a color transition along the distance from a gradient's start to its end offsets.</body>
</ownedComment>
- <ownedRule xmi:id="GradientStop-valid_offset" name="valid_offset" constrainedElement="GradientStop">
- <ownedComment xmi:id="GradientStop-valid_offset-_ownedComment.0" annotatedElement="GradientStop-valid_offset">
+ <ownedRule xmi:type="uml:Constraint" xmi:id="GradientStop-valid_offset" name="valid_offset" constrainedElement="GradientStop">
+ <ownedComment xmi:type="uml:Comment" xmi:id="GradientStop-valid_offset-_ownedComment.0" annotatedElement="GradientStop-valid_offset">
<body>the offset must be between 0 and 1.</body>
</ownedComment>
<specification xmi:type="uml:OpaqueExpression" xmi:id="GradientStop-valid_offset-_specification">
@@ -206,8 +206,8 @@
<body>offset>=0 and offset&lt;=1</body>
</specification>
</ownedRule>
- <ownedRule xmi:id="GradientStop-valid_opacity" name="valid_opacity" constrainedElement="GradientStop">
- <ownedComment xmi:id="GradientStop-valid_opacity-_ownedComment.0" annotatedElement="GradientStop-valid_opacity">
+ <ownedRule xmi:type="uml:Constraint" xmi:id="GradientStop-valid_opacity" name="valid_opacity" constrainedElement="GradientStop">
+ <ownedComment xmi:type="uml:Comment" xmi:id="GradientStop-valid_opacity-_ownedComment.0" annotatedElement="GradientStop-valid_opacity">
<body>the opacity must be between 0 and 1.</body>
</ownedComment>
<specification xmi:type="uml:OpaqueExpression" xmi:id="GradientStop-valid_opacity-_specification">
@@ -215,22 +215,22 @@
<body>opacity>=0 and opacity&lt;=1</body>
</specification>
</ownedRule>
- <ownedAttribute xmi:id="GradientStop-color" name="color" visibility="public">
- <ownedComment xmi:id="GradientStop-color-_ownedComment.0" annotatedElement="GradientStop-color">
+ <ownedAttribute xmi:type="uml:Property" xmi:id="GradientStop-color" name="color" visibility="public">
+ <ownedComment xmi:type="uml:Comment" xmi:id="GradientStop-color-_ownedComment.0" annotatedElement="GradientStop-color">
<body>the color to use at this gradient stop.</body>
</ownedComment>
<type xmi:type="uml:PrimitiveType" href="DC.uml#Color"/>
<lowerValue xmi:type="uml:LiteralInteger" xmi:id="_2Pcjovo2EeOw_Nx9vOEGaA"/>
</ownedAttribute>
- <ownedAttribute xmi:id="GradientStop-offset" name="offset" visibility="public">
- <ownedComment xmi:id="GradientStop-offset-_ownedComment.0" annotatedElement="GradientStop-offset">
+ <ownedAttribute xmi:type="uml:Property" xmi:id="GradientStop-offset" name="offset" visibility="public">
+ <ownedComment xmi:type="uml: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="uml:PrimitiveType" href="DC.uml#Real"/>
<lowerValue xmi:type="uml:LiteralInteger" xmi:id="_2Pcjo_o2EeOw_Nx9vOEGaA"/>
</ownedAttribute>
- <ownedAttribute xmi:id="GradientStop-opacity" name="opacity" visibility="public">
- <ownedComment xmi:id="GradientStop-opacity-_ownedComment.0" annotatedElement="GradientStop-opacity">
+ <ownedAttribute xmi:type="uml:Property" xmi:id="GradientStop-opacity" name="opacity" visibility="public">
+ <ownedComment xmi:type="uml: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>
<type xmi:type="uml:PrimitiveType" href="DC.uml#Real"/>
@@ -238,50 +238,50 @@
</ownedAttribute>
</packagedElement>
<packagedElement xmi:type="uml:Class" xmi:id="GraphicalElement" name="GraphicalElement" isAbstract="true">
- <ownedComment xmi:id="GraphicalElement-_ownedComment.0" annotatedElement="GraphicalElement">
+ <ownedComment xmi:type="uml: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:id="_-a2yAOhzEeO6TvQHODg78w" name="referenced_clippath_has_id" constrainedElement="GraphicalElement">
+ <ownedRule xmi:type="uml:Constraint" xmi:id="_-a2yAOhzEeO6TvQHODg78w" name="referenced_clippath_has_id" constrainedElement="GraphicalElement">
<specification xmi:type="uml:OpaqueExpression" xmi:id="_I9m_EOh0EeO6TvQHODg78w">
<language>OCL</language>
<body>clipPath->notEmpty() implies clipPath.id->notEmpty()</body>
</specification>
</ownedRule>
- <generalization xmi:id="_2PhcKPo2EeOw_Nx9vOEGaA" general="_CwockM6jEeOqlr8E3pzO9g"/>
- <ownedAttribute xmi:id="GraphicalElement-clipPath" name="clipPath" visibility="public" type="ClipPath" association="A_clipPath_clippedElement">
- <ownedComment xmi:id="GraphicalElement-clipPath-_ownedComment.0" annotatedElement="GraphicalElement-clipPath">
+ <generalization xmi:type="uml:Generalization" xmi:id="_2PhcKPo2EeOw_Nx9vOEGaA" general="_CwockM6jEeOqlr8E3pzO9g"/>
+ <ownedAttribute xmi:type="uml:Property" xmi:id="GraphicalElement-clipPath" name="clipPath" visibility="public" type="ClipPath" association="A_clipPath_clippedElement">
+ <ownedComment xmi:type="uml:Comment" xmi:id="GraphicalElement-clipPath-_ownedComment.0" annotatedElement="GraphicalElement-clipPath">
<body>A clip path that masks the painting of this graphical element.</body>
</ownedComment>
<lowerValue xmi:type="uml:LiteralInteger" xmi:id="_2Pcjpfo2EeOw_Nx9vOEGaA"/>
</ownedAttribute>
- <ownedAttribute xmi:id="GraphicalElement-group" name="group" visibility="public" type="Group" association="A_member_group">
- <ownedComment xmi:id="GraphicalElement-group-_ownedComment.0" annotatedElement="GraphicalElement-group">
+ <ownedAttribute xmi:type="uml:Property" xmi:id="GraphicalElement-group" name="group" visibility="public" type="Group" association="A_member_group">
+ <ownedComment xmi:type="uml:Comment" xmi:id="GraphicalElement-group-_ownedComment.0" annotatedElement="GraphicalElement-group">
<body>The group that owns this graphical element.</body>
</ownedComment>
<lowerValue xmi:type="uml:LiteralInteger" xmi:id="_2Pcjpvo2EeOw_Nx9vOEGaA"/>
</ownedAttribute>
- <ownedAttribute xmi:id="_yyXeMM2TEeOtK5GsJlm5Mw" name="class" visibility="public" isOrdered="true">
- <ownedComment xmi:id="_yyXeMc2TEeOtK5GsJlm5Mw" annotatedElement="_yyXeMM2TEeOtK5GsJlm5Mw">
+ <ownedAttribute xmi:type="uml:Property" xmi:id="_yyXeMM2TEeOtK5GsJlm5Mw" name="class" visibility="public" isOrdered="true">
+ <ownedComment xmi:type="uml:Comment" xmi:id="_yyXeMc2TEeOtK5GsJlm5Mw" annotatedElement="_yyXeMM2TEeOtK5GsJlm5Mw">
<body>A list of strings representing classes of the graphical element.</body>
</ownedComment>
<type xmi:type="uml:PrimitiveType" href="DC.uml#String"/>
<lowerValue xmi:type="uml:LiteralInteger" xmi:id="_2PdKsPo2EeOw_Nx9vOEGaA"/>
<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_2PdKsfo2EeOw_Nx9vOEGaA" value="*"/>
</ownedAttribute>
- <ownedAttribute xmi:id="GraphicalElement-localStyle" name="style" visibility="public" type="Style" isOrdered="true" aggregation="composite" association="A_localStyle_styledElement">
- <ownedComment xmi:id="GraphicalElement-localStyle-_ownedComment.0" annotatedElement="GraphicalElement-localStyle">
+ <ownedAttribute xmi:type="uml:Property" xmi:id="GraphicalElement-localStyle" name="style" visibility="public" type="Style" isOrdered="true" aggregation="composite" association="A_localStyle_styledElement">
+ <ownedComment xmi:type="uml:Comment" xmi:id="GraphicalElement-localStyle-_ownedComment.0" annotatedElement="GraphicalElement-localStyle">
<body>An inline style that applies on this graphical element.</body>
</ownedComment>
<lowerValue xmi:type="uml:LiteralInteger" xmi:id="_2PdKsvo2EeOw_Nx9vOEGaA"/>
</ownedAttribute>
- <ownedAttribute xmi:id="GraphicalElement-transform" name="transform" visibility="public" type="Transform" isOrdered="true" aggregation="composite" association="_TVnmYM42EeOqlr8E3pzO9g">
- <ownedComment xmi:id="GraphicalElement-transform-_ownedComment.0" annotatedElement="GraphicalElement-transform">
+ <ownedAttribute xmi:type="uml:Property" xmi:id="GraphicalElement-transform" name="transform" visibility="public" type="Transform" isOrdered="true" aggregation="composite" association="_TVnmYM42EeOqlr8E3pzO9g">
+ <ownedComment xmi:type="uml:Comment" xmi:id="GraphicalElement-transform-_ownedComment.0" annotatedElement="GraphicalElement-transform">
<body>A list of transforms that apply to this graphical element.</body>
</ownedComment>
<lowerValue xmi:type="uml:LiteralInteger" xmi:id="_2PdKs_o2EeOw_Nx9vOEGaA"/>
<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_2PdKtPo2EeOw_Nx9vOEGaA" value="*"/>
</ownedAttribute>
- <ownedAttribute xmi:id="_V0HkgBMTEeSVwtSTQ1YVCg" name="layoutData" visibility="public">
+ <ownedAttribute xmi:type="uml:Property" xmi:id="_V0HkgBMTEeSVwtSTQ1YVCg" name="layoutData" visibility="public">
<type xmi:type="uml:PrimitiveType" href="DC.uml#String"/>
<lowerValue xmi:type="uml:LiteralInteger" xmi:id="_WEKLoBMTEeSVwtSTQ1YVCg"/>
<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_WEKLoRMTEeSVwtSTQ1YVCg" value="1"/>
@@ -291,18 +291,18 @@
</ownedAttribute>
</packagedElement>
<packagedElement xmi:type="uml:Class" xmi:id="Group" name="Group">
- <ownedComment xmi:id="Group-_ownedComment.0" annotatedElement="Group">
+ <ownedComment xmi:type="uml:Comment" xmi:id="Group-_ownedComment.0" annotatedElement="Group">
<body>Group defines a group of graphical elements that can be styled, clipped and/or transformed together.</body>
</ownedComment>
- <generalization xmi:id="_2PhcKfo2EeOw_Nx9vOEGaA" general="GraphicalElement"/>
- <ownedAttribute xmi:id="Group-member" name="member" visibility="public" type="GraphicalElement" isOrdered="true" aggregation="composite" association="A_member_group">
- <ownedComment xmi:id="Group-member-_ownedComment.0" annotatedElement="Group-member">
+ <generalization xmi:type="uml:Generalization" xmi:id="_2PhcKfo2EeOw_Nx9vOEGaA" general="GraphicalElement"/>
+ <ownedAttribute xmi:type="uml:Property" xmi:id="Group-member" name="member" visibility="public" type="GraphicalElement" isOrdered="true" aggregation="composite" association="A_member_group">
+ <ownedComment xmi:type="uml:Comment" xmi:id="Group-member-_ownedComment.0" annotatedElement="Group-member">
<body>A list of graphical elements that are members of this group.</body>
</ownedComment>
<lowerValue xmi:type="uml:LiteralInteger" xmi:id="_2PdKtfo2EeOw_Nx9vOEGaA"/>
<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_2PdKtvo2EeOw_Nx9vOEGaA" value="*"/>
</ownedAttribute>
- <ownedAttribute xmi:id="_wT0y8BMSEeSVwtSTQ1YVCg" name="layout" visibility="public">
+ <ownedAttribute xmi:type="uml:Property" xmi:id="_wT0y8BMSEeSVwtSTQ1YVCg" name="layout" visibility="public">
<type xmi:type="uml:PrimitiveType" href="DC.uml#String"/>
<lowerValue xmi:type="uml:LiteralInteger" xmi:id="_wmhsgBMSEeSVwtSTQ1YVCg"/>
<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_wmiTkBMSEeSVwtSTQ1YVCg" value="1"/>
@@ -312,30 +312,30 @@
</ownedAttribute>
</packagedElement>
<packagedElement xmi:type="uml:Class" xmi:id="Image" name="Image">
- <ownedComment xmi:id="Image-_ownedComment.0" annotatedElement="Image">
+ <ownedComment xmi:type="uml: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:id="_6903kOjNEeO6TvQHODg78w" name="source_cannot_be_empty" constrainedElement="Image">
+ <ownedRule xmi:type="uml:Constraint" xmi:id="_6903kOjNEeO6TvQHODg78w" name="source_cannot_be_empty" constrainedElement="Image">
<specification xmi:type="uml:OpaqueExpression" xmi:id="_6903kejNEeO6TvQHODg78w">
<language>OCL</language>
<body>source->notEmpty() implies source.size() > 0</body>
</specification>
</ownedRule>
- <generalization xmi:id="_2PhcKvo2EeOw_Nx9vOEGaA" general="GraphicalElement"/>
- <ownedAttribute xmi:id="Image-source" name="source" visibility="public">
- <ownedComment xmi:id="Image-source-_ownedComment.0" annotatedElement="Image-source">
+ <generalization xmi:type="uml:Generalization" xmi:id="_2PhcKvo2EeOw_Nx9vOEGaA" general="GraphicalElement"/>
+ <ownedAttribute xmi:type="uml:Property" xmi:id="Image-source" name="source" visibility="public">
+ <ownedComment xmi:type="uml:Comment" xmi:id="Image-source-_ownedComment.0" annotatedElement="Image-source">
<body>the URL of a referenced image file.</body>
</ownedComment>
<type xmi:type="uml:PrimitiveType" href="DC.uml#String"/>
</ownedAttribute>
- <ownedAttribute xmi:id="Image-bounds" name="bounds" visibility="public">
- <ownedComment xmi:id="Image-bounds-_ownedComment.0" annotatedElement="Image-bounds">
+ <ownedAttribute xmi:type="uml:Property" xmi:id="Image-bounds" name="bounds" visibility="public">
+ <ownedComment xmi:type="uml:Comment" xmi:id="Image-bounds-_ownedComment.0" annotatedElement="Image-bounds">
<body>the bounds within which the image is rendered.</body>
</ownedComment>
<type xmi:type="uml:DataType" href="DC.uml#Bounds"/>
</ownedAttribute>
- <ownedAttribute xmi:id="Image-isAspectRatioPreserved" name="isAspectRatioPreserved" visibility="public">
- <ownedComment xmi:id="Image-isAspectRatioPreserved-_ownedComment.0" annotatedElement="Image-isAspectRatioPreserved">
+ <ownedAttribute xmi:type="uml:Property" xmi:id="Image-isAspectRatioPreserved" name="isAspectRatioPreserved" visibility="public">
+ <ownedComment xmi:type="uml: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>
<type xmi:type="uml:PrimitiveType" href="DC.uml#Boolean"/>
@@ -343,29 +343,29 @@
</ownedAttribute>
</packagedElement>
<packagedElement xmi:type="uml:Class" xmi:id="Line" name="Line">
- <ownedComment xmi:id="Line-_ownedComment.0" annotatedElement="Line">
+ <ownedComment xmi:type="uml:Comment" xmi:id="Line-_ownedComment.0" annotatedElement="Line">
<body>Line is a marked element that defines a shape consisting of one straight line between two points.</body>
</ownedComment>
- <generalization xmi:id="_2PhcK_o2EeOw_Nx9vOEGaA" general="MarkedElement"/>
- <ownedAttribute xmi:id="Line-start" name="start" visibility="public">
- <ownedComment xmi:id="Line-start-_ownedComment.0" annotatedElement="Line-start">
+ <generalization xmi:type="uml:Generalization" xmi:id="_2PhcK_o2EeOw_Nx9vOEGaA" general="MarkedElement"/>
+ <ownedAttribute xmi:type="uml:Property" xmi:id="Line-start" name="start" visibility="public">
+ <ownedComment xmi:type="uml:Comment" xmi:id="Line-start-_ownedComment.0" annotatedElement="Line-start">
<body>the starting point of the line in the x-y coordinate system.</body>
</ownedComment>
<type xmi:type="uml:DataType" href="DC.uml#Point"/>
</ownedAttribute>
- <ownedAttribute xmi:id="Line-end" name="end" visibility="public">
- <ownedComment xmi:id="Line-end-_ownedComment.0" annotatedElement="Line-end">
+ <ownedAttribute xmi:type="uml:Property" xmi:id="Line-end" name="end" visibility="public">
+ <ownedComment xmi:type="uml:Comment" xmi:id="Line-end-_ownedComment.0" annotatedElement="Line-end">
<body>the ending point of the line in the x-y coordinate system.</body>
</ownedComment>
<type xmi:type="uml:DataType" href="DC.uml#Point"/>
</ownedAttribute>
</packagedElement>
<packagedElement xmi:type="uml:Class" xmi:id="LinearGradient" name="LinearGradient">
- <ownedComment xmi:id="LinearGradient-_ownedComment.0" annotatedElement="LinearGradient">
+ <ownedComment xmi:type="uml:Comment" xmi:id="LinearGradient-_ownedComment.0" annotatedElement="LinearGradient">
<body>LinearGradient is a kind of gradient that fills a graphical element by smoothly changing color values along a vector.</body>
</ownedComment>
- <ownedRule xmi:id="LinearGradient-valid_gradient_vector" name="valid_gradient_vector" constrainedElement="LinearGradient">
- <ownedComment xmi:id="LinearGradient-valid_gradient_vector-_ownedComment.0" annotatedElement="LinearGradient-valid_gradient_vector">
+ <ownedRule xmi:type="uml:Constraint" xmi:id="LinearGradient-valid_gradient_vector" name="valid_gradient_vector" constrainedElement="LinearGradient">
+ <ownedComment xmi:type="uml:Comment" xmi:id="LinearGradient-valid_gradient_vector-_ownedComment.0" annotatedElement="LinearGradient-valid_gradient_vector">
<body>all the components of the gradient vector must be between 0 and 1.</body>
</ownedComment>
<specification xmi:type="uml:OpaqueExpression" xmi:id="LinearGradient-valid_gradient_vector-_specification">
@@ -373,177 +373,177 @@
<body>start.x>=0 and start.x&lt;=1 and end.x>=0 and end.x&lt;=1 and start.y>=0 and start.y&lt;=1 and end.y>=0 and end.y&lt;=1</body>
</specification>
</ownedRule>
- <generalization xmi:id="_2PhcLPo2EeOw_Nx9vOEGaA" general="Gradient"/>
- <ownedAttribute xmi:id="_nIr7gNpbEeOltvy1wTDHDA" name="start" visibility="public">
- <ownedComment xmi:id="_nIr7gdpbEeOltvy1wTDHDA" annotatedElement="_nIr7gNpbEeOltvy1wTDHDA">
+ <generalization xmi:type="uml:Generalization" xmi:id="_2PhcLPo2EeOw_Nx9vOEGaA" general="Gradient"/>
+ <ownedAttribute xmi:type="uml:Property" xmi:id="_nIr7gNpbEeOltvy1wTDHDA" name="start" visibility="public">
+ <ownedComment xmi:type="uml:Comment" xmi:id="_nIr7gdpbEeOltvy1wTDHDA" annotatedElement="_nIr7gNpbEeOltvy1wTDHDA">
<body>a starting point for the linear gradient expressed as a percentage along the x and y axes.</body>
</ownedComment>
<type xmi:type="uml:DataType" href="DC.uml#Point"/>
</ownedAttribute>
- <ownedAttribute xmi:id="_oaTUYNpbEeOltvy1wTDHDA" name="end" visibility="public">
- <ownedComment xmi:id="_oaTUYdpbEeOltvy1wTDHDA" annotatedElement="_oaTUYNpbEeOltvy1wTDHDA">
+ <ownedAttribute xmi:type="uml:Property" xmi:id="_oaTUYNpbEeOltvy1wTDHDA" name="end" visibility="public">
+ <ownedComment xmi:type="uml:Comment" xmi:id="_oaTUYdpbEeOltvy1wTDHDA" annotatedElement="_oaTUYNpbEeOltvy1wTDHDA">
<body>an ending point for the linear gradient expressed as a percentage along the x and y axes.</body>
</ownedComment>
<type xmi:type="uml:DataType" href="DC.uml#Point"/>
</ownedAttribute>
</packagedElement>
<packagedElement xmi:type="uml:Class" xmi:id="LineTo" name="LineTo">
- <ownedComment xmi:id="LineTo-_ownedComment.0" annotatedElement="LineTo">
+ <ownedComment xmi:type="uml:Comment" xmi:id="LineTo-_ownedComment.0" annotatedElement="LineTo">
<body>LineTo is a kind of path command that draw a straight line from the current point to a new point.</body>
</ownedComment>
- <generalization xmi:id="_2PhcLfo2EeOw_Nx9vOEGaA" general="PathCommand"/>
- <ownedAttribute xmi:id="LineTo-point" name="point" visibility="public">
- <ownedComment xmi:id="LineTo-point-_ownedComment.0" annotatedElement="LineTo-point">
+ <generalization xmi:type="uml:Generalization" xmi:id="_2PhcLfo2EeOw_Nx9vOEGaA" general="PathCommand"/>
+ <ownedAttribute xmi:type="uml:Property" xmi:id="LineTo-point" name="point" visibility="public">
+ <ownedComment xmi:type="uml:Comment" xmi:id="LineTo-point-_ownedComment.0" annotatedElement="LineTo-point">
<body>a point to draw a straight line to from the current point in the coordinate system.</body>
</ownedComment>
<type xmi:type="uml:DataType" href="DC.uml#Point"/>
</ownedAttribute>
</packagedElement>
<packagedElement xmi:type="uml:Class" xmi:id="MarkedElement" name="MarkedElement" isAbstract="true">
- <ownedComment xmi:id="MarkedElement-_ownedComment.0" annotatedElement="MarkedElement">
+ <ownedComment xmi:type="uml: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:id="_wycJoOh1EeO6TvQHODg78w" name="referenced_start_marker_has_id" constrainedElement="MarkedElement">
+ <ownedRule xmi:type="uml:Constraint" xmi:id="_wycJoOh1EeO6TvQHODg78w" name="referenced_start_marker_has_id" constrainedElement="MarkedElement">
<specification xmi:type="uml:OpaqueExpression" xmi:id="_wycJoeh1EeO6TvQHODg78w">
<language>OCL</language>
<body>startMarker->notEmpty() implies startMarker.id->notEmpty()</body>
</specification>
</ownedRule>
- <ownedRule xmi:id="_8rYGgOh1EeO6TvQHODg78w" name="referenced_mid_marker_has_id" constrainedElement="MarkedElement">
+ <ownedRule xmi:type="uml:Constraint" xmi:id="_8rYGgOh1EeO6TvQHODg78w" name="referenced_mid_marker_has_id" constrainedElement="MarkedElement">
<specification xmi:type="uml:OpaqueExpression" xmi:id="_8rYGgeh1EeO6TvQHODg78w">
<language>OCL</language>
<body>midMarker->notEmpty() implies midMarker.id->notEmpty()</body>
</specification>
</ownedRule>
- <ownedRule xmi:id="_B10LEOh2EeO6TvQHODg78w" name="referenced_end_marker_has_id" constrainedElement="MarkedElement">
+ <ownedRule xmi:type="uml:Constraint" xmi:id="_B10LEOh2EeO6TvQHODg78w" name="referenced_end_marker_has_id" constrainedElement="MarkedElement">
<specification xmi:type="uml:OpaqueExpression" xmi:id="_B10LEeh2EeO6TvQHODg78w">
<language>OCL</language>
<body>endMarker->notEmpty() implies endMarker.id->notEmpty()</body>
</specification>
</ownedRule>
- <generalization xmi:id="_2PhcLvo2EeOw_Nx9vOEGaA" general="GraphicalElement"/>
- <ownedAttribute xmi:id="MarkedElement-endMarker" name="endMarker" visibility="public" type="Marker" association="A_endMarker_markedElement">
- <ownedComment xmi:id="MarkedElement-endMarker-_ownedComment.0" annotatedElement="MarkedElement-endMarker">
+ <generalization xmi:type="uml:Generalization" xmi:id="_2PhcLvo2EeOw_Nx9vOEGaA" general="GraphicalElement"/>
+ <ownedAttribute xmi:type="uml:Property" xmi:id="MarkedElement-endMarker" name="endMarker" visibility="public" type="Marker" association="A_endMarker_markedElement">
+ <ownedComment xmi:type="uml: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>
</ownedComment>
<lowerValue xmi:type="uml:LiteralInteger" xmi:id="_2PdKuPo2EeOw_Nx9vOEGaA"/>
</ownedAttribute>
- <ownedAttribute xmi:id="MarkedElement-midMarker" name="midMarker" visibility="public" type="Marker" association="A_midMarker_markedElement">
- <ownedComment xmi:id="MarkedElement-midMarker-_ownedComment.0" annotatedElement="MarkedElement-midMarker">
+ <ownedAttribute xmi:type="uml:Property" xmi:id="MarkedElement-midMarker" name="midMarker" visibility="public" type="Marker" association="A_midMarker_markedElement">
+ <ownedComment xmi:type="uml:Comment" xmi:id="MarkedElement-midMarker-_ownedComment.0" annotatedElement="MarkedElement-midMarker">
<body>an optional mid marker that aligns with all vertices of the marked element except the first and the last.</body>
</ownedComment>
<lowerValue xmi:type="uml:LiteralInteger" xmi:id="_2PdxwPo2EeOw_Nx9vOEGaA"/>
</ownedAttribute>
- <ownedAttribute xmi:id="MarkedElement-startMarker" name="startMarker" visibility="public" type="Marker" association="A_startMarker_markedElement">
- <ownedComment xmi:id="MarkedElement-startMarker-_ownedComment.0" annotatedElement="MarkedElement-startMarker">
+ <ownedAttribute xmi:type="uml:Property" xmi:id="MarkedElement-startMarker" name="startMarker" visibility="public" type="Marker" association="A_startMarker_markedElement">
+ <ownedComment xmi:type="uml:Comment" xmi:id="MarkedElement-startMarker-_ownedComment.0" annotatedElement="MarkedElement-startMarker">
<body>an optional start marker that aligns with the first vertex of the marked element.</body>
</ownedComment>
<lowerValue xmi:type="uml:LiteralInteger" xmi:id="_2Pdxwfo2EeOw_Nx9vOEGaA"/>
</ownedAttribute>
</packagedElement>
<packagedElement xmi:type="uml:Class" xmi:id="Marker" name="Marker">
- <ownedComment xmi:id="Marker-_ownedComment.0" annotatedElement="Marker">
+ <ownedComment xmi:type="uml:Comment" xmi:id="Marker-_ownedComment.0" annotatedElement="Marker">
<body>Marker is a kind of group that is used as a decoration (e.g. an arrowhead) for the vertices of a marked graphical element.</body>
</ownedComment>
- <generalization xmi:id="_2PhcL_o2EeOw_Nx9vOEGaA" general="Group"/>
- <ownedAttribute xmi:id="Marker-size" name="size" visibility="public">
- <ownedComment xmi:id="Marker-size-_ownedComment.0" annotatedElement="Marker-size">
+ <generalization xmi:type="uml:Generalization" xmi:id="_2PhcL_o2EeOw_Nx9vOEGaA" general="Group"/>
+ <ownedAttribute xmi:type="uml:Property" xmi:id="Marker-size" name="size" visibility="public">
+ <ownedComment xmi:type="uml:Comment" xmi:id="Marker-size-_ownedComment.0" annotatedElement="Marker-size">
<body>the size of the marker</body>
</ownedComment>
<type xmi:type="uml:DataType" href="DC.uml#Dimension"/>
</ownedAttribute>
- <ownedAttribute xmi:id="Marker-reference" name="reference" visibility="public">
- <ownedComment xmi:id="Marker-reference-_ownedComment.0" annotatedElement="Marker-reference">
+ <ownedAttribute xmi:type="uml:Property" xmi:id="Marker-reference" name="reference" visibility="public">
+ <ownedComment xmi:type="uml:Comment" xmi:id="Marker-reference-_ownedComment.0" annotatedElement="Marker-reference">
<body>a point within the bounds of the marker that aligns exactly with the marked element's vertex.</body>
</ownedComment>
<type xmi:type="uml:DataType" href="DC.uml#Point"/>
</ownedAttribute>
</packagedElement>
<packagedElement xmi:type="uml:Class" xmi:id="Matrix" name="Matrix">
- <ownedComment xmi:id="Matrix-_ownedComment.0" annotatedElement="Matrix">
+ <ownedComment xmi:type="uml:Comment" xmi:id="Matrix-_ownedComment.0" annotatedElement="Matrix">
<body>Matrix is a kind of transform that represents any transform operation with a 3x3 transformation matrix.</body>
</ownedComment>
- <generalization xmi:id="_2PhcMPo2EeOw_Nx9vOEGaA" general="Transform"/>
- <ownedAttribute xmi:id="Matrix-a" name="a" visibility="public">
- <ownedComment xmi:id="Matrix-a-_ownedComment.0" annotatedElement="Matrix-a">
+ <generalization xmi:type="uml:Generalization" xmi:id="_2PhcMPo2EeOw_Nx9vOEGaA" general="Transform"/>
+ <ownedAttribute xmi:type="uml:Property" xmi:id="Matrix-a" name="a" visibility="public">
+ <ownedComment xmi:type="uml:Comment" xmi:id="Matrix-a-_ownedComment.0" annotatedElement="Matrix-a">
<body>the a value of the transform matrix.</body>
</ownedComment>
<type xmi:type="uml:PrimitiveType" href="DC.uml#Real"/>
</ownedAttribute>
- <ownedAttribute xmi:id="Matrix-b" name="b" visibility="public">
- <ownedComment xmi:id="Matrix-b-_ownedComment.0" annotatedElement="Matrix-b">
+ <ownedAttribute xmi:type="uml:Property" xmi:id="Matrix-b" name="b" visibility="public">
+ <ownedComment xmi:type="uml:Comment" xmi:id="Matrix-b-_ownedComment.0" annotatedElement="Matrix-b">
<body>the b value of the transform matrix.</body>
</ownedComment>
<type xmi:type="uml:PrimitiveType" href="DC.uml#Real"/>
</ownedAttribute>
- <ownedAttribute xmi:id="Matrix-c" name="c" visibility="public">
- <ownedComment xmi:id="Matrix-c-_ownedComment.0" annotatedElement="Matrix-c">
+ <ownedAttribute xmi:type="uml:Property" xmi:id="Matrix-c" name="c" visibility="public">
+ <ownedComment xmi:type="uml:Comment" xmi:id="Matrix-c-_ownedComment.0" annotatedElement="Matrix-c">
<body>the c value of the transform matrix.</body>
</ownedComment>
<type xmi:type="uml:PrimitiveType" href="DC.uml#Real"/>
</ownedAttribute>
- <ownedAttribute xmi:id="Matrix-d" name="d" visibility="public">
- <ownedComment xmi:id="Matrix-d-_ownedComment.0" annotatedElement="Matrix-d">
+ <ownedAttribute xmi:type="uml:Property" xmi:id="Matrix-d" name="d" visibility="public">
+ <ownedComment xmi:type="uml:Comment" xmi:id="Matrix-d-_ownedComment.0" annotatedElement="Matrix-d">
<body>the d value of the transform matrix.</body>
</ownedComment>
<type xmi:type="uml:PrimitiveType" href="DC.uml#Real"/>
</ownedAttribute>
- <ownedAttribute xmi:id="Matrix-e" name="e" visibility="public">
- <ownedComment xmi:id="Matrix-e-_ownedComment.0" annotatedElement="Matrix-e">
+ <ownedAttribute xmi:type="uml:Property" xmi:id="Matrix-e" name="e" visibility="public">
+ <ownedComment xmi:type="uml:Comment" xmi:id="Matrix-e-_ownedComment.0" annotatedElement="Matrix-e">
<body>the e value of the transform matrix.</body>
</ownedComment>
<type xmi:type="uml:PrimitiveType" href="DC.uml#Real"/>
</ownedAttribute>
- <ownedAttribute xmi:id="Matrix-f" name="f" visibility="public">
- <ownedComment xmi:id="Matrix-f-_ownedComment.0" annotatedElement="Matrix-f">
+ <ownedAttribute xmi:type="uml:Property" xmi:id="Matrix-f" name="f" visibility="public">
+ <ownedComment xmi:type="uml:Comment" xmi:id="Matrix-f-_ownedComment.0" annotatedElement="Matrix-f">
<body>the f value of the transform matrix.</body>
</ownedComment>
<type xmi:type="uml:PrimitiveType" href="DC.uml#Real"/>
</ownedAttribute>
</packagedElement>
<packagedElement xmi:type="uml:Class" xmi:id="MoveTo" name="MoveTo">
- <ownedComment xmi:id="MoveTo-_ownedComment.0" annotatedElement="MoveTo">
+ <ownedComment xmi:type="uml:Comment" xmi:id="MoveTo-_ownedComment.0" annotatedElement="MoveTo">
<body>MoveTo is a kind of path command that establishes a new current point in the coordinate system.</body>
</ownedComment>
- <generalization xmi:id="_2PhcMfo2EeOw_Nx9vOEGaA" general="PathCommand"/>
- <ownedAttribute xmi:id="MoveTo-point" name="point" visibility="public">
- <ownedComment xmi:id="MoveTo-point-_ownedComment.0" annotatedElement="MoveTo-point">
+ <generalization xmi:type="uml:Generalization" xmi:id="_2PhcMfo2EeOw_Nx9vOEGaA" general="PathCommand"/>
+ <ownedAttribute xmi:type="uml:Property" xmi:id="MoveTo-point" name="point" visibility="public">
+ <ownedComment xmi:type="uml:Comment" xmi:id="MoveTo-point-_ownedComment.0" annotatedElement="MoveTo-point">
<body>a point to move to in the coordinate system</body>
</ownedComment>
<type xmi:type="uml:DataType" href="DC.uml#Point"/>
</ownedAttribute>
</packagedElement>
<packagedElement xmi:type="uml:Class" xmi:id="_wz9hsM2cEeOtK5GsJlm5Mw" name="Paint">
- <ownedComment xmi:id="_C_Q0gM2dEeOtK5GsJlm5Mw">
+ <ownedComment xmi:type="uml:Comment" xmi:id="_C_Q0gM2dEeOtK5GsJlm5Mw">
<body>Paint is used to fill or stroke a graphical element.</body>
</ownedComment>
- <ownedRule xmi:id="_R3fe8Oh2EeO6TvQHODg78w" name="referenced_paint_server_has_id" constrainedElement="_wz9hsM2cEeOtK5GsJlm5Mw">
+ <ownedRule xmi:type="uml:Constraint" xmi:id="_R3fe8Oh2EeO6TvQHODg78w" name="referenced_paint_server_has_id" constrainedElement="_wz9hsM2cEeOtK5GsJlm5Mw">
<specification xmi:type="uml:OpaqueExpression" xmi:id="_R3fe8eh2EeO6TvQHODg78w">
<language>OCL</language>
<body>paintServer->notEmpty() implies paintServer.id->notEmpty()</body>
</specification>
</ownedRule>
- <ownedAttribute xmi:id="_Mg5i0M2dEeOtK5GsJlm5Mw" name="color" visibility="public">
- <ownedComment xmi:id="_Mg5i0c2dEeOtK5GsJlm5Mw" annotatedElement="_Mg5i0M2dEeOtK5GsJlm5Mw">
+ <ownedAttribute xmi:type="uml:Property" xmi:id="_Mg5i0M2dEeOtK5GsJlm5Mw" name="color" visibility="public">
+ <ownedComment xmi:type="uml:Comment" xmi:id="_Mg5i0c2dEeOtK5GsJlm5Mw" annotatedElement="_Mg5i0M2dEeOtK5GsJlm5Mw">
<body>A solid color to use in painting.</body>
</ownedComment>
<type xmi:type="uml:PrimitiveType" href="DC.uml#Color"/>
<lowerValue xmi:type="uml:LiteralInteger" xmi:id="_2Pdxwvo2EeOw_Nx9vOEGaA"/>
</ownedAttribute>
- <ownedAttribute xmi:id="_dR8eIM2dEeOtK5GsJlm5Mw" name="paintServer" visibility="public" type="Fill" association="_VGk7AM2kEeOtK5GsJlm5Mw">
- <ownedComment xmi:id="_dR8eIc2dEeOtK5GsJlm5Mw" annotatedElement="_dR8eIM2dEeOtK5GsJlm5Mw">
+ <ownedAttribute xmi:type="uml:Property" xmi:id="_dR8eIM2dEeOtK5GsJlm5Mw" name="paintServer" visibility="public" type="Fill" association="_VGk7AM2kEeOtK5GsJlm5Mw">
+ <ownedComment xmi:type="uml:Comment" xmi:id="_dR8eIc2dEeOtK5GsJlm5Mw" annotatedElement="_dR8eIM2dEeOtK5GsJlm5Mw">
<body>A paint server that is used in painting.</body>
</ownedComment>
<lowerValue xmi:type="uml:LiteralInteger" xmi:id="_2Pdxw_o2EeOw_Nx9vOEGaA"/>
</ownedAttribute>
</packagedElement>
<packagedElement xmi:type="uml:Class" xmi:id="Fill" name="PaintServer" isAbstract="true">
- <ownedComment xmi:id="Fill-_ownedComment.0" annotatedElement="Fill">
+ <ownedComment xmi:type="uml:Comment" xmi:id="Fill-_ownedComment.0" annotatedElement="Fill">
<body>PaintServer is the abstract super class of all paint servers, like gradients and patterns</body>
</ownedComment>
- <generalization xmi:id="_2PhcMvo2EeOw_Nx9vOEGaA" general="_CwockM6jEeOqlr8E3pzO9g"/>
- <ownedAttribute xmi:id="Fill-transform" name="transform" visibility="public" type="Transform" isOrdered="true" aggregation="composite" association="_oEGFIM55EeOqlr8E3pzO9g">
- <ownedComment xmi:id="Fill-transform-_ownedComment.0" annotatedElement="Fill-transform">
+ <generalization xmi:type="uml:Generalization" xmi:id="_2PhcMvo2EeOw_Nx9vOEGaA" general="_CwockM6jEeOqlr8E3pzO9g"/>
+ <ownedAttribute xmi:type="uml:Property" xmi:id="Fill-transform" name="transform" visibility="public" type="Transform" isOrdered="true" aggregation="composite" association="_oEGFIM55EeOqlr8E3pzO9g">
+ <ownedComment xmi:type="uml:Comment" xmi:id="Fill-transform-_ownedComment.0" annotatedElement="Fill-transform">
<body>A set of transforms that apply to this paint server.</body>
</ownedComment>
<lowerValue xmi:type="uml:LiteralInteger" xmi:id="_2PdxxPo2EeOw_Nx9vOEGaA"/>
@@ -551,29 +551,29 @@
</ownedAttribute>
</packagedElement>
<packagedElement xmi:type="uml:Class" xmi:id="Path" name="Path">
- <ownedComment xmi:id="Path-_ownedComment.0" annotatedElement="Path">
+ <ownedComment xmi:type="uml: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>
- <ownedRule xmi:id="_uJDzUOjHEeO6TvQHODg78w" name="first_command_must_be_move" constrainedElement="Path">
+ <ownedRule xmi:type="uml:Constraint" xmi:id="_uJDzUOjHEeO6TvQHODg78w" name="first_command_must_be_move" constrainedElement="Path">
<specification xmi:type="uml:OpaqueExpression" xmi:id="_Omo48OjIEeO6TvQHODg78w">
<language>OCL</language>
<body>command->first().oclIsKindOf(MoveTo)</body>
</specification>
</ownedRule>
- <generalization xmi:id="_2PhcM_o2EeOw_Nx9vOEGaA" general="MarkedElement"/>
- <ownedAttribute xmi:id="Path-command" name="command" visibility="public" type="PathCommand" isOrdered="true" aggregation="composite" association="_-INckM55EeOqlr8E3pzO9g">
- <ownedComment xmi:id="Path-command-_ownedComment.0" annotatedElement="Path-command">
+ <generalization xmi:type="uml:Generalization" xmi:id="_2PhcM_o2EeOw_Nx9vOEGaA" general="MarkedElement"/>
+ <ownedAttribute xmi:type="uml:Property" xmi:id="Path-command" name="command" visibility="public" type="PathCommand" isOrdered="true" aggregation="composite" association="_-INckM55EeOqlr8E3pzO9g">
+ <ownedComment xmi:type="uml: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>
<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_2Pdxxvo2EeOw_Nx9vOEGaA" value="*"/>
</ownedAttribute>
</packagedElement>
<packagedElement xmi:type="uml:Class" xmi:id="PathCommand" name="PathCommand" isAbstract="true">
- <ownedComment xmi:id="PathCommand-_ownedComment.0" annotatedElement="PathCommand">
+ <ownedComment xmi:type="uml:Comment" xmi:id="PathCommand-_ownedComment.0" annotatedElement="PathCommand">
<body>PathCommand is the abstract super type of all commands that participate in specifying a path element.</body>
</ownedComment>
- <ownedAttribute xmi:id="PathCommand-isRelative" name="isRelative" visibility="public">
- <ownedComment xmi:id="PathCommand-isRelative-_ownedComment.0" annotatedElement="PathCommand-isRelative">
+ <ownedAttribute xmi:type="uml:Property" xmi:id="PathCommand-isRelative" name="isRelative" visibility="public">
+ <ownedComment xmi:type="uml:Comment" xmi:id="PathCommand-isRelative-_ownedComment.0" annotatedElement="PathCommand-isRelative">
<body>whether the coordinates specified by the command are relative to the current point (when true) or to the origin point of the coordinate system (when false).</body>
</ownedComment>
<type xmi:type="uml:PrimitiveType" href="DC.uml#Boolean"/>
@@ -581,29 +581,29 @@
</ownedAttribute>
</packagedElement>
<packagedElement xmi:type="uml:Class" xmi:id="Pattern" name="Pattern">
- <ownedComment xmi:id="Pattern-_ownedComment.0" annotatedElement="Pattern">
+ <ownedComment xmi:type="uml:Comment" xmi:id="Pattern-_ownedComment.0" annotatedElement="Pattern">
<body>Pattern is a kind of paint server that paints a graphical element (a tile) repeatedly at fixed intervals in x and y axes to cover the areas to be filled.</body>
</ownedComment>
- <generalization xmi:id="_2PhcNPo2EeOw_Nx9vOEGaA" general="Fill"/>
- <ownedAttribute xmi:id="Pattern-bounds" name="bounds" visibility="public">
- <ownedComment xmi:id="Pattern-bounds-_ownedComment.0" annotatedElement="Pattern-bounds">
+ <generalization xmi:type="uml:Generalization" xmi:id="_2PhcNPo2EeOw_Nx9vOEGaA" general="Fill"/>
+ <ownedAttribute xmi:type="uml:Property" xmi:id="Pattern-bounds" name="bounds" visibility="public">
+ <ownedComment xmi:type="uml:Comment" xmi:id="Pattern-bounds-_ownedComment.0" annotatedElement="Pattern-bounds">
<body>the bounds of the pattern that define a private coordinate system for the pattern's tile.</body>
</ownedComment>
<type xmi:type="uml:DataType" href="DC.uml#Bounds"/>
</ownedAttribute>
- <ownedAttribute xmi:id="Pattern-tile" name="tile" visibility="public" type="GraphicalElement" aggregation="composite" association="A_tile_pattern">
- <ownedComment xmi:id="Pattern-tile-_ownedComment.0" annotatedElement="Pattern-tile">
+ <ownedAttribute xmi:type="uml:Property" xmi:id="Pattern-tile" name="tile" visibility="public" type="GraphicalElement" aggregation="composite" association="A_tile_pattern">
+ <ownedComment xmi:type="uml:Comment" xmi:id="Pattern-tile-_ownedComment.0" annotatedElement="Pattern-tile">
<body>a reference to a graphical element, owned by the pattern, that works as a tile to be painted repeatedly at a fixed interval to fill an closed area.</body>
</ownedComment>
</ownedAttribute>
</packagedElement>
<packagedElement xmi:type="uml:Class" xmi:id="Polygon" name="Polygon">
- <ownedComment xmi:id="Polygon-_ownedComment.0" annotatedElement="Polygon">
+ <ownedComment xmi:type="uml:Comment" xmi:id="Polygon-_ownedComment.0" annotatedElement="Polygon">
<body>Polygon is a marked element that defines a closed shape consisting of a sequence of connected straight line segments.</body>
</ownedComment>
- <generalization xmi:id="_2PhcNfo2EeOw_Nx9vOEGaA" general="MarkedElement"/>
- <ownedAttribute xmi:id="Polygon-point" name="point" visibility="public" isOrdered="true">
- <ownedComment xmi:id="Polygon-point-_ownedComment.0" annotatedElement="Polygon-point">
+ <generalization xmi:type="uml:Generalization" xmi:id="_2PhcNfo2EeOw_Nx9vOEGaA" general="MarkedElement"/>
+ <ownedAttribute xmi:type="uml:Property" xmi:id="Polygon-point" name="point" visibility="public" isOrdered="true">
+ <ownedComment xmi:type="uml:Comment" xmi:id="Polygon-point-_ownedComment.0" annotatedElement="Polygon-point">
<body>a list of 3 or more points making up the polygon.</body>
</ownedComment>
<type xmi:type="uml:DataType" href="DC.uml#Point"/>
@@ -612,12 +612,12 @@
</ownedAttribute>
</packagedElement>
<packagedElement xmi:type="uml:Class" xmi:id="Polyline" name="Polyline">
- <ownedComment xmi:id="Polyline-_ownedComment.0" annotatedElement="Polyline">
+ <ownedComment xmi:type="uml:Comment" xmi:id="Polyline-_ownedComment.0" annotatedElement="Polyline">
<body>Polyline is a marked element that defines a shape consisting of a sequence of connected straight line segments.</body>
</ownedComment>
- <generalization xmi:id="_2PhcNvo2EeOw_Nx9vOEGaA" general="MarkedElement"/>
- <ownedAttribute xmi:id="Polyline-point" name="point" visibility="public" isOrdered="true">
- <ownedComment xmi:id="Polyline-point-_ownedComment.0" annotatedElement="Polyline-point">
+ <generalization xmi:type="uml:Generalization" xmi:id="_2PhcNvo2EeOw_Nx9vOEGaA" general="MarkedElement"/>
+ <ownedAttribute xmi:type="uml:Property" xmi:id="Polyline-point" name="point" visibility="public" isOrdered="true">
+ <ownedComment xmi:type="uml:Comment" xmi:id="Polyline-point-_ownedComment.0" annotatedElement="Polyline-point">
<body>a list of 2 or more points making up the polyline.</body>
</ownedComment>
<type xmi:type="uml:DataType" href="DC.uml#Point"/>
@@ -626,29 +626,29 @@
</ownedAttribute>
</packagedElement>
<packagedElement xmi:type="uml:Class" xmi:id="QuadraticCurveTo" name="QuadraticCurveTo">
- <ownedComment 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 xmi:type="uml: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>
- <generalization xmi:id="_2PhcN_o2EeOw_Nx9vOEGaA" general="PathCommand"/>
- <ownedAttribute xmi:id="QuadraticCurveTo-control" name="control" visibility="public">
- <ownedComment xmi:id="QuadraticCurveTo-control-_ownedComment.0" annotatedElement="QuadraticCurveTo-control">
- <body>the control point of the quadratic bézier curve.</body>
+ <generalization xmi:type="uml:Generalization" xmi:id="_2PhcN_o2EeOw_Nx9vOEGaA" general="PathCommand"/>
+ <ownedAttribute xmi:type="uml:Property" xmi:id="QuadraticCurveTo-control" name="control" visibility="public">
+ <ownedComment xmi:type="uml: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="uml:DataType" href="DC.uml#Point"/>
</ownedAttribute>
- <ownedAttribute xmi:id="QuadraticCurveTo-point" name="point" visibility="public">
- <ownedComment 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>
+ <ownedAttribute xmi:type="uml:Property" xmi:id="QuadraticCurveTo-point" name="point" visibility="public">
+ <ownedComment xmi:type="uml: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="uml:DataType" href="DC.uml#Point"/>
</ownedAttribute>
</packagedElement>
<packagedElement xmi:type="uml:Class" xmi:id="RadialGradient" name="RadialGradient">
- <ownedComment xmi:id="RadialGradient-_ownedComment.0" annotatedElement="RadialGradient">
+ <ownedComment xmi:type="uml:Comment" xmi:id="RadialGradient-_ownedComment.0" annotatedElement="RadialGradient">
<body>RadialGradient is a kind of gradient that fills a graphical element by smoothly changing color values in a circle.</body>
</ownedComment>
- <ownedRule xmi:id="RadialGradient-valid_center_point" name="valid_center_point" constrainedElement="RadialGradient">
- <ownedComment xmi:id="RadialGradient-valid_center_point-_ownedComment.0" annotatedElement="RadialGradient-valid_center_point">
+ <ownedRule xmi:type="uml:Constraint" xmi:id="RadialGradient-valid_center_point" name="valid_center_point" constrainedElement="RadialGradient">
+ <ownedComment xmi:type="uml:Comment" xmi:id="RadialGradient-valid_center_point-_ownedComment.0" annotatedElement="RadialGradient-valid_center_point">
<body>the center point coordinates must be between 0 and 1</body>
</ownedComment>
<specification xmi:type="uml:OpaqueExpression" xmi:id="RadialGradient-valid_center_point-_specification">
@@ -656,8 +656,8 @@
<body>centerX>=0 and centerX&lt;=1 and centerY>=0 and centerY&lt;=1</body>
</specification>
</ownedRule>
- <ownedRule xmi:id="RadialGradient-valid_focus_point" name="valid_focus_point" constrainedElement="RadialGradient">
- <ownedComment xmi:id="RadialGradient-valid_focus_point-_ownedComment.0" annotatedElement="RadialGradient-valid_focus_point">
+ <ownedRule xmi:type="uml:Constraint" xmi:id="RadialGradient-valid_focus_point" name="valid_focus_point" constrainedElement="RadialGradient">
+ <ownedComment xmi:type="uml:Comment" xmi:id="RadialGradient-valid_focus_point-_ownedComment.0" annotatedElement="RadialGradient-valid_focus_point">
<body>the focus point coordinates must be between 0 and 1</body>
</ownedComment>
<specification xmi:type="uml:OpaqueExpression" xmi:id="RadialGradient-valid_focus_point-_specification">
@@ -665,8 +665,8 @@
<body>focusX>=0 and focusX&lt;=1 and focusY>=0 and focusY&lt;=1</body>
</specification>
</ownedRule>
- <ownedRule xmi:id="RadialGradient-valid_radius" name="valid_radius" constrainedElement="RadialGradient">
- <ownedComment xmi:id="RadialGradient-valid_radius-_ownedComment.0" annotatedElement="RadialGradient-valid_radius">
+ <ownedRule xmi:type="uml:Constraint" xmi:id="RadialGradient-valid_radius" name="valid_radius" constrainedElement="RadialGradient">
+ <ownedComment xmi:type="uml:Comment" xmi:id="RadialGradient-valid_radius-_ownedComment.0" annotatedElement="RadialGradient-valid_radius">
<body>the radius must be between 0 and 1</body>
</ownedComment>
<specification xmi:type="uml:OpaqueExpression" xmi:id="RadialGradient-valid_radius-_specification">
@@ -674,21 +674,21 @@
<body>radius>=0 and radius&lt;=1</body>
</specification>
</ownedRule>
- <generalization xmi:id="_2PiDMPo2EeOw_Nx9vOEGaA" general="Gradient"/>
- <ownedAttribute xmi:id="_u_spINpdEeOltvy1wTDHDA" name="center" visibility="public">
- <ownedComment xmi:id="_u_spIdpdEeOltvy1wTDHDA" annotatedElement="_u_spINpdEeOltvy1wTDHDA">
+ <generalization xmi:type="uml:Generalization" xmi:id="_2PiDMPo2EeOw_Nx9vOEGaA" general="Gradient"/>
+ <ownedAttribute xmi:type="uml:Property" xmi:id="_u_spINpdEeOltvy1wTDHDA" name="center" visibility="public">
+ <ownedComment xmi:type="uml:Comment" xmi:id="_u_spIdpdEeOltvy1wTDHDA" annotatedElement="_u_spINpdEeOltvy1wTDHDA">
<body>a center point for the radial gradient expressed as a percentage along the x and y axes.</body>
</ownedComment>
<type xmi:type="uml:DataType" href="DC.uml#Point"/>
</ownedAttribute>
- <ownedAttribute xmi:id="_0SIMENpdEeOltvy1wTDHDA" name="focus" visibility="public">
- <ownedComment xmi:id="_0SIMEdpdEeOltvy1wTDHDA" annotatedElement="_0SIMENpdEeOltvy1wTDHDA">
+ <ownedAttribute xmi:type="uml:Property" xmi:id="_0SIMENpdEeOltvy1wTDHDA" name="focus" visibility="public">
+ <ownedComment xmi:type="uml:Comment" xmi:id="_0SIMEdpdEeOltvy1wTDHDA" annotatedElement="_0SIMENpdEeOltvy1wTDHDA">
<body>a focus point for the radial gradient expressed as a percentage along the x and y axes.</body>
</ownedComment>
<type xmi:type="uml:DataType" href="DC.uml#Point"/>
</ownedAttribute>
- <ownedAttribute xmi:id="RadialGradient-radius" name="radius" visibility="public">
- <ownedComment xmi:id="RadialGradient-radius-_ownedComment.0" annotatedElement="RadialGradient-radius">
+ <ownedAttribute xmi:type="uml:Property" xmi:id="RadialGradient-radius" name="radius" visibility="public">
+ <ownedComment xmi:type="uml:Comment" xmi:id="RadialGradient-radius-_ownedComment.0" annotatedElement="RadialGradient-radius">
<body>a real number (>=0 and >=1) representing a ratio of the graphical element's size that is the radius of the gradient.</body>
</ownedComment>
<type xmi:type="uml:PrimitiveType" href="DC.uml#Real"/>
@@ -696,24 +696,24 @@
</ownedAttribute>
</packagedElement>
<packagedElement xmi:type="uml:Class" xmi:id="Rectangle" name="Rectangle">
- <ownedComment xmi:id="Rectangle-_ownedComment.0" annotatedElement="Rectangle">
+ <ownedComment xmi:type="uml: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:id="_qFi4AOhuEeO6TvQHODg78w" name="non_negative_corner_radius" constrainedElement="Rectangle">
+ <ownedRule xmi:type="uml:Constraint" xmi:id="_qFi4AOhuEeO6TvQHODg78w" name="non_negative_corner_radius" constrainedElement="Rectangle">
<specification xmi:type="uml:OpaqueExpression" xmi:id="_qFi4AehuEeO6TvQHODg78w">
<language>OCL</language>
<body>cornerRadius >= 0</body>
</specification>
</ownedRule>
- <generalization xmi:id="_2PiDMfo2EeOw_Nx9vOEGaA" general="GraphicalElement"/>
- <ownedAttribute xmi:id="Rectangle-bounds" name="bounds" visibility="public">
- <ownedComment xmi:id="Rectangle-bounds-_ownedComment.0" annotatedElement="Rectangle-bounds">
+ <generalization xmi:type="uml:Generalization" xmi:id="_2PiDMfo2EeOw_Nx9vOEGaA" general="GraphicalElement"/>
+ <ownedAttribute xmi:type="uml:Property" xmi:id="Rectangle-bounds" name="bounds" visibility="public">
+ <ownedComment xmi:type="uml: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="uml:DataType" href="DC.uml#Bounds"/>
</ownedAttribute>
- <ownedAttribute xmi:id="Rectangle-cornerRadius" name="cornerRadius" visibility="public">
- <ownedComment xmi:id="Rectangle-cornerRadius-_ownedComment.0" annotatedElement="Rectangle-cornerRadius">
+ <ownedAttribute xmi:type="uml:Property" xmi:id="Rectangle-cornerRadius" name="cornerRadius" visibility="public">
+ <ownedComment xmi:type="uml: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>
<type xmi:type="uml:PrimitiveType" href="DC.uml#Real"/>
@@ -722,49 +722,49 @@
</ownedAttribute>
</packagedElement>
<packagedElement xmi:type="uml:Class" xmi:id="_jfIkENesEeOsUY1jE2-lpg" name="RootCanvas">
- <ownedComment xmi:id="_jfIkEdesEeOsUY1jE2-lpg" annotatedElement="_jfIkENesEeOsUY1jE2-lpg">
+ <ownedComment xmi:type="uml:Comment" xmi:id="_jfIkEdesEeOsUY1jE2-lpg" annotatedElement="_jfIkENesEeOsUY1jE2-lpg">
<body>RootCanvas is a kind of canvas that represents the root of containment for all graphical elements that render together.</body>
</ownedComment>
- <generalization xmi:id="_2PiDMvo2EeOw_Nx9vOEGaA" general="Canvas"/>
- <ownedAttribute xmi:id="_jfIkE9esEeOsUY1jE2-lpg" name="backgroundColor" visibility="public">
- <ownedComment xmi:id="_jfIkFNesEeOsUY1jE2-lpg" annotatedElement="_jfIkE9esEeOsUY1jE2-lpg">
+ <generalization xmi:type="uml:Generalization" xmi:id="_2PiDMvo2EeOw_Nx9vOEGaA" general="Canvas"/>
+ <ownedAttribute xmi:type="uml:Property" xmi:id="_jfIkE9esEeOsUY1jE2-lpg" name="backgroundColor" visibility="public">
+ <ownedComment xmi:type="uml:Comment" xmi:id="_jfIkFNesEeOsUY1jE2-lpg" annotatedElement="_jfIkE9esEeOsUY1jE2-lpg">
<body>An optional paint for the background of the canvas.</body>
</ownedComment>
<type xmi:type="uml:PrimitiveType" href="DC.uml#Color"/>
<lowerValue xmi:type="uml:LiteralInteger" xmi:id="_2Pe_4Po2EeOw_Nx9vOEGaA"/>
</ownedAttribute>
- <ownedAttribute xmi:id="_jfIkFtesEeOsUY1jE2-lpg" name="definitions" visibility="public" type="_DH0DwM5yEeOqlr8E3pzO9g" isOrdered="true" aggregation="composite" association="_qUuAwM51EeOqlr8E3pzO9g">
- <ownedComment xmi:id="_jfIkF9esEeOsUY1jE2-lpg" annotatedElement="_jfIkFtesEeOsUY1jE2-lpg">
+ <ownedAttribute xmi:type="uml:Property" xmi:id="_jfIkFtesEeOsUY1jE2-lpg" name="definitions" visibility="public" type="_DH0DwM5yEeOqlr8E3pzO9g" isOrdered="true" aggregation="composite" association="_qUuAwM51EeOqlr8E3pzO9g">
+ <ownedComment xmi:type="uml:Comment" xmi:id="_jfIkF9esEeOsUY1jE2-lpg" annotatedElement="_jfIkFtesEeOsUY1jE2-lpg">
<body>An optional definitions element to hold objects commonly referenced by the canvas.</body>
</ownedComment>
<lowerValue xmi:type="uml:LiteralInteger" xmi:id="_2Pe_4fo2EeOw_Nx9vOEGaA"/>
</ownedAttribute>
- <ownedAttribute xmi:id="_jfIkGdesEeOsUY1jE2-lpg" name="externalStyleSheet" visibility="public" type="_4ytfwM2CEeOX1ohrWoozJQ" isOrdered="true" association="_VJB6MM41EeOqlr8E3pzO9g">
- <ownedComment xmi:id="_jfIkGtesEeOsUY1jE2-lpg" annotatedElement="_jfIkGdesEeOsUY1jE2-lpg">
+ <ownedAttribute xmi:type="uml:Property" xmi:id="_jfIkGdesEeOsUY1jE2-lpg" name="externalStyleSheet" visibility="public" type="_4ytfwM2CEeOX1ohrWoozJQ" isOrdered="true" association="_VJB6MM41EeOqlr8E3pzO9g">
+ <ownedComment xmi:type="uml:Comment" xmi:id="_jfIkGtesEeOsUY1jE2-lpg" annotatedElement="_jfIkGdesEeOsUY1jE2-lpg">
<body>A list of external style sheets that are imported by the canvas.</body>
</ownedComment>
<lowerValue xmi:type="uml:LiteralInteger" xmi:id="_2Pe_4vo2EeOw_Nx9vOEGaA"/>
<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_2Pe_4_o2EeOw_Nx9vOEGaA" value="*"/>
</ownedAttribute>
- <ownedAttribute xmi:id="_V49isA35EeSM9dpvq2CG1g" name="script" visibility="public">
+ <ownedAttribute xmi:type="uml:Property" xmi:id="_V49isA35EeSM9dpvq2CG1g" name="script" visibility="public">
<type xmi:type="uml:PrimitiveType" href="DC.uml#String"/>
<lowerValue xmi:type="uml:LiteralInteger" xmi:id="_WPHY4A35EeSM9dpvq2CG1g"/>
<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_WPH_8A35EeSM9dpvq2CG1g" value="*"/>
</ownedAttribute>
</packagedElement>
<packagedElement xmi:type="uml:Class" xmi:id="Rotate" name="Rotate">
- <ownedComment xmi:id="Rotate-_ownedComment.0" annotatedElement="Rotate">
+ <ownedComment xmi:type="uml:Comment" xmi:id="Rotate-_ownedComment.0" annotatedElement="Rotate">
<body>Rotate is a kind of transform that rotates a graphical element by a given angle about a given center point in the x-y coordinate system.</body>
</ownedComment>
- <generalization xmi:id="_2PiDM_o2EeOw_Nx9vOEGaA" general="Transform"/>
- <ownedAttribute xmi:id="Rotate-angle" name="angle" visibility="public">
- <ownedComment xmi:id="Rotate-angle-_ownedComment.0" annotatedElement="Rotate-angle">
+ <generalization xmi:type="uml:Generalization" xmi:id="_2PiDM_o2EeOw_Nx9vOEGaA" general="Transform"/>
+ <ownedAttribute xmi:type="uml:Property" xmi:id="Rotate-angle" name="angle" visibility="public">
+ <ownedComment xmi:type="uml:Comment" xmi:id="Rotate-angle-_ownedComment.0" annotatedElement="Rotate-angle">
<body>a real number representing the angle (in degrees) of rotation. Both positive (clock-wise) and negative (counter-clock-wise) values are allowed.</body>
</ownedComment>
<type xmi:type="uml:PrimitiveType" href="DC.uml#Real"/>
</ownedAttribute>
- <ownedAttribute xmi:id="Rotate-center" name="center" visibility="public">
- <ownedComment xmi:id="Rotate-center-_ownedComment.0" annotatedElement="Rotate-center">
+ <ownedAttribute xmi:type="uml:Property" xmi:id="Rotate-center" name="center" visibility="public">
+ <ownedComment xmi:type="uml:Comment" xmi:id="Rotate-center-_ownedComment.0" annotatedElement="Rotate-center">
<body>a point in the x-y coordinate system about which the rotation is performed. If the point is not specified, it is assumed to be the origin of the x-y coordinate system.</body>
</ownedComment>
<type xmi:type="uml:DataType" href="DC.uml#Point"/>
@@ -772,11 +772,11 @@
</ownedAttribute>
</packagedElement>
<packagedElement xmi:type="uml:Class" xmi:id="Scale" name="Scale">
- <ownedComment xmi:id="Scale-_ownedComment.0" annotatedElement="Scale">
+ <ownedComment xmi:type="uml:Comment" xmi:id="Scale-_ownedComment.0" annotatedElement="Scale">
<body>Scale is a kind of transform that scales (resizes) a graphical element by a given factor in the x-y coordinate system.</body>
</ownedComment>
- <ownedRule xmi:id="Scale-non-negative-scale" name="non-negative-scale" constrainedElement="Scale">
- <ownedComment xmi:id="Scale-non-negative-scale-_ownedComment.0" annotatedElement="Scale-non-negative-scale">
+ <ownedRule xmi:type="uml:Constraint" xmi:id="Scale-non-negative-scale" name="non-negative-scale" constrainedElement="Scale">
+ <ownedComment xmi:type="uml:Comment" xmi:id="Scale-non-negative-scale-_ownedComment.0" annotatedElement="Scale-non-negative-scale">
<body>scale factors cannot be negative.</body>
</ownedComment>
<specification xmi:type="uml:OpaqueExpression" xmi:id="Scale-non-negative-scale-_specification">
@@ -784,44 +784,44 @@
<body>factorX>=0 and factorY>=0</body>
</specification>
</ownedRule>
- <generalization xmi:id="_2PiDNPo2EeOw_Nx9vOEGaA" general="Transform"/>
- <ownedAttribute xmi:id="Scale-factorX" name="factorX" visibility="public">
- <ownedComment xmi:id="Scale-factorX-_ownedComment.0" annotatedElement="Scale-factorX">
+ <generalization xmi:type="uml:Generalization" xmi:id="_2PiDNPo2EeOw_Nx9vOEGaA" general="Transform"/>
+ <ownedAttribute xmi:type="uml:Property" xmi:id="Scale-factorX" name="factorX" visibility="public">
+ <ownedComment xmi:type="uml:Comment" xmi:id="Scale-factorX-_ownedComment.0" annotatedElement="Scale-factorX">
<body>a real number (>=0) representing a scale factor along the x-axis.</body>
</ownedComment>
<type xmi:type="uml:PrimitiveType" href="DC.uml#Real"/>
</ownedAttribute>
- <ownedAttribute xmi:id="Scale-factorY" name="factorY" visibility="public">
- <ownedComment xmi:id="Scale-factorY-_ownedComment.0" annotatedElement="Scale-factorY">
+ <ownedAttribute xmi:type="uml:Property" xmi:id="Scale-factorY" name="factorY" visibility="public">
+ <ownedComment xmi:type="uml:Comment" xmi:id="Scale-factorY-_ownedComment.0" annotatedElement="Scale-factorY">
<body>a real number(>=0) representing a scale factor along the y-axis.</body>
</ownedComment>
<type xmi:type="uml:PrimitiveType" href="DC.uml#Real"/>
</ownedAttribute>
</packagedElement>
<packagedElement xmi:type="uml:Class" xmi:id="Skew" name="Skew">
- <ownedComment xmi:id="Skew-_ownedComment.0" annotatedElement="Skew">
+ <ownedComment xmi:type="uml:Comment" xmi:id="Skew-_ownedComment.0" annotatedElement="Skew">
<body>Skew is a kind of transform that skews (deforms) a graphical element by given angles in the x-y coordinate system.</body>
</ownedComment>
- <generalization xmi:id="_2PiDNfo2EeOw_Nx9vOEGaA" general="Transform"/>
- <ownedAttribute xmi:id="Skew-angleX" name="angleX" visibility="public">
- <ownedComment xmi:id="Skew-angleX-_ownedComment.0" annotatedElement="Skew-angleX">
+ <generalization xmi:type="uml:Generalization" xmi:id="_2PiDNfo2EeOw_Nx9vOEGaA" general="Transform"/>
+ <ownedAttribute xmi:type="uml:Property" xmi:id="Skew-angleX" name="angleX" visibility="public">
+ <ownedComment xmi:type="uml:Comment" xmi:id="Skew-angleX-_ownedComment.0" annotatedElement="Skew-angleX">
<body>a real number representing the angle (in degrees) of skew along the x-axis. Both positive (clock-wise) and negative (counter-clock-wise) values are allowed.</body>
</ownedComment>
<type xmi:type="uml:PrimitiveType" href="DC.uml#Real"/>
</ownedAttribute>
- <ownedAttribute xmi:id="Skew-angleY" name="angleY" visibility="public">
- <ownedComment xmi:id="Skew-angleY-_ownedComment.0" annotatedElement="Skew-angleY">
+ <ownedAttribute xmi:type="uml:Property" xmi:id="Skew-angleY" name="angleY" visibility="public">
+ <ownedComment xmi:type="uml:Comment" xmi:id="Skew-angleY-_ownedComment.0" annotatedElement="Skew-angleY">
<body>a real number representing the angle (in degrees) of skew along the y-axis. Both positive (clock-wise) and negative (counter-clock-wise) values are allowed.</body>
</ownedComment>
<type xmi:type="uml:PrimitiveType" href="DC.uml#Real"/>
</ownedAttribute>
</packagedElement>
<packagedElement xmi:type="uml:Class" xmi:id="Style" name="Style">
- <ownedComment xmi:id="Style-_ownedComment.0" annotatedElement="Style">
+ <ownedComment xmi:type="uml:Comment" xmi:id="Style-_ownedComment.0" annotatedElement="Style">
<body>Style contains formatting properties that affect the appearance or style of graphical elements.</body>
</ownedComment>
- <ownedRule xmi:id="Style-valid_font_size" name="valid_font_size">
- <ownedComment xmi:id="Style-valid_font_size-_ownedComment.0" annotatedElement="Style-valid_font_size">
+ <ownedRule xmi:type="uml:Constraint" xmi:id="Style-valid_font_size" name="valid_font_size">
+ <ownedComment xmi:type="uml:Comment" xmi:id="Style-valid_font_size-_ownedComment.0" annotatedElement="Style-valid_font_size">
<body>the font size is non-negative</body>
</ownedComment>
<specification xmi:type="uml:OpaqueExpression" xmi:id="Style-valid_font_size-_specification">
@@ -829,8 +829,8 @@
<body>fontSize >= 0</body>
</specification>
</ownedRule>
- <ownedRule xmi:id="Style-valid_fill_opacity" name="valid_fill_opacity">
- <ownedComment xmi:id="Style-valid_fill_opacity-_ownedComment.0" annotatedElement="Style-valid_fill_opacity">
+ <ownedRule xmi:type="uml:Constraint" xmi:id="Style-valid_fill_opacity" name="valid_fill_opacity">
+ <ownedComment xmi:type="uml:Comment" xmi:id="Style-valid_fill_opacity-_ownedComment.0" annotatedElement="Style-valid_fill_opacity">
<body>the stroke width is non-negative</body>
</ownedComment>
<specification xmi:type="uml:OpaqueExpression" xmi:id="Style-valid_fill_opacity-_specification">
@@ -838,8 +838,8 @@
<body>fillOpacity >= 0 and fillOpacity &lt;=1</body>
</specification>
</ownedRule>
- <ownedRule xmi:id="Style-valid_stroke_width" name="valid_stroke_width">
- <ownedComment xmi:id="Style-valid_stroke_width-_ownedComment.0" annotatedElement="Style-valid_stroke_width">
+ <ownedRule xmi:type="uml:Constraint" xmi:id="Style-valid_stroke_width" name="valid_stroke_width">
+ <ownedComment xmi:type="uml:Comment" xmi:id="Style-valid_stroke_width-_ownedComment.0" annotatedElement="Style-valid_stroke_width">
<body>the stroke width is non-negative</body>
</ownedComment>
<specification xmi:type="uml:OpaqueExpression" xmi:id="Style-valid_stroke_width-_specification">
@@ -847,8 +847,8 @@
<body>strokeWidth >= 0</body>
</specification>
</ownedRule>
- <ownedRule xmi:id="Style-valid_dash_length_size" name="valid_dash_length_size">
- <ownedComment xmi:id="Style-valid_dash_length_size-_ownedComment.0" annotatedElement="Style-valid_dash_length_size">
+ <ownedRule xmi:type="uml:Constraint" xmi:id="Style-valid_dash_length_size" name="valid_dash_length_size">
+ <ownedComment xmi:type="uml:Comment" xmi:id="Style-valid_dash_length_size-_ownedComment.0" annotatedElement="Style-valid_dash_length_size">
<body>the size of the stroke dash length list must be even.</body>
</ownedComment>
<specification xmi:type="uml:OpaqueExpression" xmi:id="Style-valid_dash_length_size-_specification">
@@ -856,8 +856,8 @@
<body>strokeDashLength->size().mod(2) = 0</body>
</specification>
</ownedRule>
- <ownedRule xmi:id="Style-valid_stroke_opacity" name="valid_stroke_opacity">
- <ownedComment xmi:id="Style-valid_stroke_opacity-_ownedComment.0" annotatedElement="Style-valid_stroke_opacity">
+ <ownedRule xmi:type="uml:Constraint" xmi:id="Style-valid_stroke_opacity" name="valid_stroke_opacity">
+ <ownedComment xmi:type="uml:Comment" xmi:id="Style-valid_stroke_opacity-_ownedComment.0" annotatedElement="Style-valid_stroke_opacity">
<body>the opacity of the fill is non-negative</body>
</ownedComment>
<specification xmi:type="uml:OpaqueExpression" xmi:id="Style-valid_stroke_opacity-_specification">
@@ -865,110 +865,110 @@
<body>strokeOpacity >= 0 and strokeOpacity &lt;=1</body>
</specification>
</ownedRule>
- <ownedAttribute xmi:id="Style-fill" name="fill" visibility="public" type="_wz9hsM2cEeOtK5GsJlm5Mw" aggregation="composite" association="A_fill_style">
- <ownedComment xmi:id="Style-fill-_ownedComment.0" annotatedElement="Style-fill">
+ <ownedAttribute xmi:type="uml:Property" xmi:id="Style-fill" name="fill" visibility="public" type="_wz9hsM2cEeOtK5GsJlm5Mw" aggregation="composite" association="A_fill_style">
+ <ownedComment xmi:type="uml:Comment" xmi:id="Style-fill-_ownedComment.0" annotatedElement="Style-fill">
<body>A paint that is used to fill the enclosed regions of a graphical element. The default is a black paint.</body>
</ownedComment>
<lowerValue xmi:type="uml:LiteralInteger" xmi:id="_2Pe_5fo2EeOw_Nx9vOEGaA"/>
</ownedAttribute>
- <ownedAttribute xmi:id="Style-fillOpacity" name="fillOpacity" visibility="public">
- <ownedComment xmi:id="Style-fillOpacity-_ownedComment.0" annotatedElement="Style-fillOpacity">
+ <ownedAttribute xmi:type="uml:Property" xmi:id="Style-fillOpacity" name="fillOpacity" visibility="public">
+ <ownedComment xmi:type="uml:Comment" xmi:id="Style-fillOpacity-_ownedComment.0" annotatedElement="Style-fillOpacity">
<body>A real number (>=0 and &lt;=1) representing the opacity of the fill used to paint a graphical element. A value of 0 means totally transparent, while a value of 1 means totally opaque. The default is 1.</body>
</ownedComment>
<type xmi:type="uml:PrimitiveType" href="DC.uml#Real"/>
<lowerValue xmi:type="uml:LiteralInteger" xmi:id="_2Pe_5vo2EeOw_Nx9vOEGaA"/>
</ownedAttribute>
- <ownedAttribute xmi:id="_KemS4M2oEeOtK5GsJlm5Mw" name="stroke" visibility="public" type="_wz9hsM2cEeOtK5GsJlm5Mw" aggregation="composite" association="_KeO_IM2rEeOtK5GsJlm5Mw">
- <ownedComment xmi:id="_KemS4c2oEeOtK5GsJlm5Mw" annotatedElement="_KemS4M2oEeOtK5GsJlm5Mw">
+ <ownedAttribute xmi:type="uml:Property" xmi:id="_KemS4M2oEeOtK5GsJlm5Mw" name="stroke" visibility="public" type="_wz9hsM2cEeOtK5GsJlm5Mw" aggregation="composite" association="_KeO_IM2rEeOtK5GsJlm5Mw">
+ <ownedComment xmi:type="uml:Comment" xmi:id="_KemS4c2oEeOtK5GsJlm5Mw" annotatedElement="_KemS4M2oEeOtK5GsJlm5Mw">
<body>A paint that is used to stroke a graphical element. The default is no paint.</body>
</ownedComment>
<lowerValue xmi:type="uml:LiteralInteger" xmi:id="_2Pe_5_o2EeOw_Nx9vOEGaA"/>
</ownedAttribute>
- <ownedAttribute xmi:id="Style-strokeWidth" name="strokeWidth" visibility="public">
- <ownedComment xmi:id="Style-strokeWidth-_ownedComment.0" annotatedElement="Style-strokeWidth">
+ <ownedAttribute xmi:type="uml:Property" xmi:id="Style-strokeWidth" name="strokeWidth" visibility="public">
+ <ownedComment xmi:type="uml:Comment" xmi:id="Style-strokeWidth-_ownedComment.0" annotatedElement="Style-strokeWidth">
<body>A real number (>=0) representing the width of the stroke of a graphical element. A value of 0 specifies no stroke is painted. The default is 1.</body>
</ownedComment>
<type xmi:type="uml:PrimitiveType" href="DC.uml#Real"/>
<lowerValue xmi:type="uml:LiteralInteger" xmi:id="_2Pe_6Po2EeOw_Nx9vOEGaA"/>
</ownedAttribute>
- <ownedAttribute xmi:id="Style-strokeOpacity" name="strokeOpacity" visibility="public">
- <ownedComment xmi:id="Style-strokeOpacity-_ownedComment.0" annotatedElement="Style-strokeOpacity">
+ <ownedAttribute xmi:type="uml:Property" xmi:id="Style-strokeOpacity" name="strokeOpacity" visibility="public">
+ <ownedComment xmi:type="uml:Comment" xmi:id="Style-strokeOpacity-_ownedComment.0" annotatedElement="Style-strokeOpacity">
<body>A real number (>=0 and &lt;=1) representing the opacity of the stroke of a graphical element. A value of 0 means totally transparent, while a value of 1 means totally opaque. The default is 1.</body>
</ownedComment>
<type xmi:type="uml:PrimitiveType" href="DC.uml#Real"/>
<lowerValue xmi:type="uml:LiteralInteger" xmi:id="_2Pfm8Po2EeOw_Nx9vOEGaA"/>
</ownedAttribute>
- <ownedAttribute xmi:id="Style-strokeDashLength" name="strokeDashLength" visibility="public" isOrdered="true" isUnique="false">
- <ownedComment xmi:id="Style-strokeDashLength-_ownedComment.0" annotatedElement="Style-strokeDashLength">
+ <ownedAttribute xmi:type="uml:Property" xmi:id="Style-strokeDashLength" name="strokeDashLength" visibility="public" isOrdered="true" isUnique="false">
+ <ownedComment xmi:type="uml:Comment" xmi:id="Style-strokeDashLength-_ownedComment.0" annotatedElement="Style-strokeDashLength">
<body>A list of real numbers specifying a pattern of alternating dash and gap lengths used in stroking the outline of a graphical element with the first one specifying a dash length. The size of the list is expected to be even. If the list is empty, the stroke is drawn solid. The default is empty list.</body>
</ownedComment>
<type xmi:type="uml:PrimitiveType" href="DC.uml#Real"/>
<lowerValue xmi:type="uml:LiteralInteger" xmi:id="_2Pfm8fo2EeOw_Nx9vOEGaA"/>
<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_2Pfm8vo2EeOw_Nx9vOEGaA" value="*"/>
</ownedAttribute>
- <ownedAttribute xmi:id="Style-fontSize" name="fontSize" visibility="public">
- <ownedComment xmi:id="Style-fontSize-_ownedComment.0" annotatedElement="Style-fontSize">
+ <ownedAttribute xmi:type="uml:Property" xmi:id="Style-fontSize" name="fontSize" visibility="public">
+ <ownedComment xmi:type="uml:Comment" xmi:id="Style-fontSize-_ownedComment.0" annotatedElement="Style-fontSize">
<body>A real number (>=0) representing the size (in unit of length) of the font used to render a text element. The default is 10.</body>
</ownedComment>
<type xmi:type="uml:PrimitiveType" href="DC.uml#Real"/>
<lowerValue xmi:type="uml:LiteralInteger" xmi:id="_2Pfm8_o2EeOw_Nx9vOEGaA"/>
</ownedAttribute>
- <ownedAttribute xmi:id="Style-fontName" name="fontName" visibility="public">
- <ownedComment xmi:id="Style-fontName-_ownedComment.0" annotatedElement="Style-fontName">
+ <ownedAttribute xmi:type="uml:Property" xmi:id="Style-fontName" name="fontName" visibility="public">
+ <ownedComment xmi:type="uml:Comment" xmi:id="Style-fontName-_ownedComment.0" annotatedElement="Style-fontName">
<body>The name of the font used to render a text element (e.g. &quot;Times New Roman&quot;, &quot;Arial&quot; or &quot;Helvetica&quot;). The default is &quot;Arial&quot;.</body>
</ownedComment>
<type xmi:type="uml:PrimitiveType" href="DC.uml#String"/>
<lowerValue xmi:type="uml:LiteralInteger" xmi:id="_2Pfm9Po2EeOw_Nx9vOEGaA"/>
</ownedAttribute>
- <ownedAttribute xmi:id="Style-fontItalic" name="fontItalic" visibility="public">
- <ownedComment xmi:id="Style-fontItalic-_ownedComment.0" annotatedElement="Style-fontItalic">
+ <ownedAttribute xmi:type="uml:Property" xmi:id="Style-fontItalic" name="fontItalic" visibility="public">
+ <ownedComment xmi:type="uml:Comment" xmi:id="Style-fontItalic-_ownedComment.0" annotatedElement="Style-fontItalic">
<body>Whether the font used to render a text element has an italic style. The default is false.</body>
</ownedComment>
<type xmi:type="uml:PrimitiveType" href="DC.uml#Boolean"/>
<lowerValue xmi:type="uml:LiteralInteger" xmi:id="_2Pfm9fo2EeOw_Nx9vOEGaA"/>
</ownedAttribute>
- <ownedAttribute xmi:id="Style-fontBold" name="fontBold" visibility="public">
- <ownedComment xmi:id="Style-fontBold-_ownedComment.0" annotatedElement="Style-fontBold">
+ <ownedAttribute xmi:type="uml:Property" xmi:id="Style-fontBold" name="fontBold" visibility="public">
+ <ownedComment xmi:type="uml:Comment" xmi:id="Style-fontBold-_ownedComment.0" annotatedElement="Style-fontBold">
<body>Whether the font used to render a text element has a bold style. The default is false.</body>
</ownedComment>
<type xmi:type="uml:PrimitiveType" href="DC.uml#Boolean"/>
<lowerValue xmi:type="uml:LiteralInteger" xmi:id="_2Pfm9vo2EeOw_Nx9vOEGaA"/>
</ownedAttribute>
- <ownedAttribute xmi:id="Style-fontStrikeThrough" name="fontDecoration" visibility="public" type="_wgzj4M2WEeOtK5GsJlm5Mw">
- <ownedComment xmi:id="Style-fontStrikeThrough-_ownedComment.0" annotatedElement="Style-fontStrikeThrough">
+ <ownedAttribute xmi:type="uml:Property" xmi:id="Style-fontStrikeThrough" name="fontDecoration" visibility="public" type="_wgzj4M2WEeOtK5GsJlm5Mw">
+ <ownedComment xmi:type="uml:Comment" xmi:id="Style-fontStrikeThrough-_ownedComment.0" annotatedElement="Style-fontStrikeThrough">
<body>The decoration of the font used to render a text element. The default is no decoration.</body>
</ownedComment>
<lowerValue xmi:type="uml:LiteralInteger" xmi:id="_2Pfm9_o2EeOw_Nx9vOEGaA"/>
</ownedAttribute>
</packagedElement>
<packagedElement xmi:type="uml:Class" xmi:id="_9z_BQM2CEeOX1ohrWoozJQ" name="StyleRule">
- <ownedComment xmi:id="_XHdkwM2QEeOtK5GsJlm5Mw">
+ <ownedComment xmi:type="uml:Comment" xmi:id="_XHdkwM2QEeOtK5GsJlm5Mw">
<body>StyleRule selects a set of graphical elements and applies a style to them.</body>
</ownedComment>
- <ownedAttribute xmi:id="_2CcQMM2FEeOX1ohrWoozJQ" name="selector" visibility="public" type="_ClirwM2DEeOX1ohrWoozJQ" isOrdered="true" aggregation="composite" association="_OTgnYM2GEeOX1ohrWoozJQ">
- <ownedComment xmi:id="_2CcQMc2FEeOX1ohrWoozJQ" annotatedElement="_2CcQMM2FEeOX1ohrWoozJQ">
+ <ownedAttribute xmi:type="uml:Property" xmi:id="_2CcQMM2FEeOX1ohrWoozJQ" name="selector" visibility="public" type="_ClirwM2DEeOX1ohrWoozJQ" isOrdered="true" aggregation="composite" association="_OTgnYM2GEeOX1ohrWoozJQ">
+ <ownedComment xmi:type="uml:Comment" xmi:id="_2CcQMc2FEeOX1ohrWoozJQ" annotatedElement="_2CcQMM2FEeOX1ohrWoozJQ">
<body>A set of selectors for graphical elements to apply the rule to.</body>
</ownedComment>
<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_2Pfm-Po2EeOw_Nx9vOEGaA" value="*"/>
</ownedAttribute>
- <ownedAttribute xmi:id="_DFi6IM2GEeOX1ohrWoozJQ" name="style" visibility="public" type="Style" aggregation="composite" association="_vnz5oM2GEeOX1ohrWoozJQ">
- <ownedComment xmi:id="_DFi6Ic2GEeOX1ohrWoozJQ" annotatedElement="_DFi6IM2GEeOX1ohrWoozJQ">
+ <ownedAttribute xmi:type="uml:Property" xmi:id="_DFi6IM2GEeOX1ohrWoozJQ" name="style" visibility="public" type="Style" aggregation="composite" association="_vnz5oM2GEeOX1ohrWoozJQ">
+ <ownedComment xmi:type="uml:Comment" xmi:id="_DFi6Ic2GEeOX1ohrWoozJQ" annotatedElement="_DFi6IM2GEeOX1ohrWoozJQ">
<body>A style that is applied to graphical elements selected by this rule.</body>
</ownedComment>
</ownedAttribute>
</packagedElement>
<packagedElement xmi:type="uml:Class" xmi:id="_ClirwM2DEeOX1ohrWoozJQ" name="StyleSelector">
- <ownedComment xmi:id="_FfB5AM2REeOtK5GsJlm5Mw">
+ <ownedComment xmi:type="uml:Comment" xmi:id="_FfB5AM2REeOtK5GsJlm5Mw">
<body>StyleSelector defines criteria that matches a set of graphical elements.</body>
</ownedComment>
- <ownedAttribute xmi:id="_OsgrUM2IEeOX1ohrWoozJQ" name="kind" visibility="public" type="_6aYm0OgeEeO6TvQHODg78w">
- <ownedComment xmi:id="_OsgrUc2IEeOX1ohrWoozJQ" annotatedElement="_OsgrUM2IEeOX1ohrWoozJQ">
+ <ownedAttribute xmi:type="uml:Property" xmi:id="_OsgrUM2IEeOX1ohrWoozJQ" name="kind" visibility="public" type="_6aYm0OgeEeO6TvQHODg78w">
+ <ownedComment xmi:type="uml:Comment" xmi:id="_OsgrUc2IEeOX1ohrWoozJQ" annotatedElement="_OsgrUM2IEeOX1ohrWoozJQ">
<body>The kind of graphical element to select.</body>
</ownedComment>
<lowerValue xmi:type="uml:LiteralInteger" xmi:id="_2Pfm-fo2EeOw_Nx9vOEGaA"/>
</ownedAttribute>
- <ownedAttribute xmi:id="_Y03bYM2IEeOX1ohrWoozJQ" name="class" visibility="public" isOrdered="true">
- <ownedComment xmi:id="_Y03bYc2IEeOX1ohrWoozJQ" annotatedElement="_Y03bYM2IEeOX1ohrWoozJQ">
+ <ownedAttribute xmi:type="uml:Property" xmi:id="_Y03bYM2IEeOX1ohrWoozJQ" name="class" visibility="public" isOrdered="true">
+ <ownedComment xmi:type="uml:Comment" xmi:id="_Y03bYc2IEeOX1ohrWoozJQ" annotatedElement="_Y03bYM2IEeOX1ohrWoozJQ">
<body>A set of strings representing classes of graphical elements to select. Selected elements must have all those classes.</body>
</ownedComment>
<type xmi:type="uml:PrimitiveType" href="DC.uml#String"/>
@@ -977,11 +977,11 @@
</ownedAttribute>
</packagedElement>
<packagedElement xmi:type="uml:Class" xmi:id="_4ytfwM2CEeOX1ohrWoozJQ" name="StyleSheet">
- <ownedComment xmi:id="_WuWzIM2OEeOtK5GsJlm5Mw">
+ <ownedComment xmi:type="uml:Comment" xmi:id="_WuWzIM2OEeOtK5GsJlm5Mw">
<body>StyleSheet defines a list of style rules that apply to graphical elements in a canvas.</body>
</ownedComment>
- <ownedAttribute xmi:id="_TqPtcM2EEeOX1ohrWoozJQ" name="rule" visibility="public" type="_9z_BQM2CEeOX1ohrWoozJQ" isOrdered="true" aggregation="composite" association="_QZkcUM2DEeOX1ohrWoozJQ">
- <ownedComment xmi:id="_TqPtcc2EEeOX1ohrWoozJQ" annotatedElement="_TqPtcM2EEeOX1ohrWoozJQ">
+ <ownedAttribute xmi:type="uml:Property" xmi:id="_TqPtcM2EEeOX1ohrWoozJQ" name="rule" visibility="public" type="_9z_BQM2CEeOX1ohrWoozJQ" isOrdered="true" aggregation="composite" association="_QZkcUM2DEeOX1ohrWoozJQ">
+ <ownedComment xmi:type="uml:Comment" xmi:id="_TqPtcc2EEeOX1ohrWoozJQ" annotatedElement="_TqPtcM2EEeOX1ohrWoozJQ">
<body>A list of style rules that apply to graphical elements.</body>
</ownedComment>
<lowerValue xmi:type="uml:LiteralInteger" xmi:id="_2Pfm_Po2EeOw_Nx9vOEGaA"/>
@@ -989,284 +989,284 @@
</ownedAttribute>
</packagedElement>
<packagedElement xmi:type="uml:Class" xmi:id="Text" name="Text">
- <ownedComment xmi:id="Text-_ownedComment.0" annotatedElement="Text">
+ <ownedComment xmi:type="uml: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:id="_dPn0oO0zEeOCPtJ2AfZp5A" name="data_cannot_be_empty" constrainedElement="Text">
+ <ownedRule xmi:type="uml:Constraint" xmi:id="_dPn0oO0zEeOCPtJ2AfZp5A" name="data_cannot_be_empty" constrainedElement="Text">
<specification xmi:type="uml:OpaqueExpression" xmi:id="_dPn0oe0zEeOCPtJ2AfZp5A">
<language>OCL</language>
<body>data->notEmpty() implies data.size() > 0</body>
</specification>
</ownedRule>
- <generalization xmi:id="_2PiDNvo2EeOw_Nx9vOEGaA" general="GraphicalElement"/>
- <ownedAttribute xmi:id="Text-data" name="data" visibility="public">
- <ownedComment xmi:id="Text-data-_ownedComment.0" annotatedElement="Text-data">
+ <generalization xmi:type="uml:Generalization" xmi:id="_2PiDNvo2EeOw_Nx9vOEGaA" general="GraphicalElement"/>
+ <ownedAttribute xmi:type="uml:Property" xmi:id="Text-data" name="data" visibility="public">
+ <ownedComment xmi:type="uml:Comment" xmi:id="Text-data-_ownedComment.0" annotatedElement="Text-data">
<body>the text as a string of characters.</body>
</ownedComment>
<type xmi:type="uml:PrimitiveType" href="DC.uml#String"/>
</ownedAttribute>
- <ownedAttribute xmi:id="Text-bounds" name="position" visibility="public">
- <ownedComment xmi:id="Text-bounds-_ownedComment.0" annotatedElement="Text-bounds">
+ <ownedAttribute xmi:type="uml:Property" xmi:id="Text-bounds" name="bounds" visibility="public">
+ <ownedComment xmi:type="uml:Comment" xmi:id="Text-bounds-_ownedComment.0" annotatedElement="Text-bounds">
<body>the bounds inside which the text is rendered (possibly wrapped into multiple lines)</body>
</ownedComment>
- <type xmi:type="uml:DataType" href="DC.uml#Point"/>
+ <type xmi:type="uml:DataType" href="DC.uml#Bounds"/>
</ownedAttribute>
- <ownedAttribute xmi:id="_gfifwBOfEeSXerk-XJQMGw" name="anchor" type="_E6CjYBOfEeSXerk-XJQMGw">
+ <ownedAttribute xmi:type="uml:Property" xmi:id="_gfifwBOfEeSXerk-XJQMGw" name="anchor" type="_E6CjYBOfEeSXerk-XJQMGw">
<lowerValue xmi:type="uml:LiteralInteger" xmi:id="_k-EgkBOfEeSXerk-XJQMGw"/>
<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_k-FHoBOfEeSXerk-XJQMGw" value="1"/>
</ownedAttribute>
</packagedElement>
<packagedElement xmi:type="uml:Class" xmi:id="Transform" name="Transform" isAbstract="true">
- <ownedComment xmi:id="Transform-_ownedComment.0" annotatedElement="Transform">
+ <ownedComment xmi:type="uml:Comment" xmi:id="Transform-_ownedComment.0" annotatedElement="Transform">
<body>Transform defines an operation that changes the geometry of a graphical element in a specific way.</body>
</ownedComment>
</packagedElement>
<packagedElement xmi:type="uml:Class" xmi:id="Translate" name="Translate">
- <ownedComment xmi:id="Translate-_ownedComment.0" annotatedElement="Translate">
+ <ownedComment xmi:type="uml:Comment" xmi:id="Translate-_ownedComment.0" annotatedElement="Translate">
<body>Translate is a kind of transform that translates (moves) a graphical element by a given delta along the x-y coordinate system.</body>
</ownedComment>
- <generalization xmi:id="_2PiDN_o2EeOw_Nx9vOEGaA" general="Transform"/>
- <ownedAttribute xmi:id="Translate-deltaX" name="deltaX" visibility="public">
- <ownedComment xmi:id="Translate-deltaX-_ownedComment.0" annotatedElement="Translate-deltaX">
+ <generalization xmi:type="uml:Generalization" xmi:id="_2PiDN_o2EeOw_Nx9vOEGaA" general="Transform"/>
+ <ownedAttribute xmi:type="uml:Property" xmi:id="Translate-deltaX" name="deltaX" visibility="public">
+ <ownedComment xmi:type="uml:Comment" xmi:id="Translate-deltaX-_ownedComment.0" annotatedElement="Translate-deltaX">
<body>a real number representing a translate delta along the x-axis. Both positive and negative values are allowed.</body>
</ownedComment>
<type xmi:type="uml:PrimitiveType" href="DC.uml#Real"/>
</ownedAttribute>
- <ownedAttribute xmi:id="Translate-deltaY" name="deltaY" visibility="public">
- <ownedComment xmi:id="Translate-deltaY-_ownedComment.0" annotatedElement="Translate-deltaY">
+ <ownedAttribute xmi:type="uml:Property" xmi:id="Translate-deltaY" name="deltaY" visibility="public">
+ <ownedComment xmi:type="uml:Comment" xmi:id="Translate-deltaY-_ownedComment.0" annotatedElement="Translate-deltaY">
<body>a real number representing a translate delta along the y-axis. Both positive and negative values are allowed.</body>
</ownedComment>
<type xmi:type="uml:PrimitiveType" href="DC.uml#Real"/>
</ownedAttribute>
</packagedElement>
<packagedElement xmi:type="uml:Class" xmi:id="_wGwIsNeoEeOgmPOh7kSfHA" name="Use">
- <ownedComment xmi:id="_wGwIsdeoEeOgmPOh7kSfHA" annotatedElement="_wGwIsNeoEeOgmPOh7kSfHA">
+ <ownedComment xmi:type="uml: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>
- <ownedRule xmi:id="_oxx7UOh0EeO6TvQHODg78w" name="referenced_element_has_id" constrainedElement="_wGwIsNeoEeOgmPOh7kSfHA">
+ <ownedRule xmi:type="uml:Constraint" xmi:id="_oxx7UOh0EeO6TvQHODg78w" name="referenced_element_has_id" constrainedElement="_wGwIsNeoEeOgmPOh7kSfHA">
<specification xmi:type="uml:OpaqueExpression" xmi:id="_oxx7Ueh0EeO6TvQHODg78w">
<language>OCL</language>
<body>referencedElement->notEmpty() implies referencedElement.id->notEmpty()</body>
</specification>
</ownedRule>
- <generalization xmi:id="_2PiDOPo2EeOw_Nx9vOEGaA" general="GraphicalElement"/>
- <ownedAttribute xmi:id="_wGwIs9eoEeOgmPOh7kSfHA" name="bounds" visibility="public">
- <ownedComment xmi:id="_wGwItNeoEeOgmPOh7kSfHA" annotatedElement="_wGwIs9eoEeOgmPOh7kSfHA">
+ <generalization xmi:type="uml:Generalization" xmi:id="_2PiDOPo2EeOw_Nx9vOEGaA" general="GraphicalElement"/>
+ <ownedAttribute xmi:type="uml:Property" xmi:id="_wGwIs9eoEeOgmPOh7kSfHA" name="bounds" visibility="public">
+ <ownedComment xmi:type="uml:Comment" xmi:id="_wGwItNeoEeOgmPOh7kSfHA" annotatedElement="_wGwIs9eoEeOgmPOh7kSfHA">
<body>the bounds of the rectangle in the x-y coordinate system.</body>
</ownedComment>
<type xmi:type="uml:DataType" href="DC.uml#Bounds"/>
<lowerValue xmi:type="uml:LiteralInteger" xmi:id="_2PgOAPo2EeOw_Nx9vOEGaA"/>
</ownedAttribute>
- <ownedAttribute xmi:id="_im5DIOHhEeO71tdCkM4EDw" name="referencedElement" visibility="public" type="GraphicalElement" isOrdered="true" association="_zbtccOHnEeO71tdCkM4EDw">
- <ownedComment xmi:id="_im5DIeHhEeO71tdCkM4EDw" annotatedElement="_im5DIOHhEeO71tdCkM4EDw">
+ <ownedAttribute xmi:type="uml:Property" xmi:id="_im5DIOHhEeO71tdCkM4EDw" name="referencedElement" visibility="public" type="GraphicalElement" isOrdered="true" association="_zbtccOHnEeO71tdCkM4EDw">
+ <ownedComment xmi:type="uml:Comment" xmi:id="_im5DIeHhEeO71tdCkM4EDw" annotatedElement="_im5DIOHhEeO71tdCkM4EDw">
<body>A list of graphical elements that are members of this group.</body>
</ownedComment>
</ownedAttribute>
</packagedElement>
<packagedElement xmi:type="uml:Enumeration" xmi:id="_wgzj4M2WEeOtK5GsJlm5Mw" name="FontDecoration">
- <ownedComment xmi:id="_2Xj74M2WEeOtK5GsJlm5Mw">
+ <ownedComment xmi:type="uml:Comment" xmi:id="_2Xj74M2WEeOtK5GsJlm5Mw">
<body>The kind of decoration applied to a font.</body>
</ownedComment>
- <ownedLiteral xmi:id="_BWypkM2XEeOtK5GsJlm5Mw" name="underline">
- <ownedComment xmi:id="_EPxo4M2XEeOtK5GsJlm5Mw">
+ <ownedLiteral xmi:type="uml:EnumerationLiteral" xmi:id="_BWypkM2XEeOtK5GsJlm5Mw" name="underline">
+ <ownedComment xmi:type="uml:Comment" xmi:id="_EPxo4M2XEeOtK5GsJlm5Mw">
<body>The font is underlined.</body>
</ownedComment>
</ownedLiteral>
- <ownedLiteral xmi:id="_G7EKcM2XEeOtK5GsJlm5Mw" name="overline">
- <ownedComment xmi:id="_G7EKcc2XEeOtK5GsJlm5Mw">
+ <ownedLiteral xmi:type="uml:EnumerationLiteral" xmi:id="_G7EKcM2XEeOtK5GsJlm5Mw" name="overline">
+ <ownedComment xmi:type="uml:Comment" xmi:id="_G7EKcc2XEeOtK5GsJlm5Mw">
<body>The font is overlined.</body>
</ownedComment>
</ownedLiteral>
- <ownedLiteral xmi:id="_HEvq4M2XEeOtK5GsJlm5Mw" name="lineThrough">
- <ownedComment xmi:id="_HEvq4c2XEeOtK5GsJlm5Mw">
+ <ownedLiteral xmi:type="uml:EnumerationLiteral" xmi:id="_HEvq4M2XEeOtK5GsJlm5Mw" name="lineThrough">
+ <ownedComment xmi:type="uml:Comment" xmi:id="_HEvq4c2XEeOtK5GsJlm5Mw">
<body>The font is striked through.</body>
</ownedComment>
</ownedLiteral>
</packagedElement>
<packagedElement xmi:type="uml:Enumeration" xmi:id="_6aYm0OgeEeO6TvQHODg78w" name="ElementKind">
- <ownedComment xmi:id="_6aYm0egeEeO6TvQHODg78w">
+ <ownedComment xmi:type="uml:Comment" xmi:id="_6aYm0egeEeO6TvQHODg78w">
<body>The kind of graphical element.</body>
</ownedComment>
- <ownedLiteral xmi:id="_6aYm0ugeEeO6TvQHODg78w" name="canvas">
- <ownedComment xmi:id="_6aYm0-geEeO6TvQHODg78w">
+ <ownedLiteral xmi:type="uml:EnumerationLiteral" xmi:id="_6aYm0ugeEeO6TvQHODg78w" name="canvas">
+ <ownedComment xmi:type="uml:Comment" xmi:id="_6aYm0-geEeO6TvQHODg78w">
<body>The Canvas element kind</body>
</ownedComment>
</ownedLiteral>
- <ownedLiteral xmi:id="_TObvQOgfEeO6TvQHODg78w" name="circle">
- <ownedComment xmi:id="_TObvQegfEeO6TvQHODg78w">
+ <ownedLiteral xmi:type="uml:EnumerationLiteral" xmi:id="_TObvQOgfEeO6TvQHODg78w" name="circle">
+ <ownedComment xmi:type="uml:Comment" xmi:id="_TObvQegfEeO6TvQHODg78w">
<body>The Circle element kind</body>
</ownedComment>
</ownedLiteral>
- <ownedLiteral xmi:id="_XmBakOgfEeO6TvQHODg78w" name="clipPath">
- <ownedComment xmi:id="_XmBakegfEeO6TvQHODg78w">
+ <ownedLiteral xmi:type="uml:EnumerationLiteral" xmi:id="_XmBakOgfEeO6TvQHODg78w" name="clipPath">
+ <ownedComment xmi:type="uml:Comment" xmi:id="_XmBakegfEeO6TvQHODg78w">
<body>The ClipPath element kind</body>
</ownedComment>
</ownedLiteral>
- <ownedLiteral xmi:id="_iEuOEOgfEeO6TvQHODg78w" name="ellipse">
- <ownedComment xmi:id="_iEuOEegfEeO6TvQHODg78w">
+ <ownedLiteral xmi:type="uml:EnumerationLiteral" xmi:id="_iEuOEOgfEeO6TvQHODg78w" name="ellipse">
+ <ownedComment xmi:type="uml:Comment" xmi:id="_iEuOEegfEeO6TvQHODg78w">
<body>The Ellipse element kind</body>
</ownedComment>
</ownedLiteral>
- <ownedLiteral xmi:id="_nqm4gOgfEeO6TvQHODg78w" name="group">
- <ownedComment xmi:id="_nqm4gegfEeO6TvQHODg78w">
+ <ownedLiteral xmi:type="uml:EnumerationLiteral" xmi:id="_nqm4gOgfEeO6TvQHODg78w" name="group">
+ <ownedComment xmi:type="uml:Comment" xmi:id="_nqm4gegfEeO6TvQHODg78w">
<body>The Group element kind</body>
</ownedComment>
</ownedLiteral>
- <ownedLiteral xmi:id="_n3HqgOgfEeO6TvQHODg78w" name="image">
- <ownedComment xmi:id="_n3IRkOgfEeO6TvQHODg78w">
+ <ownedLiteral xmi:type="uml:EnumerationLiteral" xmi:id="_n3HqgOgfEeO6TvQHODg78w" name="image">
+ <ownedComment xmi:type="uml:Comment" xmi:id="_n3IRkOgfEeO6TvQHODg78w">
<body>The Image element kind</body>
</ownedComment>
</ownedLiteral>
- <ownedLiteral xmi:id="_n9h0gOgfEeO6TvQHODg78w" name="line">
- <ownedComment xmi:id="_n9h0gegfEeO6TvQHODg78w">
+ <ownedLiteral xmi:type="uml:EnumerationLiteral" xmi:id="_n9h0gOgfEeO6TvQHODg78w" name="line">
+ <ownedComment xmi:type="uml:Comment" xmi:id="_n9h0gegfEeO6TvQHODg78w">
<body>The Line element kind</body>
</ownedComment>
</ownedLiteral>
- <ownedLiteral xmi:id="_oEA3AOgfEeO6TvQHODg78w" name="marker">
- <ownedComment xmi:id="_oEA3AegfEeO6TvQHODg78w">
+ <ownedLiteral xmi:type="uml:EnumerationLiteral" xmi:id="_oEA3AOgfEeO6TvQHODg78w" name="marker">
+ <ownedComment xmi:type="uml:Comment" xmi:id="_oEA3AegfEeO6TvQHODg78w">
<body>The Marker element kind</body>
</ownedComment>
</ownedLiteral>
- <ownedLiteral xmi:id="_oJbigOgfEeO6TvQHODg78w" name="path">
- <ownedComment xmi:id="_oJbigegfEeO6TvQHODg78w">
+ <ownedLiteral xmi:type="uml:EnumerationLiteral" xmi:id="_oJbigOgfEeO6TvQHODg78w" name="path">
+ <ownedComment xmi:type="uml:Comment" xmi:id="_oJbigegfEeO6TvQHODg78w">
<body>The Path element kind</body>
</ownedComment>
</ownedLiteral>
- <ownedLiteral xmi:id="_oO2OAOgfEeO6TvQHODg78w" name="polygon">
- <ownedComment xmi:id="_oO2OAegfEeO6TvQHODg78w">
+ <ownedLiteral xmi:type="uml:EnumerationLiteral" xmi:id="_oO2OAOgfEeO6TvQHODg78w" name="polygon">
+ <ownedComment xmi:type="uml:Comment" xmi:id="_oO2OAegfEeO6TvQHODg78w">
<body>The Polygon element kind</body>
</ownedComment>
</ownedLiteral>
- <ownedLiteral xmi:id="_oXUNgOgfEeO6TvQHODg78w" name="polyline">
- <ownedComment xmi:id="_oXUNgegfEeO6TvQHODg78w">
+ <ownedLiteral xmi:type="uml:EnumerationLiteral" xmi:id="_oXUNgOgfEeO6TvQHODg78w" name="polyline">
+ <ownedComment xmi:type="uml:Comment" xmi:id="_oXUNgegfEeO6TvQHODg78w">
<body>The Polyline element kind</body>
</ownedComment>
</ownedLiteral>
- <ownedLiteral xmi:id="_ofLJAOgfEeO6TvQHODg78w" name="rectangle">
- <ownedComment xmi:id="_ofLJAegfEeO6TvQHODg78w">
+ <ownedLiteral xmi:type="uml:EnumerationLiteral" xmi:id="_ofLJAOgfEeO6TvQHODg78w" name="rectangle">
+ <ownedComment xmi:type="uml:Comment" xmi:id="_ofLJAegfEeO6TvQHODg78w">
<body>The Rectangle element kind</body>
</ownedComment>
</ownedLiteral>
- <ownedLiteral xmi:id="_oluc8OgfEeO6TvQHODg78w" name="text">
- <ownedComment xmi:id="_oluc8egfEeO6TvQHODg78w">
+ <ownedLiteral xmi:type="uml:EnumerationLiteral" xmi:id="_oluc8OgfEeO6TvQHODg78w" name="text">
+ <ownedComment xmi:type="uml:Comment" xmi:id="_oluc8egfEeO6TvQHODg78w">
<body>The Text element kind</body>
</ownedComment>
</ownedLiteral>
- <ownedLiteral xmi:id="_oz2_kOgfEeO6TvQHODg78w" name="use">
- <ownedComment xmi:id="_oz2_kegfEeO6TvQHODg78w">
+ <ownedLiteral xmi:type="uml:EnumerationLiteral" xmi:id="_oz2_kOgfEeO6TvQHODg78w" name="use">
+ <ownedComment xmi:type="uml:Comment" xmi:id="_oz2_kegfEeO6TvQHODg78w">
<body>The Use element kind</body>
</ownedComment>
</ownedLiteral>
</packagedElement>
<packagedElement xmi:type="uml:Enumeration" xmi:id="_E6CjYBOfEeSXerk-XJQMGw" name="TextAnchor">
- <ownedLiteral xmi:id="_Gog3YBOfEeSXerk-XJQMGw" name="start"/>
- <ownedLiteral xmi:id="_NUm78BOfEeSXerk-XJQMGw" name="middle"/>
- <ownedLiteral xmi:id="_N_-0MBOfEeSXerk-XJQMGw" name="end"/>
+ <ownedLiteral xmi:type="uml:EnumerationLiteral" xmi:id="_Gog3YBOfEeSXerk-XJQMGw" name="start"/>
+ <ownedLiteral xmi:type="uml:EnumerationLiteral" xmi:id="_NUm78BOfEeSXerk-XJQMGw" name="middle"/>
+ <ownedLiteral xmi:type="uml:EnumerationLiteral" xmi:id="_N_-0MBOfEeSXerk-XJQMGw" name="end"/>
</packagedElement>
<packagedElement xmi:type="uml:Association" xmi:id="_qUuAwM51EeOqlr8E3pzO9g" name="A_definitions_canvas" memberEnd="_jfIkFtesEeOsUY1jE2-lpg _qUuAwc51EeOqlr8E3pzO9g">
- <ownedEnd xmi:id="_qUuAwc51EeOqlr8E3pzO9g" name="canvas" visibility="public" type="_jfIkENesEeOsUY1jE2-lpg" association="_qUuAwM51EeOqlr8E3pzO9g"/>
+ <ownedEnd xmi:type="uml:Property" xmi:id="_qUuAwc51EeOqlr8E3pzO9g" name="canvas" visibility="public" type="_jfIkENesEeOsUY1jE2-lpg" association="_qUuAwM51EeOqlr8E3pzO9g"/>
</packagedElement>
<packagedElement xmi:type="uml:Association" xmi:id="_VJB6MM41EeOqlr8E3pzO9g" name="A_externalStyleSheet_canvas" memberEnd="_jfIkGdesEeOsUY1jE2-lpg _VJB6Mc41EeOqlr8E3pzO9g">
- <ownedEnd xmi:id="_VJB6Mc41EeOqlr8E3pzO9g" name="canvas" visibility="public" type="_jfIkENesEeOsUY1jE2-lpg" association="_VJB6MM41EeOqlr8E3pzO9g">
+ <ownedEnd xmi:type="uml:Property" xmi:id="_VJB6Mc41EeOqlr8E3pzO9g" name="canvas" visibility="public" type="_jfIkENesEeOsUY1jE2-lpg" association="_VJB6MM41EeOqlr8E3pzO9g">
<lowerValue xmi:type="uml:LiteralInteger" xmi:id="_2PgOAfo2EeOw_Nx9vOEGaA"/>
<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_2PgOAvo2EeOw_Nx9vOEGaA" value="*"/>
</ownedEnd>
</packagedElement>
<packagedElement xmi:type="uml:Association" xmi:id="_Nti6EM53EeOqlr8E3pzO9g" name="A_definition_definitions" memberEnd="_zSdxIM5wEeOqlr8E3pzO9g _Nti6Ec53EeOqlr8E3pzO9g">
- <ownedEnd xmi:id="_Nti6Ec53EeOqlr8E3pzO9g" name="definitions" visibility="public" type="_DH0DwM5yEeOqlr8E3pzO9g" association="_Nti6EM53EeOqlr8E3pzO9g"/>
+ <ownedEnd xmi:type="uml:Property" xmi:id="_Nti6Ec53EeOqlr8E3pzO9g" name="definitions" visibility="public" type="_DH0DwM5yEeOqlr8E3pzO9g" association="_Nti6EM53EeOqlr8E3pzO9g"/>
</packagedElement>
<packagedElement xmi:type="uml:Association" xmi:id="_packagedElement.47" name="A_styleSheet_definitions" memberEnd="Canvas-packagedStyle _packagedElement.47-canvas">
- <ownedEnd xmi:id="_packagedElement.47-canvas" name="definitions" visibility="public" type="_DH0DwM5yEeOqlr8E3pzO9g" association="_packagedElement.47"/>
+ <ownedEnd xmi:type="uml:Property" xmi:id="_packagedElement.47-canvas" name="definitions" visibility="public" type="_DH0DwM5yEeOqlr8E3pzO9g" association="_packagedElement.47"/>
</packagedElement>
<packagedElement xmi:type="uml:Association" xmi:id="A_clipPath_clippedElement" name="A_clipPath_clippedElement" memberEnd="GraphicalElement-clipPath ClipPath-clippedElement">
- <ownedEnd xmi:id="ClipPath-clippedElement" name="clippedElement" visibility="public" type="GraphicalElement" association="A_clipPath_clippedElement">
+ <ownedEnd xmi:type="uml:Property" xmi:id="ClipPath-clippedElement" name="clippedElement" visibility="public" type="GraphicalElement" association="A_clipPath_clippedElement">
<lowerValue xmi:type="uml:LiteralInteger" xmi:id="_2PgOA_o2EeOw_Nx9vOEGaA"/>
<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_2PgOBPo2EeOw_Nx9vOEGaA" value="*"/>
</ownedEnd>
</packagedElement>
<packagedElement xmi:type="uml:Association" xmi:id="A_localStyle_styledElement" name="A_style_styledElement" memberEnd="GraphicalElement-localStyle A_localStyle_styledElement-styledElement">
- <ownedEnd xmi:id="A_localStyle_styledElement-styledElement" name="styledElement" visibility="public" type="GraphicalElement" association="A_localStyle_styledElement">
+ <ownedEnd xmi:type="uml:Property" xmi:id="A_localStyle_styledElement-styledElement" name="styledElement" visibility="public" type="GraphicalElement" association="A_localStyle_styledElement">
<lowerValue xmi:type="uml:LiteralInteger" xmi:id="_2PgOBfo2EeOw_Nx9vOEGaA"/>
</ownedEnd>
</packagedElement>
<packagedElement xmi:type="uml:Association" xmi:id="_TVnmYM42EeOqlr8E3pzO9g" name="A_transform_transformedElement" memberEnd="GraphicalElement-transform _TVnmYc42EeOqlr8E3pzO9g">
- <ownedEnd xmi:id="_TVnmYc42EeOqlr8E3pzO9g" name="transformedElement" visibility="public" type="GraphicalElement" association="_TVnmYM42EeOqlr8E3pzO9g">
+ <ownedEnd xmi:type="uml:Property" xmi:id="_TVnmYc42EeOqlr8E3pzO9g" name="transformedElement" visibility="public" type="GraphicalElement" association="_TVnmYM42EeOqlr8E3pzO9g">
<lowerValue xmi:type="uml:LiteralInteger" xmi:id="_2Pg1EPo2EeOw_Nx9vOEGaA"/>
</ownedEnd>
</packagedElement>
<packagedElement xmi:type="uml:Association" xmi:id="_hQOVgM41EeOqlr8E3pzO9g" name="A_stop_gradient" memberEnd="Gradient-stop _hQO8kM41EeOqlr8E3pzO9g">
- <ownedEnd xmi:id="_hQO8kM41EeOqlr8E3pzO9g" name="gradient" visibility="public" type="Gradient" association="_hQOVgM41EeOqlr8E3pzO9g"/>
+ <ownedEnd xmi:type="uml:Property" xmi:id="_hQO8kM41EeOqlr8E3pzO9g" name="gradient" visibility="public" type="Gradient" association="_hQOVgM41EeOqlr8E3pzO9g"/>
</packagedElement>
<packagedElement xmi:type="uml:Association" xmi:id="A_member_group" name="A_member_group" memberEnd="Group-member GraphicalElement-group"/>
<packagedElement xmi:type="uml:Association" xmi:id="A_endMarker_markedElement" name="A_endMarker_markedElement" memberEnd="MarkedElement-endMarker A_endMarker_markedElement-markedElement">
- <ownedEnd xmi:id="A_endMarker_markedElement-markedElement" name="markedElement" visibility="public" type="MarkedElement" association="A_endMarker_markedElement">
+ <ownedEnd xmi:type="uml:Property" xmi:id="A_endMarker_markedElement-markedElement" name="markedElement" visibility="public" type="MarkedElement" association="A_endMarker_markedElement">
<lowerValue xmi:type="uml:LiteralInteger" xmi:id="_2Pg1Efo2EeOw_Nx9vOEGaA"/>
<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_2Pg1Evo2EeOw_Nx9vOEGaA" value="*"/>
</ownedEnd>
</packagedElement>
<packagedElement xmi:type="uml:Association" xmi:id="A_midMarker_markedElement" name="A_midMarker_markedElement" memberEnd="MarkedElement-midMarker A_midMarker_markedElement-markedElement">
- <ownedEnd xmi:id="A_midMarker_markedElement-markedElement" name="markedElement" visibility="public" type="MarkedElement" association="A_midMarker_markedElement">
+ <ownedEnd xmi:type="uml:Property" xmi:id="A_midMarker_markedElement-markedElement" name="markedElement" visibility="public" type="MarkedElement" association="A_midMarker_markedElement">
<lowerValue xmi:type="uml:LiteralInteger" xmi:id="_2Pg1E_o2EeOw_Nx9vOEGaA"/>
<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_2Pg1FPo2EeOw_Nx9vOEGaA" value="*"/>
</ownedEnd>
</packagedElement>
<packagedElement xmi:type="uml:Association" xmi:id="A_startMarker_markedElement" name="A_startMarker_markedElement" memberEnd="MarkedElement-startMarker A_startMarker_markedElement-markedElement">
- <ownedEnd xmi:id="A_startMarker_markedElement-markedElement" name="markedElement" visibility="public" type="MarkedElement" association="A_startMarker_markedElement">
+ <ownedEnd xmi:type="uml:Property" xmi:id="A_startMarker_markedElement-markedElement" name="markedElement" visibility="public" type="MarkedElement" association="A_startMarker_markedElement">
<lowerValue xmi:type="uml:LiteralInteger" xmi:id="_2Pg1Ffo2EeOw_Nx9vOEGaA"/>
<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_2Pg1Fvo2EeOw_Nx9vOEGaA" value="*"/>
</ownedEnd>
</packagedElement>
<packagedElement xmi:type="uml:Association" xmi:id="_VGk7AM2kEeOtK5GsJlm5Mw" name="A_paintServer_paint" memberEnd="_dR8eIM2dEeOtK5GsJlm5Mw _VGk7Ac2kEeOtK5GsJlm5Mw">
- <ownedEnd xmi:id="_VGk7Ac2kEeOtK5GsJlm5Mw" name="paint" visibility="public" type="_wz9hsM2cEeOtK5GsJlm5Mw" association="_VGk7AM2kEeOtK5GsJlm5Mw">
+ <ownedEnd xmi:type="uml:Property" xmi:id="_VGk7Ac2kEeOtK5GsJlm5Mw" name="paint" visibility="public" type="_wz9hsM2cEeOtK5GsJlm5Mw" association="_VGk7AM2kEeOtK5GsJlm5Mw">
<lowerValue xmi:type="uml:LiteralInteger" xmi:id="_2Pg1F_o2EeOw_Nx9vOEGaA"/>
<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_2Pg1GPo2EeOw_Nx9vOEGaA" value="*"/>
</ownedEnd>
</packagedElement>
<packagedElement xmi:type="uml:Association" xmi:id="_oEGFIM55EeOqlr8E3pzO9g" name="A_transform_paintServer" memberEnd="Fill-transform _oEGFIc55EeOqlr8E3pzO9g">
- <ownedEnd xmi:id="_oEGFIc55EeOqlr8E3pzO9g" name="paintServer" visibility="public" type="Fill" association="_oEGFIM55EeOqlr8E3pzO9g">
+ <ownedEnd xmi:type="uml:Property" xmi:id="_oEGFIc55EeOqlr8E3pzO9g" name="paintServer" visibility="public" type="Fill" association="_oEGFIM55EeOqlr8E3pzO9g">
<lowerValue xmi:type="uml:LiteralInteger" xmi:id="_2Pg1Gfo2EeOw_Nx9vOEGaA"/>
</ownedEnd>
</packagedElement>
<packagedElement xmi:type="uml:Association" xmi:id="_-INckM55EeOqlr8E3pzO9g" name="A_command_path" memberEnd="Path-command _-INckc55EeOqlr8E3pzO9g">
- <ownedEnd xmi:id="_-INckc55EeOqlr8E3pzO9g" name="path" visibility="public" type="Path" association="_-INckM55EeOqlr8E3pzO9g"/>
+ <ownedEnd xmi:type="uml:Property" xmi:id="_-INckc55EeOqlr8E3pzO9g" name="path" visibility="public" type="Path" association="_-INckM55EeOqlr8E3pzO9g"/>
</packagedElement>
<packagedElement xmi:type="uml:Association" xmi:id="A_tile_pattern" name="A_tile_pattern" memberEnd="Pattern-tile A_tile_pattern-pattern">
- <ownedEnd xmi:id="A_tile_pattern-pattern" name="pattern" visibility="public" type="Pattern" association="A_tile_pattern">
+ <ownedEnd xmi:type="uml:Property" xmi:id="A_tile_pattern-pattern" name="pattern" visibility="public" type="Pattern" association="A_tile_pattern">
<lowerValue xmi:type="uml:LiteralInteger" xmi:id="_2Pg1Gvo2EeOw_Nx9vOEGaA"/>
</ownedEnd>
</packagedElement>
<packagedElement xmi:type="uml:Association" xmi:id="A_fill_style" name="A_fill_style" memberEnd="Style-fill A_fill_style-style">
- <ownedEnd xmi:id="A_fill_style-style" name="style" visibility="public" type="Style" association="A_fill_style">
+ <ownedEnd xmi:type="uml:Property" xmi:id="A_fill_style-style" name="style" visibility="public" type="Style" association="A_fill_style">
<lowerValue xmi:type="uml:LiteralInteger" xmi:id="_2Pg1G_o2EeOw_Nx9vOEGaA"/>
</ownedEnd>
</packagedElement>
<packagedElement xmi:type="uml:Association" xmi:id="_KeO_IM2rEeOtK5GsJlm5Mw" name="A_stroke_style" memberEnd="_KemS4M2oEeOtK5GsJlm5Mw _KeO_Ic2rEeOtK5GsJlm5Mw">
- <ownedEnd xmi:id="_KeO_Ic2rEeOtK5GsJlm5Mw" name="style" visibility="public" type="Style" association="_KeO_IM2rEeOtK5GsJlm5Mw">
+ <ownedEnd xmi:type="uml:Property" xmi:id="_KeO_Ic2rEeOtK5GsJlm5Mw" name="style" visibility="public" type="Style" association="_KeO_IM2rEeOtK5GsJlm5Mw">
<lowerValue xmi:type="uml:LiteralInteger" xmi:id="_2Pg1HPo2EeOw_Nx9vOEGaA"/>
</ownedEnd>
</packagedElement>
<packagedElement xmi:type="uml:Association" xmi:id="_OTgnYM2GEeOX1ohrWoozJQ" name="A_selector_styleRule" memberEnd="_2CcQMM2FEeOX1ohrWoozJQ _OTgnYc2GEeOX1ohrWoozJQ">
- <ownedEnd xmi:id="_OTgnYc2GEeOX1ohrWoozJQ" name="styleRule" visibility="public" type="_9z_BQM2CEeOX1ohrWoozJQ" association="_OTgnYM2GEeOX1ohrWoozJQ"/>
+ <ownedEnd xmi:type="uml:Property" xmi:id="_OTgnYc2GEeOX1ohrWoozJQ" name="styleRule" visibility="public" type="_9z_BQM2CEeOX1ohrWoozJQ" association="_OTgnYM2GEeOX1ohrWoozJQ"/>
</packagedElement>
<packagedElement xmi:type="uml:Association" xmi:id="_vnz5oM2GEeOX1ohrWoozJQ" name="A_style_styleRule" memberEnd="_DFi6IM2GEeOX1ohrWoozJQ _vnz5oc2GEeOX1ohrWoozJQ">
- <ownedEnd xmi:id="_vnz5oc2GEeOX1ohrWoozJQ" name="styleRule" visibility="public" type="_9z_BQM2CEeOX1ohrWoozJQ" association="_vnz5oM2GEeOX1ohrWoozJQ">
+ <ownedEnd xmi:type="uml:Property" xmi:id="_vnz5oc2GEeOX1ohrWoozJQ" name="styleRule" visibility="public" type="_9z_BQM2CEeOX1ohrWoozJQ" association="_vnz5oM2GEeOX1ohrWoozJQ">
<lowerValue xmi:type="uml:LiteralInteger" xmi:id="_2Pg1Hfo2EeOw_Nx9vOEGaA"/>
</ownedEnd>
</packagedElement>
<packagedElement xmi:type="uml:Association" xmi:id="_QZkcUM2DEeOX1ohrWoozJQ" name="A_rule_styleSheet" memberEnd="_TqPtcM2EEeOX1ohrWoozJQ _ZfKSYM2EEeOX1ohrWoozJQ">
- <ownedEnd xmi:id="_ZfKSYM2EEeOX1ohrWoozJQ" name="styleSheet" visibility="public" type="_4ytfwM2CEeOX1ohrWoozJQ" association="_QZkcUM2DEeOX1ohrWoozJQ"/>
+ <ownedEnd xmi:type="uml:Property" xmi:id="_ZfKSYM2EEeOX1ohrWoozJQ" name="styleSheet" visibility="public" type="_4ytfwM2CEeOX1ohrWoozJQ" association="_QZkcUM2DEeOX1ohrWoozJQ"/>
</packagedElement>
<packagedElement xmi:type="uml:Association" xmi:id="_zbtccOHnEeO71tdCkM4EDw" name="A_referencedElement_use" memberEnd="_im5DIOHhEeO71tdCkM4EDw _zbtcceHnEeO71tdCkM4EDw">
- <ownedEnd xmi:id="_zbtcceHnEeO71tdCkM4EDw" name="use" visibility="public" type="_wGwIsNeoEeOgmPOh7kSfHA" association="_zbtccOHnEeO71tdCkM4EDw">
+ <ownedEnd xmi:type="uml:Property" xmi:id="_zbtcceHnEeO71tdCkM4EDw" name="use" visibility="public" type="_wGwIsNeoEeOgmPOh7kSfHA" association="_zbtccOHnEeO71tdCkM4EDw">
<lowerValue xmi:type="uml:LiteralInteger" xmi:id="_2Pg1Hvo2EeOw_Nx9vOEGaA"/>
<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_2Pg1H_o2EeOw_Nx9vOEGaA" value="*"/>
</ownedEnd>
</packagedElement>
- <profileApplication xmi:id="_mgdyEM1vEeOX1ohrWoozJQ">
- <eAnnotations xmi:id="_mgdyEc1vEeOX1ohrWoozJQ" source="http://www.eclipse.org/uml2/2.0.0/UML">
+ <profileApplication xmi:type="uml:ProfileApplication" xmi:id="_mgdyEM1vEeOX1ohrWoozJQ">
+ <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_mgdyEc1vEeOX1ohrWoozJQ" source="http://www.eclipse.org/uml2/2.0.0/UML">
<references xmi:type="ecore:EPackage" href="pathmap://UML_PROFILES/Ecore.profile.uml#_z1OFcHjqEdy8S4Cr8Rc_NA"/>
</eAnnotations>
- <appliedProfile href="pathmap://UML_PROFILES/Ecore.profile.uml#_0"/>
+ <appliedProfile xmi:type="uml:Profile" href="pathmap://UML_PROFILES/Ecore.profile.uml#_0"/>
</profileApplication>
<xmi:Extension extender="http://www.eclipse.org/uml2/4.0.0/UML">
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 50f8cbd487f..92b37f34562 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
@@ -14,6 +14,7 @@ package org.eclipse.papyrus.dd.dc;
import java.util.Map;
import org.eclipse.emf.common.util.DiagnosticChain;
+
import org.eclipse.emf.ecore.EObject;
/**
@@ -59,7 +60,7 @@ public interface Bounds extends EObject {
* <!-- begin-user-doc --> <!-- end-user-doc -->
*
* @param value
- * the new value of the '<em>X</em>' attribute.
+ * the new value of the '<em>X</em>' attribute.
* @see #isSetX()
* @see #unsetX()
* @see #getX()
@@ -110,7 +111,7 @@ public interface Bounds extends EObject {
* <!-- begin-user-doc --> <!-- end-user-doc -->
*
* @param value
- * the new value of the '<em>Y</em>' attribute.
+ * the new value of the '<em>Y</em>' attribute.
* @see #isSetY()
* @see #unsetY()
* @see #getY()
@@ -161,7 +162,7 @@ public interface Bounds extends EObject {
* <!-- begin-user-doc --> <!-- end-user-doc -->
*
* @param value
- * the new value of the '<em>Width</em>' attribute.
+ * the new value of the '<em>Width</em>' attribute.
* @see #isSetWidth()
* @see #unsetWidth()
* @see #getWidth()
@@ -213,7 +214,7 @@ public interface Bounds extends EObject {
* -->
*
* @param value
- * the new value of the '<em>Height</em>' attribute.
+ * the new value of the '<em>Height</em>' attribute.
* @see #getHeight()
* @generated
*/
@@ -247,10 +248,10 @@ public interface Bounds extends EObject {
* the width of bounds cannot be negative
*
* @param diagnostics
- * The chain of diagnostics to which problems are to be appended.
+ * The chain of diagnostics to which problems are to be appended.
* @param context
- * The cache of context-specific information. <!-- end-model-doc
- * -->
+ * The cache of context-specific information. <!-- end-model-doc
+ * -->
* @model
* annotation="http://www.eclipse.org/emf/2002/Ecore/OCL body='width >= 0'"
* @generated
@@ -262,10 +263,10 @@ public interface Bounds extends EObject {
* the height of bounds cannot be negative
*
* @param diagnostics
- * The chain of diagnostics to which problems are to be appended.
+ * The chain of diagnostics to which problems are to be appended.
* @param context
- * The cache of context-specific information. <!-- end-model-doc
- * -->
+ * The cache of context-specific information. <!-- end-model-doc
+ * -->
* @model
* annotation="http://www.eclipse.org/emf/2002/Ecore/OCL body='height >=0'"
* @generated
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 028a718bb92..2602afb5cc9 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
@@ -392,7 +392,8 @@ public interface DCPackage extends EPackage {
EAttribute getDimension_Height();
/**
- * Returns the meta object for the ' {@link org.eclipse.papyrus.dd.dc.Dimension#nonNegativeWidth(org.eclipse.emf.common.util.DiagnosticChain, java.util.Map)
+ * Returns the meta object for the '
+ * {@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 -->
@@ -404,7 +405,8 @@ public interface DCPackage extends EPackage {
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)
+ * 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 -->
@@ -470,7 +472,8 @@ public interface DCPackage extends EPackage {
EAttribute getBounds_Height();
/**
- * Returns the meta object for the ' {@link org.eclipse.papyrus.dd.dc.Bounds#nonNegativeWidth(org.eclipse.emf.common.util.DiagnosticChain, java.util.Map)
+ * Returns the meta object for the '
+ * {@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 -->
@@ -482,7 +485,8 @@ public interface DCPackage extends EPackage {
EOperation getBounds__NonNegativeWidth__DiagnosticChain_Map();
/**
- * Returns the meta object for the ' {@link org.eclipse.papyrus.dd.dc.Bounds#nonNegativeHeight(org.eclipse.emf.common.util.DiagnosticChain, java.util.Map)
+ * 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 -->
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 b81a3fc45d2..476319085eb 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
@@ -14,6 +14,7 @@ package org.eclipse.papyrus.dd.dc;
import java.util.Map;
import org.eclipse.emf.common.util.DiagnosticChain;
+
import org.eclipse.emf.ecore.EObject;
/**
@@ -57,7 +58,7 @@ public interface Dimension extends EObject {
* <!-- begin-user-doc --> <!-- end-user-doc -->
*
* @param value
- * the new value of the '<em>Width</em>' attribute.
+ * the new value of the '<em>Width</em>' attribute.
* @see #isSetWidth()
* @see #unsetWidth()
* @see #getWidth()
@@ -108,7 +109,7 @@ public interface Dimension extends EObject {
* <!-- begin-user-doc --> <!-- end-user-doc -->
*
* @param value
- * the new value of the '<em>Height</em>' attribute.
+ * the new value of the '<em>Height</em>' attribute.
* @see #isSetHeight()
* @see #unsetHeight()
* @see #getHeight()
@@ -144,10 +145,10 @@ public interface Dimension extends EObject {
* the width of a dimension cannot be negative
*
* @param diagnostics
- * The chain of diagnostics to which problems are to be appended.
+ * The chain of diagnostics to which problems are to be appended.
* @param context
- * The cache of context-specific information. <!-- end-model-doc
- * -->
+ * The cache of context-specific information. <!-- end-model-doc
+ * -->
* @model
* annotation="http://www.eclipse.org/emf/2002/Ecore/OCL body='width >=0'"
* @generated
@@ -159,10 +160,10 @@ public interface Dimension extends EObject {
* the height of a dimension cannot be negative
*
* @param diagnostics
- * The chain of diagnostics to which problems are to be appended.
+ * The chain of diagnostics to which problems are to be appended.
* @param context
- * The cache of context-specific information. <!-- end-model-doc
- * -->
+ * The cache of context-specific information. <!-- end-model-doc
+ * -->
* @model
* annotation="http://www.eclipse.org/emf/2002/Ecore/OCL body='height >=0'"
* @generated
diff --git a/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dc/KnownColor.java b/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dc/KnownColor.java
index 231d9601dbf..437fb325048 100644
--- a/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dc/KnownColor.java
+++ b/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dc/KnownColor.java
@@ -409,7 +409,7 @@ public enum KnownColor implements Enumerator {
*
* @generated
*/
- private static final KnownColor[] VALUES_ARRAY = new KnownColor[] { MAROON, RED, ORANGE, YELLOW, OLIVE, PURPLE, FUCHSIA, WHITE, LIME, GREEN, NAVY, BLUE, AQUA, TEAL, BLACK, SILVER, GRAY, };
+ private static final KnownColor[] VALUES_ARRAY = new KnownColor[]{ MAROON, RED, ORANGE, YELLOW, OLIVE, PURPLE, FUCHSIA, WHITE, LIME, GREEN, NAVY, BLUE, AQUA, TEAL, BLACK, SILVER, GRAY, };
/**
* A public read-only list of all the '<em><b>Known Color</b></em>' enumerators.
@@ -426,9 +426,9 @@ public enum KnownColor implements Enumerator {
* @generated
*/
public static KnownColor get(String literal) {
- for (int i = 0; i < VALUES_ARRAY.length; ++i) {
+ for(int i = 0; i < VALUES_ARRAY.length; ++i) {
KnownColor result = VALUES_ARRAY[i];
- if (result.toString().equals(literal)) {
+ if(result.toString().equals(literal)) {
return result;
}
}
@@ -442,9 +442,9 @@ public enum KnownColor implements Enumerator {
* @generated
*/
public static KnownColor getByName(String name) {
- for (int i = 0; i < VALUES_ARRAY.length; ++i) {
+ for(int i = 0; i < VALUES_ARRAY.length; ++i) {
KnownColor result = VALUES_ARRAY[i];
- if (result.getName().equals(name)) {
+ if(result.getName().equals(name)) {
return result;
}
}
@@ -458,7 +458,7 @@ public enum KnownColor implements Enumerator {
* @generated
*/
public static KnownColor get(int value) {
- switch (value) {
+ switch(value) {
case MAROON_VALUE:
return MAROON;
case RED_VALUE:
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 c2acb5880c5..fd5d4d2159c 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
@@ -54,7 +54,7 @@ public interface Point extends EObject {
* <!-- begin-user-doc --> <!-- end-user-doc -->
*
* @param value
- * the new value of the '<em>X</em>' attribute.
+ * the new value of the '<em>X</em>' attribute.
* @see #isSetX()
* @see #unsetX()
* @see #getX()
@@ -105,7 +105,7 @@ public interface Point extends EObject {
* <!-- begin-user-doc --> <!-- end-user-doc -->
*
* @param value
- * the new value of the '<em>Y</em>' attribute.
+ * the new value of the '<em>Y</em>' attribute.
* @see #isSetY()
* @see #unsetY()
* @see #getY()
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 cd22f40f25c..538050a919e 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
@@ -12,17 +12,23 @@
package org.eclipse.papyrus.dd.dc.impl;
import java.lang.reflect.InvocationTargetException;
+
import java.util.Map;
import org.eclipse.emf.common.notify.Notification;
+
import org.eclipse.emf.common.util.Diagnostic;
import org.eclipse.emf.common.util.DiagnosticChain;
import org.eclipse.emf.common.util.EList;
+
import org.eclipse.emf.ecore.EClass;
+
import org.eclipse.emf.ecore.impl.ENotificationImpl;
import org.eclipse.emf.ecore.impl.MinimalEObjectImpl;
+
import org.eclipse.papyrus.dd.dc.Bounds;
import org.eclipse.papyrus.dd.dc.DCPackage;
+
import org.eclipse.papyrus.dd.dc.util.DCValidator;
/**
@@ -201,7 +207,7 @@ public class BoundsImpl extends MinimalEObjectImpl.Container implements Bounds {
x = newX;
boolean oldXESet = xESet;
xESet = true;
- if (eNotificationRequired()) {
+ if(eNotificationRequired()) {
eNotify(new ENotificationImpl(this, Notification.SET, DCPackage.BOUNDS__X, oldX, x, !oldXESet));
}
}
@@ -217,7 +223,7 @@ public class BoundsImpl extends MinimalEObjectImpl.Container implements Bounds {
boolean oldXESet = xESet;
x = X_EDEFAULT;
xESet = false;
- if (eNotificationRequired()) {
+ if(eNotificationRequired()) {
eNotify(new ENotificationImpl(this, Notification.UNSET, DCPackage.BOUNDS__X, oldX, X_EDEFAULT, oldXESet));
}
}
@@ -253,7 +259,7 @@ public class BoundsImpl extends MinimalEObjectImpl.Container implements Bounds {
y = newY;
boolean oldYESet = yESet;
yESet = true;
- if (eNotificationRequired()) {
+ if(eNotificationRequired()) {
eNotify(new ENotificationImpl(this, Notification.SET, DCPackage.BOUNDS__Y, oldY, y, !oldYESet));
}
}
@@ -269,7 +275,7 @@ public class BoundsImpl extends MinimalEObjectImpl.Container implements Bounds {
boolean oldYESet = yESet;
y = Y_EDEFAULT;
yESet = false;
- if (eNotificationRequired()) {
+ if(eNotificationRequired()) {
eNotify(new ENotificationImpl(this, Notification.UNSET, DCPackage.BOUNDS__Y, oldY, Y_EDEFAULT, oldYESet));
}
}
@@ -305,7 +311,7 @@ public class BoundsImpl extends MinimalEObjectImpl.Container implements Bounds {
width = newWidth;
boolean oldWidthESet = widthESet;
widthESet = true;
- if (eNotificationRequired()) {
+ if(eNotificationRequired()) {
eNotify(new ENotificationImpl(this, Notification.SET, DCPackage.BOUNDS__WIDTH, oldWidth, width, !oldWidthESet));
}
}
@@ -321,7 +327,7 @@ public class BoundsImpl extends MinimalEObjectImpl.Container implements Bounds {
boolean oldWidthESet = widthESet;
width = WIDTH_EDEFAULT;
widthESet = false;
- if (eNotificationRequired()) {
+ if(eNotificationRequired()) {
eNotify(new ENotificationImpl(this, Notification.UNSET, DCPackage.BOUNDS__WIDTH, oldWidth, WIDTH_EDEFAULT, oldWidthESet));
}
}
@@ -357,7 +363,7 @@ public class BoundsImpl extends MinimalEObjectImpl.Container implements Bounds {
height = newHeight;
boolean oldHeightESet = heightESet;
heightESet = true;
- if (eNotificationRequired()) {
+ if(eNotificationRequired()) {
eNotify(new ENotificationImpl(this, Notification.SET, DCPackage.BOUNDS__HEIGHT, oldHeight, height, !oldHeightESet));
}
}
@@ -373,7 +379,7 @@ public class BoundsImpl extends MinimalEObjectImpl.Container implements Bounds {
boolean oldHeightESet = heightESet;
height = HEIGHT_EDEFAULT;
heightESet = false;
- if (eNotificationRequired()) {
+ if(eNotificationRequired()) {
eNotify(new ENotificationImpl(this, Notification.UNSET, DCPackage.BOUNDS__HEIGHT, oldHeight, HEIGHT_EDEFAULT, oldHeightESet));
}
}
@@ -407,8 +413,7 @@ public class BoundsImpl extends MinimalEObjectImpl.Container implements Bounds {
*/
@Override
public boolean nonNegativeWidth(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_WIDTH__DIAGNOSTICCHAIN_MAP, NON_NEGATIVE_WIDTH_DIAGNOSTIC_CHAIN_MAP__EEXPRESSION,
- Diagnostic.ERROR, DCValidator.DIAGNOSTIC_SOURCE, DCValidator.BOUNDS__NON_NEGATIVE_WIDTH);
+ return DCValidator.validate(DCPackage.Literals.BOUNDS, this, diagnostics, context, "http://www.eclipse.org/emf/2002/Ecore/OCL", DCPackage.Literals.BOUNDS___NON_NEGATIVE_WIDTH__DIAGNOSTICCHAIN_MAP, NON_NEGATIVE_WIDTH_DIAGNOSTIC_CHAIN_MAP__EEXPRESSION, Diagnostic.ERROR, DCValidator.DIAGNOSTIC_SOURCE, DCValidator.BOUNDS__NON_NEGATIVE_WIDTH);
}
/**
@@ -430,8 +435,7 @@ public class BoundsImpl extends MinimalEObjectImpl.Container implements Bounds {
*/
@Override
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);
+ 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);
}
/**
@@ -441,7 +445,7 @@ public class BoundsImpl extends MinimalEObjectImpl.Container implements Bounds {
*/
@Override
public Object eGet(int featureID, boolean resolve, boolean coreType) {
- switch (featureID) {
+ switch(featureID) {
case DCPackage.BOUNDS__X:
return getX();
case DCPackage.BOUNDS__Y:
@@ -461,18 +465,18 @@ public class BoundsImpl extends MinimalEObjectImpl.Container implements Bounds {
*/
@Override
public void eSet(int featureID, Object newValue) {
- switch (featureID) {
+ switch(featureID) {
case DCPackage.BOUNDS__X:
- setX((Double) newValue);
+ setX((Double)newValue);
return;
case DCPackage.BOUNDS__Y:
- setY((Double) newValue);
+ setY((Double)newValue);
return;
case DCPackage.BOUNDS__WIDTH:
- setWidth((Double) newValue);
+ setWidth((Double)newValue);
return;
case DCPackage.BOUNDS__HEIGHT:
- setHeight((Double) newValue);
+ setHeight((Double)newValue);
return;
}
super.eSet(featureID, newValue);
@@ -485,7 +489,7 @@ public class BoundsImpl extends MinimalEObjectImpl.Container implements Bounds {
*/
@Override
public void eUnset(int featureID) {
- switch (featureID) {
+ switch(featureID) {
case DCPackage.BOUNDS__X:
unsetX();
return;
@@ -509,7 +513,7 @@ public class BoundsImpl extends MinimalEObjectImpl.Container implements Bounds {
*/
@Override
public boolean eIsSet(int featureID) {
- switch (featureID) {
+ switch(featureID) {
case DCPackage.BOUNDS__X:
return isSetX();
case DCPackage.BOUNDS__Y:
@@ -530,11 +534,11 @@ public class BoundsImpl extends MinimalEObjectImpl.Container implements Bounds {
@Override
@SuppressWarnings("unchecked")
public Object eInvoke(int operationID, EList<?> arguments) throws InvocationTargetException {
- switch (operationID) {
+ switch(operationID) {
case DCPackage.BOUNDS___NON_NEGATIVE_WIDTH__DIAGNOSTICCHAIN_MAP:
- return nonNegativeWidth((DiagnosticChain) arguments.get(0), (Map<Object, Object>) arguments.get(1));
+ 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 nonNegativeHeight((DiagnosticChain)arguments.get(0), (Map<Object, Object>)arguments.get(1));
}
return super.eInvoke(operationID, arguments);
}
@@ -546,30 +550,30 @@ public class BoundsImpl extends MinimalEObjectImpl.Container implements Bounds {
*/
@Override
public String toString() {
- if (eIsProxy()) {
+ if(eIsProxy()) {
return super.toString();
}
StringBuffer result = new StringBuffer(super.toString());
result.append(" (x: ");
- if (xESet) {
+ if(xESet) {
result.append(x);
} else {
result.append("<unset>");
}
result.append(", y: ");
- if (yESet) {
+ if(yESet) {
result.append(y);
} else {
result.append("<unset>");
}
result.append(", width: ");
- if (widthESet) {
+ if(widthESet) {
result.append(width);
} else {
result.append("<unset>");
}
result.append(", height: ");
- if (heightESet) {
+ if(heightESet) {
result.append(height);
} else {
result.append("<unset>");
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 77abe57c473..c8d80bc1342 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
@@ -17,14 +17,12 @@ import org.eclipse.emf.ecore.EClass;
import org.eclipse.emf.ecore.EDataType;
import org.eclipse.emf.ecore.EObject;
import org.eclipse.emf.ecore.EPackage;
+
import org.eclipse.emf.ecore.impl.EFactoryImpl;
+
import org.eclipse.emf.ecore.plugin.EcorePlugin;
-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.*;
/**
* <!-- begin-user-doc --> An implementation of the model <b>Factory</b>. <!--
@@ -43,8 +41,8 @@ public class DCFactoryImpl extends EFactoryImpl implements DCFactory {
*/
public static DCFactory init() {
try {
- DCFactory theDCFactory = (DCFactory) EPackage.Registry.INSTANCE.getEFactory(DCPackage.eNS_URI);
- if (theDCFactory != null) {
+ DCFactory theDCFactory = (DCFactory)EPackage.Registry.INSTANCE.getEFactory(DCPackage.eNS_URI);
+ if(theDCFactory != null) {
return theDCFactory;
}
} catch (Exception exception) {
@@ -71,7 +69,7 @@ public class DCFactoryImpl extends EFactoryImpl implements DCFactory {
*/
@Override
public EObject create(EClass eClass) {
- switch (eClass.getClassifierID()) {
+ switch(eClass.getClassifierID()) {
case DCPackage.POINT:
return createPoint();
case DCPackage.DIMENSION:
@@ -90,7 +88,7 @@ public class DCFactoryImpl extends EFactoryImpl implements DCFactory {
*/
@Override
public Object createFromString(EDataType eDataType, String initialValue) {
- switch (eDataType.getClassifierID()) {
+ switch(eDataType.getClassifierID()) {
case DCPackage.KNOWN_COLOR:
return createKnownColorFromString(eDataType, initialValue);
case DCPackage.BOOLEAN:
@@ -115,7 +113,7 @@ public class DCFactoryImpl extends EFactoryImpl implements DCFactory {
*/
@Override
public String convertToString(EDataType eDataType, Object instanceValue) {
- switch (eDataType.getClassifierID()) {
+ switch(eDataType.getClassifierID()) {
case DCPackage.KNOWN_COLOR:
return convertKnownColorToString(eDataType, instanceValue);
case DCPackage.BOOLEAN:
@@ -173,7 +171,7 @@ public class DCFactoryImpl extends EFactoryImpl implements DCFactory {
*/
public KnownColor createKnownColorFromString(EDataType eDataType, String initialValue) {
KnownColor result = KnownColor.get(initialValue);
- if (result == null) {
+ if(result == null) {
throw new IllegalArgumentException("The value '" + initialValue + "' is not a valid enumerator of '" + eDataType.getName() + "'");
}
return result;
@@ -194,7 +192,7 @@ public class DCFactoryImpl extends EFactoryImpl implements DCFactory {
* @generated
*/
public Boolean createBooleanFromString(EDataType eDataType, String initialValue) {
- return (Boolean) super.createFromString(eDataType, initialValue);
+ return (Boolean)super.createFromString(eDataType, initialValue);
}
/**
@@ -212,7 +210,7 @@ public class DCFactoryImpl extends EFactoryImpl implements DCFactory {
* @generated
*/
public Integer createIntegerFromString(EDataType eDataType, String initialValue) {
- return (Integer) super.createFromString(eDataType, initialValue);
+ return (Integer)super.createFromString(eDataType, initialValue);
}
/**
@@ -230,7 +228,7 @@ public class DCFactoryImpl extends EFactoryImpl implements DCFactory {
* @generated
*/
public Double createRealFromString(EDataType eDataType, String initialValue) {
- return (Double) super.createFromString(eDataType, initialValue);
+ return (Double)super.createFromString(eDataType, initialValue);
}
/**
@@ -248,7 +246,7 @@ public class DCFactoryImpl extends EFactoryImpl implements DCFactory {
* @generated
*/
public String createStringFromString(EDataType eDataType, String initialValue) {
- return (String) super.createFromString(eDataType, initialValue);
+ return (String)super.createFromString(eDataType, initialValue);
}
/**
@@ -266,7 +264,7 @@ public class DCFactoryImpl extends EFactoryImpl implements DCFactory {
* @generated NOT
*/
public Color createColorFromString(EDataType eDataType, String initialValue) {
- if (initialValue == null || initialValue.isEmpty()) {
+ if(initialValue == null || initialValue.isEmpty()) {
return null;
}
return Color.decode(initialValue);
@@ -278,10 +276,10 @@ public class DCFactoryImpl extends EFactoryImpl implements DCFactory {
* @generated NOT
*/
public String convertColorToString(EDataType eDataType, Object instanceValue) {
- if (instanceValue == null) {
+ if(instanceValue == null) {
return null;
}
- Color c = (Color) instanceValue;
+ Color c = (Color)instanceValue;
return String.format("#%02X%02X%02X", c.getRed(), c.getGreen(), c.getBlue());
}
@@ -292,7 +290,7 @@ public class DCFactoryImpl extends EFactoryImpl implements DCFactory {
*/
@Override
public DCPackage getDCPackage() {
- return (DCPackage) getEPackage();
+ return (DCPackage)getEPackage();
}
/**
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 dbea5cf755e..1b812011004 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;
@@ -105,7 +104,8 @@ public class DCPackageImpl extends EPackageImpl implements DCPackage {
* Creates an instance of the model <b>Package</b>, registered with {@link org.eclipse.emf.ecore.EPackage.Registry EPackage.Registry} by the
* package package URI value.
* <p>
- * Note: the correct way to create the package is via the static factory method {@link #init init()}, which also performs initialization of the package, or returns the registered package, if one already exists. <!-- begin-user-doc --> <!-- end-user-doc -->
+ * Note: the correct way to create the package is via the static factory method {@link #init init()}, which also performs initialization of the
+ * package, or returns the registered package, if one already exists. <!-- begin-user-doc --> <!-- end-user-doc -->
*
* @see org.eclipse.emf.ecore.EPackage.Registry
* @see org.eclipse.papyrus.dd.dc.DCPackage#eNS_URI
@@ -128,7 +128,8 @@ public class DCPackageImpl extends EPackageImpl implements DCPackage {
* and for any others upon which it depends.
*
* <p>
- * This method is used to initialize {@link DCPackage#eINSTANCE} when that field is accessed. Clients should not invoke it directly. Instead, they should simply access that field to obtain the package. <!-- begin-user-doc --> <!-- end-user-doc -->
+ * This method is used to initialize {@link DCPackage#eINSTANCE} when that field is accessed. Clients should not invoke it directly. Instead, they
+ * should simply access that field to obtain the package. <!-- begin-user-doc --> <!-- end-user-doc -->
*
* @see #eNS_URI
* @see #createPackageContents()
@@ -136,11 +137,11 @@ public class DCPackageImpl extends EPackageImpl implements DCPackage {
* @generated
*/
public static DCPackage init() {
- if (isInited) {
- return (DCPackage) EPackage.Registry.INSTANCE.getEPackage(DCPackage.eNS_URI);
+ if(isInited) {
+ return (DCPackage)EPackage.Registry.INSTANCE.getEPackage(DCPackage.eNS_URI);
}
// Obtain or create and register package
- DCPackageImpl theDCPackage = (DCPackageImpl) (EPackage.Registry.INSTANCE.get(eNS_URI) instanceof DCPackageImpl ? EPackage.Registry.INSTANCE.get(eNS_URI) : new DCPackageImpl());
+ DCPackageImpl theDCPackage = (DCPackageImpl)(EPackage.Registry.INSTANCE.get(eNS_URI) instanceof DCPackageImpl ? EPackage.Registry.INSTANCE.get(eNS_URI) : new DCPackageImpl());
isInited = true;
// Create package meta-data objects
theDCPackage.createPackageContents();
@@ -178,7 +179,7 @@ public class DCPackageImpl extends EPackageImpl implements DCPackage {
*/
@Override
public EAttribute getPoint_X() {
- return (EAttribute) pointEClass.getEStructuralFeatures().get(0);
+ return (EAttribute)pointEClass.getEStructuralFeatures().get(0);
}
/**
@@ -188,7 +189,7 @@ public class DCPackageImpl extends EPackageImpl implements DCPackage {
*/
@Override
public EAttribute getPoint_Y() {
- return (EAttribute) pointEClass.getEStructuralFeatures().get(1);
+ return (EAttribute)pointEClass.getEStructuralFeatures().get(1);
}
/**
@@ -208,7 +209,7 @@ public class DCPackageImpl extends EPackageImpl implements DCPackage {
*/
@Override
public EAttribute getDimension_Width() {
- return (EAttribute) dimensionEClass.getEStructuralFeatures().get(0);
+ return (EAttribute)dimensionEClass.getEStructuralFeatures().get(0);
}
/**
@@ -218,7 +219,7 @@ public class DCPackageImpl extends EPackageImpl implements DCPackage {
*/
@Override
public EAttribute getDimension_Height() {
- return (EAttribute) dimensionEClass.getEStructuralFeatures().get(1);
+ return (EAttribute)dimensionEClass.getEStructuralFeatures().get(1);
}
/**
@@ -258,7 +259,7 @@ public class DCPackageImpl extends EPackageImpl implements DCPackage {
*/
@Override
public EAttribute getBounds_X() {
- return (EAttribute) boundsEClass.getEStructuralFeatures().get(0);
+ return (EAttribute)boundsEClass.getEStructuralFeatures().get(0);
}
/**
@@ -268,7 +269,7 @@ public class DCPackageImpl extends EPackageImpl implements DCPackage {
*/
@Override
public EAttribute getBounds_Y() {
- return (EAttribute) boundsEClass.getEStructuralFeatures().get(1);
+ return (EAttribute)boundsEClass.getEStructuralFeatures().get(1);
}
/**
@@ -278,7 +279,7 @@ public class DCPackageImpl extends EPackageImpl implements DCPackage {
*/
@Override
public EAttribute getBounds_Width() {
- return (EAttribute) boundsEClass.getEStructuralFeatures().get(2);
+ return (EAttribute)boundsEClass.getEStructuralFeatures().get(2);
}
/**
@@ -288,7 +289,7 @@ public class DCPackageImpl extends EPackageImpl implements DCPackage {
*/
@Override
public EAttribute getBounds_Height() {
- return (EAttribute) boundsEClass.getEStructuralFeatures().get(3);
+ return (EAttribute)boundsEClass.getEStructuralFeatures().get(3);
}
/**
@@ -378,7 +379,7 @@ public class DCPackageImpl extends EPackageImpl implements DCPackage {
*/
@Override
public DCFactory getDCFactory() {
- return (DCFactory) getEFactoryInstance();
+ return (DCFactory)getEFactoryInstance();
}
/**
@@ -397,7 +398,7 @@ public class DCPackageImpl extends EPackageImpl implements DCPackage {
* @generated
*/
public void createPackageContents() {
- if (isCreated) {
+ if(isCreated) {
return;
}
isCreated = true;
@@ -442,7 +443,7 @@ public class DCPackageImpl extends EPackageImpl implements DCPackage {
* @generated
*/
public void initializePackageContents() {
- if (isInitialized) {
+ if(isInitialized) {
return;
}
isInitialized = true;
@@ -540,7 +541,7 @@ public class DCPackageImpl extends EPackageImpl implements DCPackage {
*/
protected void createEcoreAnnotations() {
String source = "http://www.eclipse.org/emf/2002/Ecore";
- addAnnotation(this, source, new String[] { "validationDelegates", "http://www.eclipse.org/emf/2002/Ecore/OCL" });
+ addAnnotation(this, source, new String[]{ "validationDelegates", "http://www.eclipse.org/emf/2002/Ecore/OCL" });
}
/**
@@ -552,9 +553,9 @@ public class DCPackageImpl extends EPackageImpl implements DCPackage {
*/
protected void createOCLAnnotations() {
String source = "http://www.eclipse.org/emf/2002/Ecore/OCL";
- addAnnotation(getDimension__NonNegativeWidth__DiagnosticChain_Map(), source, new String[] { "body", "width >=0" });
- addAnnotation(getDimension__NonNegativeHeight__DiagnosticChain_Map(), source, new String[] { "body", "height >=0" });
- addAnnotation(getBounds__NonNegativeWidth__DiagnosticChain_Map(), source, new String[] { "body", "width >= 0" });
- addAnnotation(getBounds__NonNegativeHeight__DiagnosticChain_Map(), source, new String[] { "body", "height >=0" });
+ addAnnotation(getDimension__NonNegativeWidth__DiagnosticChain_Map(), source, new String[]{ "body", "width >=0" });
+ addAnnotation(getDimension__NonNegativeHeight__DiagnosticChain_Map(), source, new String[]{ "body", "height >=0" });
+ addAnnotation(getBounds__NonNegativeWidth__DiagnosticChain_Map(), source, new String[]{ "body", "width >= 0" });
+ addAnnotation(getBounds__NonNegativeHeight__DiagnosticChain_Map(), source, new String[]{ "body", "height >=0" });
}
} // DCPackageImpl
diff --git a/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dc/impl/DimensionImpl.java b/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dc/impl/DimensionImpl.java
index 4b9e04fb8ee..f3c60597899 100644
--- a/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dc/impl/DimensionImpl.java
+++ b/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dc/impl/DimensionImpl.java
@@ -12,17 +12,23 @@
package org.eclipse.papyrus.dd.dc.impl;
import java.lang.reflect.InvocationTargetException;
+
import java.util.Map;
import org.eclipse.emf.common.notify.Notification;
+
import org.eclipse.emf.common.util.Diagnostic;
import org.eclipse.emf.common.util.DiagnosticChain;
import org.eclipse.emf.common.util.EList;
+
import org.eclipse.emf.ecore.EClass;
+
import org.eclipse.emf.ecore.impl.ENotificationImpl;
import org.eclipse.emf.ecore.impl.MinimalEObjectImpl;
+
import org.eclipse.papyrus.dd.dc.DCPackage;
import org.eclipse.papyrus.dd.dc.Dimension;
+
import org.eclipse.papyrus.dd.dc.util.DCValidator;
/**
@@ -139,7 +145,7 @@ public class DimensionImpl extends MinimalEObjectImpl.Container implements Dimen
width = newWidth;
boolean oldWidthESet = widthESet;
widthESet = true;
- if (eNotificationRequired()) {
+ if(eNotificationRequired()) {
eNotify(new ENotificationImpl(this, Notification.SET, DCPackage.DIMENSION__WIDTH, oldWidth, width, !oldWidthESet));
}
}
@@ -155,7 +161,7 @@ public class DimensionImpl extends MinimalEObjectImpl.Container implements Dimen
boolean oldWidthESet = widthESet;
width = WIDTH_EDEFAULT;
widthESet = false;
- if (eNotificationRequired()) {
+ if(eNotificationRequired()) {
eNotify(new ENotificationImpl(this, Notification.UNSET, DCPackage.DIMENSION__WIDTH, oldWidth, WIDTH_EDEFAULT, oldWidthESet));
}
}
@@ -191,7 +197,7 @@ public class DimensionImpl extends MinimalEObjectImpl.Container implements Dimen
height = newHeight;
boolean oldHeightESet = heightESet;
heightESet = true;
- if (eNotificationRequired()) {
+ if(eNotificationRequired()) {
eNotify(new ENotificationImpl(this, Notification.SET, DCPackage.DIMENSION__HEIGHT, oldHeight, height, !oldHeightESet));
}
}
@@ -207,7 +213,7 @@ public class DimensionImpl extends MinimalEObjectImpl.Container implements Dimen
boolean oldHeightESet = heightESet;
height = HEIGHT_EDEFAULT;
heightESet = false;
- if (eNotificationRequired()) {
+ if(eNotificationRequired()) {
eNotify(new ENotificationImpl(this, Notification.UNSET, DCPackage.DIMENSION__HEIGHT, oldHeight, HEIGHT_EDEFAULT, oldHeightESet));
}
}
@@ -241,8 +247,7 @@ public class DimensionImpl extends MinimalEObjectImpl.Container implements Dimen
*/
@Override
public boolean nonNegativeWidth(DiagnosticChain diagnostics, Map<Object, Object> context) {
- return DCValidator.validate(DCPackage.Literals.DIMENSION, this, diagnostics, context, "http://www.eclipse.org/emf/2002/Ecore/OCL", DCPackage.Literals.DIMENSION___NON_NEGATIVE_WIDTH__DIAGNOSTICCHAIN_MAP,
- NON_NEGATIVE_WIDTH_DIAGNOSTIC_CHAIN_MAP__EEXPRESSION, Diagnostic.ERROR, DCValidator.DIAGNOSTIC_SOURCE, DCValidator.DIMENSION__NON_NEGATIVE_WIDTH);
+ return DCValidator.validate(DCPackage.Literals.DIMENSION, this, diagnostics, context, "http://www.eclipse.org/emf/2002/Ecore/OCL", DCPackage.Literals.DIMENSION___NON_NEGATIVE_WIDTH__DIAGNOSTICCHAIN_MAP, NON_NEGATIVE_WIDTH_DIAGNOSTIC_CHAIN_MAP__EEXPRESSION, Diagnostic.ERROR, DCValidator.DIAGNOSTIC_SOURCE, DCValidator.DIMENSION__NON_NEGATIVE_WIDTH);
}
/**
@@ -264,8 +269,7 @@ public class DimensionImpl extends MinimalEObjectImpl.Container implements Dimen
*/
@Override
public boolean nonNegativeHeight(DiagnosticChain diagnostics, Map<Object, Object> context) {
- return DCValidator.validate(DCPackage.Literals.DIMENSION, this, diagnostics, context, "http://www.eclipse.org/emf/2002/Ecore/OCL", DCPackage.Literals.DIMENSION___NON_NEGATIVE_HEIGHT__DIAGNOSTICCHAIN_MAP,
- NON_NEGATIVE_HEIGHT_DIAGNOSTIC_CHAIN_MAP__EEXPRESSION, Diagnostic.ERROR, DCValidator.DIAGNOSTIC_SOURCE, DCValidator.DIMENSION__NON_NEGATIVE_HEIGHT);
+ return DCValidator.validate(DCPackage.Literals.DIMENSION, this, diagnostics, context, "http://www.eclipse.org/emf/2002/Ecore/OCL", DCPackage.Literals.DIMENSION___NON_NEGATIVE_HEIGHT__DIAGNOSTICCHAIN_MAP, NON_NEGATIVE_HEIGHT_DIAGNOSTIC_CHAIN_MAP__EEXPRESSION, Diagnostic.ERROR, DCValidator.DIAGNOSTIC_SOURCE, DCValidator.DIMENSION__NON_NEGATIVE_HEIGHT);
}
/**
@@ -275,7 +279,7 @@ public class DimensionImpl extends MinimalEObjectImpl.Container implements Dimen
*/
@Override
public Object eGet(int featureID, boolean resolve, boolean coreType) {
- switch (featureID) {
+ switch(featureID) {
case DCPackage.DIMENSION__WIDTH:
return getWidth();
case DCPackage.DIMENSION__HEIGHT:
@@ -291,12 +295,12 @@ public class DimensionImpl extends MinimalEObjectImpl.Container implements Dimen
*/
@Override
public void eSet(int featureID, Object newValue) {
- switch (featureID) {
+ switch(featureID) {
case DCPackage.DIMENSION__WIDTH:
- setWidth((Double) newValue);
+ setWidth((Double)newValue);
return;
case DCPackage.DIMENSION__HEIGHT:
- setHeight((Double) newValue);
+ setHeight((Double)newValue);
return;
}
super.eSet(featureID, newValue);
@@ -309,7 +313,7 @@ public class DimensionImpl extends MinimalEObjectImpl.Container implements Dimen
*/
@Override
public void eUnset(int featureID) {
- switch (featureID) {
+ switch(featureID) {
case DCPackage.DIMENSION__WIDTH:
unsetWidth();
return;
@@ -327,7 +331,7 @@ public class DimensionImpl extends MinimalEObjectImpl.Container implements Dimen
*/
@Override
public boolean eIsSet(int featureID) {
- switch (featureID) {
+ switch(featureID) {
case DCPackage.DIMENSION__WIDTH:
return isSetWidth();
case DCPackage.DIMENSION__HEIGHT:
@@ -344,11 +348,11 @@ public class DimensionImpl extends MinimalEObjectImpl.Container implements Dimen
@Override
@SuppressWarnings("unchecked")
public Object eInvoke(int operationID, EList<?> arguments) throws InvocationTargetException {
- switch (operationID) {
+ switch(operationID) {
case DCPackage.DIMENSION___NON_NEGATIVE_WIDTH__DIAGNOSTICCHAIN_MAP:
- return nonNegativeWidth((DiagnosticChain) arguments.get(0), (Map<Object, Object>) arguments.get(1));
+ return nonNegativeWidth((DiagnosticChain)arguments.get(0), (Map<Object, Object>)arguments.get(1));
case DCPackage.DIMENSION___NON_NEGATIVE_HEIGHT__DIAGNOSTICCHAIN_MAP:
- return nonNegativeHeight((DiagnosticChain) arguments.get(0), (Map<Object, Object>) arguments.get(1));
+ return nonNegativeHeight((DiagnosticChain)arguments.get(0), (Map<Object, Object>)arguments.get(1));
}
return super.eInvoke(operationID, arguments);
}
@@ -360,18 +364,18 @@ public class DimensionImpl extends MinimalEObjectImpl.Container implements Dimen
*/
@Override
public String toString() {
- if (eIsProxy()) {
+ if(eIsProxy()) {
return super.toString();
}
StringBuffer result = new StringBuffer(super.toString());
result.append(" (width: ");
- if (widthESet) {
+ if(widthESet) {
result.append(width);
} else {
result.append("<unset>");
}
result.append(", height: ");
- if (heightESet) {
+ if(heightESet) {
result.append(height);
} else {
result.append("<unset>");
diff --git a/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dc/impl/PointImpl.java b/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dc/impl/PointImpl.java
index 4648c39612c..bb1384a47e9 100644
--- a/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dc/impl/PointImpl.java
+++ b/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dc/impl/PointImpl.java
@@ -12,9 +12,12 @@
package org.eclipse.papyrus.dd.dc.impl;
import org.eclipse.emf.common.notify.Notification;
+
import org.eclipse.emf.ecore.EClass;
+
import org.eclipse.emf.ecore.impl.ENotificationImpl;
import org.eclipse.emf.ecore.impl.MinimalEObjectImpl;
+
import org.eclipse.papyrus.dd.dc.DCPackage;
import org.eclipse.papyrus.dd.dc.Point;
@@ -132,7 +135,7 @@ public class PointImpl extends MinimalEObjectImpl.Container implements Point {
x = newX;
boolean oldXESet = xESet;
xESet = true;
- if (eNotificationRequired()) {
+ if(eNotificationRequired()) {
eNotify(new ENotificationImpl(this, Notification.SET, DCPackage.POINT__X, oldX, x, !oldXESet));
}
}
@@ -148,7 +151,7 @@ public class PointImpl extends MinimalEObjectImpl.Container implements Point {
boolean oldXESet = xESet;
x = X_EDEFAULT;
xESet = false;
- if (eNotificationRequired()) {
+ if(eNotificationRequired()) {
eNotify(new ENotificationImpl(this, Notification.UNSET, DCPackage.POINT__X, oldX, X_EDEFAULT, oldXESet));
}
}
@@ -184,7 +187,7 @@ public class PointImpl extends MinimalEObjectImpl.Container implements Point {
y = newY;
boolean oldYESet = yESet;
yESet = true;
- if (eNotificationRequired()) {
+ if(eNotificationRequired()) {
eNotify(new ENotificationImpl(this, Notification.SET, DCPackage.POINT__Y, oldY, y, !oldYESet));
}
}
@@ -200,7 +203,7 @@ public class PointImpl extends MinimalEObjectImpl.Container implements Point {
boolean oldYESet = yESet;
y = Y_EDEFAULT;
yESet = false;
- if (eNotificationRequired()) {
+ if(eNotificationRequired()) {
eNotify(new ENotificationImpl(this, Notification.UNSET, DCPackage.POINT__Y, oldY, Y_EDEFAULT, oldYESet));
}
}
@@ -222,7 +225,7 @@ public class PointImpl extends MinimalEObjectImpl.Container implements Point {
*/
@Override
public Object eGet(int featureID, boolean resolve, boolean coreType) {
- switch (featureID) {
+ switch(featureID) {
case DCPackage.POINT__X:
return getX();
case DCPackage.POINT__Y:
@@ -238,12 +241,12 @@ public class PointImpl extends MinimalEObjectImpl.Container implements Point {
*/
@Override
public void eSet(int featureID, Object newValue) {
- switch (featureID) {
+ switch(featureID) {
case DCPackage.POINT__X:
- setX((Double) newValue);
+ setX((Double)newValue);
return;
case DCPackage.POINT__Y:
- setY((Double) newValue);
+ setY((Double)newValue);
return;
}
super.eSet(featureID, newValue);
@@ -256,7 +259,7 @@ public class PointImpl extends MinimalEObjectImpl.Container implements Point {
*/
@Override
public void eUnset(int featureID) {
- switch (featureID) {
+ switch(featureID) {
case DCPackage.POINT__X:
unsetX();
return;
@@ -274,7 +277,7 @@ public class PointImpl extends MinimalEObjectImpl.Container implements Point {
*/
@Override
public boolean eIsSet(int featureID) {
- switch (featureID) {
+ switch(featureID) {
case DCPackage.POINT__X:
return isSetX();
case DCPackage.POINT__Y:
@@ -290,18 +293,18 @@ public class PointImpl extends MinimalEObjectImpl.Container implements Point {
*/
@Override
public String toString() {
- if (eIsProxy()) {
+ if(eIsProxy()) {
return super.toString();
}
StringBuffer result = new StringBuffer(super.toString());
result.append(" (x: ");
- if (xESet) {
+ if(xESet) {
result.append(x);
} else {
result.append("<unset>");
}
result.append(", y: ");
- if (yESet) {
+ if(yESet) {
result.append(y);
} else {
result.append("<unset>");
diff --git a/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dc/util/DCAdapterFactory.java b/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dc/util/DCAdapterFactory.java
index 1c3817509ec..148e3c2d45e 100644
--- a/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dc/util/DCAdapterFactory.java
+++ b/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dc/util/DCAdapterFactory.java
@@ -13,12 +13,12 @@ package org.eclipse.papyrus.dd.dc.util;
import org.eclipse.emf.common.notify.Adapter;
import org.eclipse.emf.common.notify.Notifier;
+
import org.eclipse.emf.common.notify.impl.AdapterFactoryImpl;
+
import org.eclipse.emf.ecore.EObject;
-import org.eclipse.papyrus.dd.dc.Bounds;
-import org.eclipse.papyrus.dd.dc.DCPackage;
-import org.eclipse.papyrus.dd.dc.Dimension;
-import org.eclipse.papyrus.dd.dc.Point;
+
+import org.eclipse.papyrus.dd.dc.*;
/**
* <!-- begin-user-doc --> The <b>Adapter Factory</b> for the model. It provides
@@ -46,7 +46,7 @@ public class DCAdapterFactory extends AdapterFactoryImpl {
* @generated
*/
public DCAdapterFactory() {
- if (modelPackage == null) {
+ if(modelPackage == null) {
modelPackage = DCPackage.eINSTANCE;
}
}
@@ -62,11 +62,11 @@ public class DCAdapterFactory extends AdapterFactoryImpl {
*/
@Override
public boolean isFactoryForType(Object object) {
- if (object == modelPackage) {
+ if(object == modelPackage) {
return true;
}
- if (object instanceof EObject) {
- return ((EObject) object).eClass().getEPackage() == modelPackage;
+ if(object instanceof EObject) {
+ return ((EObject)object).eClass().getEPackage() == modelPackage;
}
return false;
}
@@ -106,13 +106,13 @@ public class DCAdapterFactory extends AdapterFactoryImpl {
* <!-- end-user-doc -->
*
* @param target
- * the object to adapt.
+ * the object to adapt.
* @return the adapter for the <code>target</code>.
* @generated
*/
@Override
public Adapter createAdapter(Notifier target) {
- return modelSwitch.doSwitch((EObject) target);
+ return modelSwitch.doSwitch((EObject)target);
}
/**
diff --git a/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dc/util/DCSwitch.java b/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dc/util/DCSwitch.java
index da652b88121..4e8ca219f65 100644
--- a/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dc/util/DCSwitch.java
+++ b/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dc/util/DCSwitch.java
@@ -13,11 +13,10 @@ package org.eclipse.papyrus.dd.dc.util;
import org.eclipse.emf.ecore.EObject;
import org.eclipse.emf.ecore.EPackage;
+
import org.eclipse.emf.ecore.util.Switch;
-import org.eclipse.papyrus.dd.dc.Bounds;
-import org.eclipse.papyrus.dd.dc.DCPackage;
-import org.eclipse.papyrus.dd.dc.Dimension;
-import org.eclipse.papyrus.dd.dc.Point;
+
+import org.eclipse.papyrus.dd.dc.*;
/**
* <!-- begin-user-doc --> The <b>Switch</b> for the model's inheritance
@@ -47,7 +46,7 @@ public class DCSwitch<T> extends Switch<T> {
* @generated
*/
public DCSwitch() {
- if (modelPackage == null) {
+ if(modelPackage == null) {
modelPackage = DCPackage.eINSTANCE;
}
}
@@ -75,27 +74,30 @@ public class DCSwitch<T> extends Switch<T> {
*/
@Override
protected T doSwitch(int classifierID, EObject theEObject) {
- switch (classifierID) {
- case DCPackage.POINT: {
- Point point = (Point) theEObject;
+ switch(classifierID) {
+ case DCPackage.POINT:
+ {
+ Point point = (Point)theEObject;
T result = casePoint(point);
- if (result == null) {
+ if(result == null) {
result = defaultCase(theEObject);
}
return result;
}
- case DCPackage.DIMENSION: {
- Dimension dimension = (Dimension) theEObject;
+ case DCPackage.DIMENSION:
+ {
+ Dimension dimension = (Dimension)theEObject;
T result = caseDimension(dimension);
- if (result == null) {
+ if(result == null) {
result = defaultCase(theEObject);
}
return result;
}
- case DCPackage.BOUNDS: {
- Bounds bounds = (Bounds) theEObject;
+ case DCPackage.BOUNDS:
+ {
+ Bounds bounds = (Bounds)theEObject;
T result = caseBounds(bounds);
- if (result == null) {
+ if(result == null) {
result = defaultCase(theEObject);
}
return result;
@@ -112,7 +114,7 @@ public class DCSwitch<T> extends Switch<T> {
* end-user-doc -->
*
* @param object
- * the target of the switch.
+ * the target of the switch.
* @return the result of interpreting the object as an instance of '<em>Point</em>'.
* @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
* @generated
@@ -128,7 +130,7 @@ public class DCSwitch<T> extends Switch<T> {
* end-user-doc -->
*
* @param object
- * the target of the switch.
+ * the target of the switch.
* @return the result of interpreting the object as an instance of '<em>Dimension</em>'.
* @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
* @generated
@@ -144,7 +146,7 @@ public class DCSwitch<T> extends Switch<T> {
* end-user-doc -->
*
* @param object
- * the target of the switch.
+ * the target of the switch.
* @return the result of interpreting the object as an instance of '<em>Bounds</em>'.
* @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
* @generated
@@ -160,7 +162,7 @@ public class DCSwitch<T> extends Switch<T> {
* the last case anyway. <!-- end-user-doc -->
*
* @param object
- * the target of the switch.
+ * the target of the switch.
* @return the result of interpreting the object as an instance of '<em>EObject</em>'.
* @see #doSwitch(org.eclipse.emf.ecore.EObject)
* @generated
diff --git a/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dc/util/DCValidator.java b/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dc/util/DCValidator.java
index d97f3f07f50..44fae16b215 100644
--- a/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dc/util/DCValidator.java
+++ b/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dc/util/DCValidator.java
@@ -12,20 +12,20 @@
package org.eclipse.papyrus.dd.dc.util;
import java.awt.Color;
+
import java.util.Map;
import org.eclipse.emf.common.util.DiagnosticChain;
import org.eclipse.emf.common.util.ResourceLocator;
+
import org.eclipse.emf.ecore.EClass;
import org.eclipse.emf.ecore.EObject;
import org.eclipse.emf.ecore.EOperation;
import org.eclipse.emf.ecore.EPackage;
+
import org.eclipse.emf.ecore.util.EObjectValidator;
-import org.eclipse.papyrus.dd.dc.Bounds;
-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.*;
/**
* <!-- begin-user-doc --> The <b>Validator</b> for the model. <!-- end-user-doc
@@ -45,7 +45,8 @@ public class DCValidator extends EObjectValidator {
public static final DCValidator INSTANCE = new DCValidator();
/**
- * A constant for the {@link org.eclipse.emf.common.util.Diagnostic#getSource() source} of diagnostic {@link org.eclipse.emf.common.util.Diagnostic#getCode() codes} from this package.
+ * A constant for the {@link org.eclipse.emf.common.util.Diagnostic#getSource() source} of diagnostic
+ * {@link org.eclipse.emf.common.util.Diagnostic#getCode() codes} from this package.
* <!-- begin-user-doc --> <!-- end-user-doc -->
*
* @see org.eclipse.emf.common.util.Diagnostic#getSource()
@@ -149,25 +150,25 @@ public class DCValidator extends EObjectValidator {
*/
@Override
protected boolean validate(int classifierID, Object value, DiagnosticChain diagnostics, Map<Object, Object> context) {
- switch (classifierID) {
+ switch(classifierID) {
case DCPackage.POINT:
- return validatePoint((Point) value, diagnostics, context);
+ return validatePoint((Point)value, diagnostics, context);
case DCPackage.DIMENSION:
- return validateDimension((Dimension) value, diagnostics, context);
+ return validateDimension((Dimension)value, diagnostics, context);
case DCPackage.BOUNDS:
- return validateBounds((Bounds) value, diagnostics, context);
+ return validateBounds((Bounds)value, diagnostics, context);
case DCPackage.KNOWN_COLOR:
- return validateKnownColor((KnownColor) value, diagnostics, context);
+ return validateKnownColor((KnownColor)value, diagnostics, context);
case DCPackage.BOOLEAN:
- return validateBoolean((Boolean) value, diagnostics, context);
+ return validateBoolean((Boolean)value, diagnostics, context);
case DCPackage.INTEGER:
- return validateInteger((Integer) value, diagnostics, context);
+ return validateInteger((Integer)value, diagnostics, context);
case DCPackage.REAL:
- return validateReal((Double) value, diagnostics, context);
+ return validateReal((Double)value, diagnostics, context);
case DCPackage.STRING:
- return validateString((String) value, diagnostics, context);
+ return validateString((String)value, diagnostics, context);
case DCPackage.COLOR:
- return validateColor((Color) value, diagnostics, context);
+ return validateColor((Color)value, diagnostics, context);
default:
return true;
}
@@ -188,35 +189,35 @@ public class DCValidator extends EObjectValidator {
* @generated
*/
public boolean validateDimension(Dimension dimension, DiagnosticChain diagnostics, Map<Object, Object> context) {
- if (!validate_NoCircularContainment(dimension, diagnostics, context)) {
+ if(!validate_NoCircularContainment(dimension, diagnostics, context)) {
return false;
}
boolean result = validate_EveryMultiplicityConforms(dimension, diagnostics, context);
- if (result || diagnostics != null) {
+ if(result || diagnostics != null) {
result &= validate_EveryDataValueConforms(dimension, diagnostics, context);
}
- if (result || diagnostics != null) {
+ if(result || diagnostics != null) {
result &= validate_EveryReferenceIsContained(dimension, diagnostics, context);
}
- if (result || diagnostics != null) {
+ if(result || diagnostics != null) {
result &= validate_EveryBidirectionalReferenceIsPaired(dimension, diagnostics, context);
}
- if (result || diagnostics != null) {
+ if(result || diagnostics != null) {
result &= validate_EveryProxyResolves(dimension, diagnostics, context);
}
- if (result || diagnostics != null) {
+ if(result || diagnostics != null) {
result &= validate_UniqueID(dimension, diagnostics, context);
}
- if (result || diagnostics != null) {
+ if(result || diagnostics != null) {
result &= validate_EveryKeyUnique(dimension, diagnostics, context);
}
- if (result || diagnostics != null) {
+ if(result || diagnostics != null) {
result &= validate_EveryMapEntryUnique(dimension, diagnostics, context);
}
- if (result || diagnostics != null) {
+ if(result || diagnostics != null) {
result &= validateDimension_nonNegativeWidth(dimension, diagnostics, context);
}
- if (result || diagnostics != null) {
+ if(result || diagnostics != null) {
result &= validateDimension_nonNegativeHeight(dimension, diagnostics, context);
}
return result;
@@ -248,35 +249,35 @@ public class DCValidator extends EObjectValidator {
* @generated
*/
public boolean validateBounds(Bounds bounds, DiagnosticChain diagnostics, Map<Object, Object> context) {
- if (!validate_NoCircularContainment(bounds, diagnostics, context)) {
+ if(!validate_NoCircularContainment(bounds, diagnostics, context)) {
return false;
}
boolean result = validate_EveryMultiplicityConforms(bounds, diagnostics, context);
- if (result || diagnostics != null) {
+ if(result || diagnostics != null) {
result &= validate_EveryDataValueConforms(bounds, diagnostics, context);
}
- if (result || diagnostics != null) {
+ if(result || diagnostics != null) {
result &= validate_EveryReferenceIsContained(bounds, diagnostics, context);
}
- if (result || diagnostics != null) {
+ if(result || diagnostics != null) {
result &= validate_EveryBidirectionalReferenceIsPaired(bounds, diagnostics, context);
}
- if (result || diagnostics != null) {
+ if(result || diagnostics != null) {
result &= validate_EveryProxyResolves(bounds, diagnostics, context);
}
- if (result || diagnostics != null) {
+ if(result || diagnostics != null) {
result &= validate_UniqueID(bounds, diagnostics, context);
}
- if (result || diagnostics != null) {
+ if(result || diagnostics != null) {
result &= validate_EveryKeyUnique(bounds, diagnostics, context);
}
- if (result || diagnostics != null) {
+ if(result || diagnostics != null) {
result &= validate_EveryMapEntryUnique(bounds, diagnostics, context);
}
- if (result || diagnostics != null) {
+ if(result || diagnostics != null) {
result &= validateBounds_nonNegativeWidth(bounds, diagnostics, context);
}
- if (result || diagnostics != null) {
+ if(result || diagnostics != null) {
result &= validateBounds_nonNegativeHeight(bounds, diagnostics, context);
}
return result;
diff --git a/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/Canvas.java b/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/Canvas.java
index 10c5033f586..63bc010d5f1 100644
--- a/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/Canvas.java
+++ b/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/Canvas.java
@@ -12,7 +12,6 @@
package org.eclipse.papyrus.dd.dg;
import java.util.Map;
-
import org.eclipse.emf.common.util.DiagnosticChain;
import org.eclipse.papyrus.dd.dc.Bounds;
@@ -56,7 +55,7 @@ public interface Canvas extends Group {
* end-user-doc -->
*
* @param value
- * the new value of the '<em>Bounds</em>' containment reference.
+ * the new value of the '<em>Bounds</em>' containment reference.
* @see #getBounds()
* @generated
*/
@@ -66,10 +65,10 @@ public interface Canvas extends Group {
* <!-- begin-user-doc --> <!-- end-user-doc --> <!-- begin-model-doc -->
*
* @param diagnostics
- * The chain of diagnostics to which problems are to be appended.
+ * The chain of diagnostics to which problems are to be appended.
* @param context
- * The cache of context-specific information. <!-- end-model-doc
- * -->
+ * The cache of context-specific information. <!-- end-model-doc
+ * -->
* @model annotation=
* "http://www.eclipse.org/emf/2002/Ecore/OCL body='transform->isEmpty()'"
* @generated
diff --git a/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/Circle.java b/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/Circle.java
index e79e733c58d..ccd4b9f76af 100644
--- a/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/Circle.java
+++ b/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/Circle.java
@@ -14,6 +14,7 @@ package org.eclipse.papyrus.dd.dg;
import java.util.Map;
import org.eclipse.emf.common.util.DiagnosticChain;
+
import org.eclipse.papyrus.dd.dc.Point;
/**
@@ -57,7 +58,7 @@ public interface Circle extends GraphicalElement {
* end-user-doc -->
*
* @param value
- * the new value of the '<em>Center</em>' containment reference.
+ * the new value of the '<em>Center</em>' containment reference.
* @see #getCenter()
* @generated
*/
@@ -85,7 +86,7 @@ public interface Circle extends GraphicalElement {
* -->
*
* @param value
- * the new value of the '<em>Radius</em>' attribute.
+ * the new value of the '<em>Radius</em>' attribute.
* @see #getRadius()
* @generated
*/
@@ -96,10 +97,10 @@ public interface Circle extends GraphicalElement {
* The radius of a circle cannot be negative
*
* @param diagnostics
- * The chain of diagnostics to which problems are to be appended.
+ * The chain of diagnostics to which problems are to be appended.
* @param context
- * The cache of context-specific information. <!-- end-model-doc
- * -->
+ * The cache of context-specific information. <!-- end-model-doc
+ * -->
* @model annotation=
* "http://www.eclipse.org/emf/2002/Ecore/OCL body='radius >= 0'"
* @generated
diff --git a/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/CubicCurveTo.java b/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/CubicCurveTo.java
index 66ff20bdf82..4d1d7410246 100644
--- a/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/CubicCurveTo.java
+++ b/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/CubicCurveTo.java
@@ -58,7 +58,7 @@ public interface CubicCurveTo extends PathCommand {
* <!-- begin-user-doc --> <!-- end-user-doc -->
*
* @param value
- * the new value of the '<em>Point</em>' containment reference.
+ * the new value of the '<em>Point</em>' containment reference.
* @see #getPoint()
* @generated
*/
@@ -84,7 +84,7 @@ public interface CubicCurveTo extends PathCommand {
* <!-- end-user-doc -->
*
* @param value
- * the new value of the '<em>Start Control</em>' containment reference.
+ * the new value of the '<em>Start Control</em>' containment reference.
* @see #getStartControl()
* @generated
*/
@@ -110,7 +110,7 @@ public interface CubicCurveTo extends PathCommand {
* <!-- end-user-doc -->
*
* @param value
- * the new value of the '<em>End Control</em>' containment reference.
+ * the new value of the '<em>End Control</em>' containment reference.
* @see #getEndControl()
* @generated
*/
diff --git a/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/DGPackage.java b/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/DGPackage.java
index 0e1b1a8af74..e41e69e6afe 100644
--- a/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/DGPackage.java
+++ b/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/DGPackage.java
@@ -1284,13 +1284,14 @@ public interface DGPackage extends EPackage {
int DEFINITIONS = 14;
/**
- * The feature id for the '<em><b>Defnition</b></em>' containment reference list.
- * <!-- begin-user-doc --> <!-- end-user-doc -->
+ * The feature id for the '<em><b>Definition</b></em>' containment reference list.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
*
* @generated
* @ordered
*/
- int DEFINITIONS__DEFNITION = 0;
+ int DEFINITIONS__DEFINITION = 0;
/**
* The feature id for the '<em><b>Style Sheet</b></em>' containment reference.
@@ -3994,13 +3995,14 @@ public interface DGPackage extends EPackage {
int TEXT__DATA = GRAPHICAL_ELEMENT_FEATURE_COUNT + 0;
/**
- * The feature id for the '<em><b>Position</b></em>' containment reference.
- * <!-- begin-user-doc --> <!-- end-user-doc -->
+ * The feature id for the '<em><b>Bounds</b></em>' containment reference.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
*
* @generated
* @ordered
*/
- int TEXT__POSITION = GRAPHICAL_ELEMENT_FEATURE_COUNT + 1;
+ int TEXT__BOUNDS = GRAPHICAL_ELEMENT_FEATURE_COUNT + 1;
/**
* The feature id for the '<em><b>Anchor</b></em>' attribute.
@@ -4295,7 +4297,8 @@ public interface DGPackage extends EPackage {
EReference getCanvas_Bounds();
/**
- * Returns the meta object for the ' {@link org.eclipse.papyrus.dd.dg.Canvas#canvasCannotHaveTransforms(org.eclipse.emf.common.util.DiagnosticChain, java.util.Map)
+ * Returns the meta object for the '
+ * {@link org.eclipse.papyrus.dd.dg.Canvas#canvasCannotHaveTransforms(org.eclipse.emf.common.util.DiagnosticChain, java.util.Map)
* <em>Canvas Cannot Have Transforms</em>}' operation.
* <!-- begin-user-doc
* --> <!-- end-user-doc -->
@@ -4395,7 +4398,8 @@ public interface DGPackage extends EPackage {
EReference getGraphicalElement_Style();
/**
- * Returns the meta object for the containment reference list '{@link org.eclipse.papyrus.dd.dg.GraphicalElement#getTransforms <em>Transform</em>} '.
+ * Returns the meta object for the containment reference list '{@link org.eclipse.papyrus.dd.dg.GraphicalElement#getTransforms <em>Transform</em>}
+ * '.
* <!-- begin-user-doc --> <!-- end-user-doc -->
*
* @return the meta object for the containment reference list '<em>Transform</em>'.
@@ -4418,7 +4422,8 @@ public interface DGPackage extends EPackage {
EAttribute getGraphicalElement_LayoutData();
/**
- * Returns the meta object for the ' {@link org.eclipse.papyrus.dd.dg.GraphicalElement#referencedClippathHasId(org.eclipse.emf.common.util.DiagnosticChain, java.util.Map)
+ * Returns the meta object for the '
+ * {@link org.eclipse.papyrus.dd.dg.GraphicalElement#referencedClippathHasId(org.eclipse.emf.common.util.DiagnosticChain, java.util.Map)
* <em>Referenced Clippath Has Id</em>}' operation.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
@@ -4451,7 +4456,8 @@ public interface DGPackage extends EPackage {
EAttribute getDefinition_Id();
/**
- * Returns the meta object for the ' {@link org.eclipse.papyrus.dd.dg.Definition#idCannotBeEmpty(org.eclipse.emf.common.util.DiagnosticChain, java.util.Map)
+ * Returns the meta object for the '
+ * {@link org.eclipse.papyrus.dd.dg.Definition#idCannotBeEmpty(org.eclipse.emf.common.util.DiagnosticChain, java.util.Map)
* <em>Id Cannot Be Empty</em>}' operation.
* <!-- begin-user-doc --> <!--
* end-user-doc -->
@@ -4647,7 +4653,8 @@ public interface DGPackage extends EPackage {
EAttribute getStyle_FontDecoration();
/**
- * Returns the meta object for the ' {@link org.eclipse.papyrus.dd.dg.Style#validFontSize(org.eclipse.emf.common.util.DiagnosticChain, java.util.Map) <em>Valid Font Size</em>}'
+ * Returns the meta object for the '
+ * {@link org.eclipse.papyrus.dd.dg.Style#validFontSize(org.eclipse.emf.common.util.DiagnosticChain, java.util.Map) <em>Valid Font Size</em>}'
* operation.
* <!-- begin-user-doc --> <!--
* end-user-doc -->
@@ -4659,7 +4666,8 @@ public interface DGPackage extends EPackage {
EOperation getStyle__ValidFontSize__DiagnosticChain_Map();
/**
- * Returns the meta object for the ' {@link org.eclipse.papyrus.dd.dg.Style#validFillOpacity(org.eclipse.emf.common.util.DiagnosticChain, java.util.Map)
+ * Returns the meta object for the '
+ * {@link org.eclipse.papyrus.dd.dg.Style#validFillOpacity(org.eclipse.emf.common.util.DiagnosticChain, java.util.Map)
* <em>Valid Fill Opacity</em>}' operation.
* <!-- begin-user-doc --> <!--
* end-user-doc -->
@@ -4671,7 +4679,8 @@ public interface DGPackage extends EPackage {
EOperation getStyle__ValidFillOpacity__DiagnosticChain_Map();
/**
- * Returns the meta object for the ' {@link org.eclipse.papyrus.dd.dg.Style#validStrokeWidth(org.eclipse.emf.common.util.DiagnosticChain, java.util.Map)
+ * Returns the meta object for the '
+ * {@link org.eclipse.papyrus.dd.dg.Style#validStrokeWidth(org.eclipse.emf.common.util.DiagnosticChain, java.util.Map)
* <em>Valid Stroke Width</em>}' operation.
* <!-- begin-user-doc --> <!--
* end-user-doc -->
@@ -4683,7 +4692,8 @@ public interface DGPackage extends EPackage {
EOperation getStyle__ValidStrokeWidth__DiagnosticChain_Map();
/**
- * Returns the meta object for the ' {@link org.eclipse.papyrus.dd.dg.Style#validDashLengthSize(org.eclipse.emf.common.util.DiagnosticChain, java.util.Map)
+ * Returns the meta object for the '
+ * {@link org.eclipse.papyrus.dd.dg.Style#validDashLengthSize(org.eclipse.emf.common.util.DiagnosticChain, java.util.Map)
* <em>Valid Dash Length Size</em>}' operation.
* <!-- begin-user-doc --> <!--
* end-user-doc -->
@@ -4695,7 +4705,8 @@ public interface DGPackage extends EPackage {
EOperation getStyle__ValidDashLengthSize__DiagnosticChain_Map();
/**
- * Returns the meta object for the ' {@link org.eclipse.papyrus.dd.dg.Style#validStrokeOpacity(org.eclipse.emf.common.util.DiagnosticChain, java.util.Map)
+ * Returns the meta object for the '
+ * {@link org.eclipse.papyrus.dd.dg.Style#validStrokeOpacity(org.eclipse.emf.common.util.DiagnosticChain, java.util.Map)
* <em>Valid Stroke Opacity</em>}' operation.
* <!-- begin-user-doc --> <!--
* end-user-doc -->
@@ -4739,7 +4750,8 @@ public interface DGPackage extends EPackage {
EReference getPaint_PaintServer();
/**
- * Returns the meta object for the ' {@link org.eclipse.papyrus.dd.dg.Paint#referencedPaintServerHasId(org.eclipse.emf.common.util.DiagnosticChain, java.util.Map)
+ * Returns the meta object for the '
+ * {@link org.eclipse.papyrus.dd.dg.Paint#referencedPaintServerHasId(org.eclipse.emf.common.util.DiagnosticChain, java.util.Map)
* <em>Referenced Paint Server Has Id</em>}' operation.
* <!-- begin-user-doc
* --> <!-- end-user-doc -->
@@ -4814,7 +4826,8 @@ public interface DGPackage extends EPackage {
EAttribute getCircle_Radius();
/**
- * Returns the meta object for the ' {@link org.eclipse.papyrus.dd.dg.Circle#nonNegativeRadius(org.eclipse.emf.common.util.DiagnosticChain, java.util.Map)
+ * Returns the meta object for the '
+ * {@link org.eclipse.papyrus.dd.dg.Circle#nonNegativeRadius(org.eclipse.emf.common.util.DiagnosticChain, java.util.Map)
* <em>Non Negative Radius</em>}' operation.
* <!-- begin-user-doc --> <!--
* end-user-doc -->
@@ -4889,15 +4902,16 @@ public interface DGPackage extends EPackage {
EClass getDefinitions();
/**
- * Returns the meta object for the containment reference list '{@link org.eclipse.papyrus.dd.dg.Definitions#getDefnitions <em>Defnition</em>}'.
- * <!-- begin-user-doc --> <!-- end-user-doc -->
+ * Returns the meta object for the containment reference list '{@link org.eclipse.papyrus.dd.dg.Definitions#getDefinitions <em>Definition</em>}'.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
*
- * @return the meta object for the containment reference list '<em>Defnition</em>'.
- * @see org.eclipse.papyrus.dd.dg.Definitions#getDefnitions()
+ * @return the meta object for the containment reference list '<em>Definition</em>'.
+ * @see org.eclipse.papyrus.dd.dg.Definitions#getDefinitions()
* @see #getDefinitions()
* @generated
*/
- EReference getDefinitions_Defnition();
+ EReference getDefinitions_Definition();
/**
* Returns the meta object for the containment reference '{@link org.eclipse.papyrus.dd.dg.Definitions#getStyleSheet <em>Style Sheet</em>}'.
@@ -5191,7 +5205,8 @@ public interface DGPackage extends EPackage {
EAttribute getGradientStop_Opacity();
/**
- * Returns the meta object for the ' {@link org.eclipse.papyrus.dd.dg.GradientStop#validOffset(org.eclipse.emf.common.util.DiagnosticChain, java.util.Map) <em>Valid Offset</em>}'
+ * Returns the meta object for the '
+ * {@link org.eclipse.papyrus.dd.dg.GradientStop#validOffset(org.eclipse.emf.common.util.DiagnosticChain, java.util.Map) <em>Valid Offset</em>}'
* operation.
* <!-- begin-user-doc --> <!--
* end-user-doc -->
@@ -5203,7 +5218,8 @@ public interface DGPackage extends EPackage {
EOperation getGradientStop__ValidOffset__DiagnosticChain_Map();
/**
- * Returns the meta object for the ' {@link org.eclipse.papyrus.dd.dg.GradientStop#validOpacity(org.eclipse.emf.common.util.DiagnosticChain, java.util.Map) <em>Valid Opacity</em>}'
+ * Returns the meta object for the '
+ * {@link org.eclipse.papyrus.dd.dg.GradientStop#validOpacity(org.eclipse.emf.common.util.DiagnosticChain, java.util.Map) <em>Valid Opacity</em>}'
* operation.
* <!-- begin-user-doc --> <!--
* end-user-doc -->
@@ -5259,7 +5275,8 @@ public interface DGPackage extends EPackage {
EAttribute getImage_IsAspectRatioPreserved();
/**
- * Returns the meta object for the ' {@link org.eclipse.papyrus.dd.dg.Image#sourceCannotBeEmpty(org.eclipse.emf.common.util.DiagnosticChain, java.util.Map)
+ * Returns the meta object for the '
+ * {@link org.eclipse.papyrus.dd.dg.Image#sourceCannotBeEmpty(org.eclipse.emf.common.util.DiagnosticChain, java.util.Map)
* <em>Source Cannot Be Empty</em>}' operation.
* <!-- begin-user-doc --> <!--
* end-user-doc -->
@@ -5346,7 +5363,8 @@ public interface DGPackage extends EPackage {
EReference getMarkedElement_StartMarker();
/**
- * Returns the meta object for the ' {@link org.eclipse.papyrus.dd.dg.MarkedElement#referencedStartMarkerHasId(org.eclipse.emf.common.util.DiagnosticChain, java.util.Map)
+ * Returns the meta object for the '
+ * {@link org.eclipse.papyrus.dd.dg.MarkedElement#referencedStartMarkerHasId(org.eclipse.emf.common.util.DiagnosticChain, java.util.Map)
* <em>Referenced Start Marker Has Id</em>}' operation.
* <!-- begin-user-doc
* --> <!-- end-user-doc -->
@@ -5358,7 +5376,8 @@ public interface DGPackage extends EPackage {
EOperation getMarkedElement__ReferencedStartMarkerHasId__DiagnosticChain_Map();
/**
- * Returns the meta object for the ' {@link org.eclipse.papyrus.dd.dg.MarkedElement#referencedMidMarkerHasId(org.eclipse.emf.common.util.DiagnosticChain, java.util.Map)
+ * Returns the meta object for the '
+ * {@link org.eclipse.papyrus.dd.dg.MarkedElement#referencedMidMarkerHasId(org.eclipse.emf.common.util.DiagnosticChain, java.util.Map)
* <em>Referenced Mid Marker Has Id</em>}' operation.
* <!-- begin-user-doc
* --> <!-- end-user-doc -->
@@ -5370,7 +5389,8 @@ public interface DGPackage extends EPackage {
EOperation getMarkedElement__ReferencedMidMarkerHasId__DiagnosticChain_Map();
/**
- * Returns the meta object for the ' {@link org.eclipse.papyrus.dd.dg.MarkedElement#referencedEndMarkerHasId(org.eclipse.emf.common.util.DiagnosticChain, java.util.Map)
+ * Returns the meta object for the '
+ * {@link org.eclipse.papyrus.dd.dg.MarkedElement#referencedEndMarkerHasId(org.eclipse.emf.common.util.DiagnosticChain, java.util.Map)
* <em>Referenced End Marker Has Id</em>}' operation.
* <!-- begin-user-doc
* --> <!-- end-user-doc -->
@@ -5446,7 +5466,8 @@ public interface DGPackage extends EPackage {
EReference getLinearGradient_End();
/**
- * Returns the meta object for the ' {@link org.eclipse.papyrus.dd.dg.LinearGradient#validGradientVector(org.eclipse.emf.common.util.DiagnosticChain, java.util.Map)
+ * Returns the meta object for the '
+ * {@link org.eclipse.papyrus.dd.dg.LinearGradient#validGradientVector(org.eclipse.emf.common.util.DiagnosticChain, java.util.Map)
* <em>Valid Gradient Vector</em>}' operation.
* <!-- begin-user-doc --> <!--
* end-user-doc -->
@@ -5576,7 +5597,8 @@ public interface DGPackage extends EPackage {
EReference getPath_Command();
/**
- * Returns the meta object for the ' {@link org.eclipse.papyrus.dd.dg.Path#firstCommandMustBeMove(org.eclipse.emf.common.util.DiagnosticChain, java.util.Map)
+ * Returns the meta object for the '
+ * {@link org.eclipse.papyrus.dd.dg.Path#firstCommandMustBeMove(org.eclipse.emf.common.util.DiagnosticChain, java.util.Map)
* <em>First Command Must Be Move</em>}' operation.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
@@ -5705,7 +5727,8 @@ public interface DGPackage extends EPackage {
EAttribute getRadialGradient_Radius();
/**
- * Returns the meta object for the ' {@link org.eclipse.papyrus.dd.dg.RadialGradient#validCen