summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMaged Elaasar2014-07-25 04:43:37 (EDT)
committerFlorian Noyrit2014-07-25 09:39:16 (EDT)
commitc7d92b1dce64f4b669be6279b226c00b538c87c0 (patch)
treeb1a56cc705d41015055c7c087bfd9e561c7be75e
parent0c02b45c17b827dd4e30939bada1f1616ff4d524 (diff)
downloadorg.eclipse.papyrus-c7d92b1dce64f4b669be6279b226c00b538c87c0.zip
org.eclipse.papyrus-c7d92b1dce64f4b669be6279b226c00b538c87c0.tar.gz
org.eclipse.papyrus-c7d92b1dce64f4b669be6279b226c00b538c87c0.tar.bz2
Formatting all files and fixing find-bugs errorsrefs/changes/95/30495/2
Change-Id: I330d5a9d9647cf33ef57cc6a906a0ec4543e54eb Signed-off-by: Maged Elaasar <melaasar@gmail.com>
-rw-r--r--extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/.settings/org.eclipse.jdt.core.prefs281
-rw-r--r--extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/.settings/org.eclipse.jdt.ui.prefs4
-rw-r--r--extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/src/org/eclipse/papyrus/dd/dc/provider/BoundsItemProvider.java93
-rw-r--r--extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/src/org/eclipse/papyrus/dd/dc/provider/DCItemProviderAdapterFactory.java55
-rw-r--r--extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/src/org/eclipse/papyrus/dd/dc/provider/DimensionItemProvider.java58
-rw-r--r--extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/src/org/eclipse/papyrus/dd/dc/provider/PointItemProvider.java60
-rw-r--r--extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/src/org/eclipse/papyrus/dd/dg/provider/CanvasItemProvider.java44
-rw-r--r--extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/src/org/eclipse/papyrus/dd/dg/provider/CircleItemProvider.java64
-rw-r--r--extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/src/org/eclipse/papyrus/dd/dg/provider/ClipPathItemProvider.java21
-rw-r--r--extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/src/org/eclipse/papyrus/dd/dg/provider/ClosePathItemProvider.java17
-rw-r--r--extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/src/org/eclipse/papyrus/dd/dg/provider/CubicCurveToItemProvider.java74
-rw-r--r--extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/src/org/eclipse/papyrus/dd/dg/provider/DGItemProviderAdapterFactory.java345
-rw-r--r--extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/src/org/eclipse/papyrus/dd/dg/provider/DefinitionItemProvider.java44
-rw-r--r--extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/src/org/eclipse/papyrus/dd/dg/provider/DefinitionsItemProvider.java149
-rw-r--r--extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/src/org/eclipse/papyrus/dd/dg/provider/EllipseItemProvider.java52
-rw-r--r--extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/src/org/eclipse/papyrus/dd/dg/provider/EllipticalArcToItemProvider.java100
-rw-r--r--extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/src/org/eclipse/papyrus/dd/dg/provider/GradientItemProvider.java43
-rw-r--r--extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/src/org/eclipse/papyrus/dd/dg/provider/GradientStopItemProvider.java75
-rw-r--r--extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/src/org/eclipse/papyrus/dd/dg/provider/GraphicalElementItemProvider.java154
-rw-r--r--extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/src/org/eclipse/papyrus/dd/dg/provider/GroupItemProvider.java149
-rw-r--r--extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/src/org/eclipse/papyrus/dd/dg/provider/ImageItemProvider.java81
-rw-r--r--extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/src/org/eclipse/papyrus/dd/dg/provider/LineItemProvider.java70
-rw-r--r--extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/src/org/eclipse/papyrus/dd/dg/provider/LineToItemProvider.java40
-rw-r--r--extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/src/org/eclipse/papyrus/dd/dg/provider/LinearGradientItemProvider.java70
-rw-r--r--extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/src/org/eclipse/papyrus/dd/dg/provider/MarkedElementItemProvider.java62
-rw-r--r--extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/src/org/eclipse/papyrus/dd/dg/provider/MarkerItemProvider.java52
-rw-r--r--extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/src/org/eclipse/papyrus/dd/dg/provider/MatrixItemProvider.java126
-rw-r--r--extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/src/org/eclipse/papyrus/dd/dg/provider/MoveToItemProvider.java40
-rw-r--r--extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/src/org/eclipse/papyrus/dd/dg/provider/PaintItemProvider.java58
-rw-r--r--extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/src/org/eclipse/papyrus/dd/dg/provider/PaintServerItemProvider.java67
-rw-r--r--extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/src/org/eclipse/papyrus/dd/dg/provider/PathCommandItemProvider.java39
-rw-r--r--extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/src/org/eclipse/papyrus/dd/dg/provider/PathItemProvider.java74
-rw-r--r--extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/src/org/eclipse/papyrus/dd/dg/provider/PatternItemProvider.java136
-rw-r--r--extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/src/org/eclipse/papyrus/dd/dg/provider/PolygonItemProvider.java44
-rw-r--r--extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/src/org/eclipse/papyrus/dd/dg/provider/PolylineItemProvider.java44
-rw-r--r--extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/src/org/eclipse/papyrus/dd/dg/provider/QuadraticCurveToItemProvider.java68
-rw-r--r--extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/src/org/eclipse/papyrus/dd/dg/provider/RadialGradientItemProvider.java90
-rw-r--r--extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/src/org/eclipse/papyrus/dd/dg/provider/RectangleItemProvider.java64
-rw-r--r--extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/src/org/eclipse/papyrus/dd/dg/provider/RootCanvasItemProvider.java95
-rw-r--r--extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/src/org/eclipse/papyrus/dd/dg/provider/RotateItemProvider.java60
-rw-r--r--extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/src/org/eclipse/papyrus/dd/dg/provider/ScaleItemProvider.java56
-rw-r--r--extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/src/org/eclipse/papyrus/dd/dg/provider/SkewItemProvider.java56
-rw-r--r--extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/src/org/eclipse/papyrus/dd/dg/provider/StyleItemProvider.java247
-rw-r--r--extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/src/org/eclipse/papyrus/dd/dg/provider/StyleRuleItemProvider.java48
-rw-r--r--extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/src/org/eclipse/papyrus/dd/dg/provider/StyleSelectorItemProvider.java60
-rw-r--r--extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/src/org/eclipse/papyrus/dd/dg/provider/StyleSheetItemProvider.java39
-rw-r--r--extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/src/org/eclipse/papyrus/dd/dg/provider/TextItemProvider.java82
-rw-r--r--extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/src/org/eclipse/papyrus/dd/dg/provider/TransformItemProvider.java16
-rw-r--r--extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/src/org/eclipse/papyrus/dd/dg/provider/TranslateItemProvider.java56
-rw-r--r--extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/src/org/eclipse/papyrus/dd/dg/provider/UseItemProvider.java58
-rw-r--r--extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/src/org/eclipse/papyrus/dd/di/provider/DIItemProviderAdapterFactory.java29
-rw-r--r--extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/src/org/eclipse/papyrus/dd/di/provider/DiagramElementItemProvider.java13
-rw-r--r--extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/src/org/eclipse/papyrus/dd/di/provider/DiagramItemProvider.java73
-rw-r--r--extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/src/org/eclipse/papyrus/dd/di/provider/EdgeItemProvider.java36
-rw-r--r--extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/src/org/eclipse/papyrus/dd/di/provider/ShapeItemProvider.java36
-rw-r--r--extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/src/org/eclipse/papyrus/dd/di/provider/StyleItemProvider.java13
-rw-r--r--extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/src/org/eclipse/papyrus/dd/edit/DDEditPlugin.java8
-rw-r--r--extraplugins/diagram-definition/org.eclipse.papyrus.dd.editor/src/org/eclipse/papyrus/dd/dg/editor/DGToSVGConverter.java23
-rw-r--r--extraplugins/diagram-definition/org.eclipse.papyrus.dd.editor/src/org/eclipse/papyrus/dd/editor/DDEditorPage.java15
-rw-r--r--extraplugins/diagram-definition/org.eclipse.papyrus.dd.editor/src/org/eclipse/papyrus/dd/editor/DDEditorPlugin.java8
-rw-r--r--extraplugins/diagram-definition/org.eclipse.papyrus.dd/.settings/org.eclipse.jdt.core.prefs280
-rw-r--r--extraplugins/diagram-definition/org.eclipse.papyrus.dd/.settings/org.eclipse.jdt.ui.prefs4
-rw-r--r--extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dc/Bounds.java62
-rw-r--r--extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dc/DCFactory.java7
-rw-r--r--extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dc/DCPackage.java87
-rw-r--r--extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dc/Dimension.java48
-rw-r--r--extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dc/KnownColor.java137
-rw-r--r--extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dc/Point.java26
-rw-r--r--extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dc/impl/BoundsImpl.java229
-rw-r--r--extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dc/impl/DCFactoryImpl.java138
-rw-r--r--extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dc/impl/DCPackageImpl.java143
-rw-r--r--extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dc/impl/DimensionImpl.java160
-rw-r--r--extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dc/impl/PointImpl.java97
-rw-r--r--extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dc/util/DCAdapterFactory.java63
-rw-r--r--extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dc/util/DCSwitch.java73
-rw-r--r--extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dc/util/DCValidator.java177
-rw-r--r--extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/Canvas.java26
-rw-r--r--extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/Circle.java31
-rw-r--r--extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/ClipPath.java9
-rw-r--r--extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/ClosePath.java12
-rw-r--r--extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/CubicCurveTo.java32
-rw-r--r--extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/DGFactory.java34
-rw-r--r--extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/DGPackage.java858
-rw-r--r--extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/Definition.java24
-rw-r--r--extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/Definitions.java20
-rw-r--r--extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/ElementKind.java176
-rw-r--r--extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/Ellipse.java23
-rw-r--r--extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/EllipticalArcTo.java41
-rw-r--r--extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/FontDecoration.java66
-rw-r--r--extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/Gradient.java16
-rw-r--r--extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/GradientStop.java53
-rw-r--r--extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/GraphicalElement.java59
-rw-r--r--extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/Group.java29
-rw-r--r--extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/Image.java36
-rw-r--r--extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/Line.java23
-rw-r--r--extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/LineTo.java17
-rw-r--r--extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/LinearGradient.java32
-rw-r--r--extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/MarkedElement.java56
-rw-r--r--extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/Marker.java23
-rw-r--r--extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/Matrix.java47
-rw-r--r--extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/MoveTo.java17
-rw-r--r--extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/Paint.java30
-rw-r--r--extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/PaintServer.java16
-rw-r--r--extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/Path.java25
-rw-r--r--extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/PathCommand.java17
-rw-r--r--extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/Pattern.java26
-rw-r--r--extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/Polygon.java16
-rw-r--r--extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/Polyline.java16
-rw-r--r--extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/QuadraticCurveTo.java23
-rw-r--r--extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/RadialGradient.java54
-rw-r--r--extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/Rectangle.java37
-rw-r--r--extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/RootCanvas.java36
-rw-r--r--extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/Rotate.java23
-rw-r--r--extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/Scale.java28
-rw-r--r--extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/Skew.java19
-rw-r--r--extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/Style.java148
-rw-r--r--extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/StyleRule.java20
-rw-r--r--extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/StyleSelector.java19
-rw-r--r--extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/StyleSheet.java14
-rw-r--r--extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/Text.java42
-rw-r--r--extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/TextAnchor.java64
-rw-r--r--extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/Transform.java9
-rw-r--r--extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/Translate.java23
-rw-r--r--extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/Use.java35
-rw-r--r--extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/impl/CanvasImpl.java112
-rw-r--r--extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/impl/CircleImpl.java143
-rw-r--r--extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/impl/ClipPathImpl.java9
-rw-r--r--extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/impl/ClosePathImpl.java9
-rw-r--r--extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/impl/CubicCurveToImpl.java183
-rw-r--r--extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/impl/DGFactoryImpl.java228
-rw-r--r--extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/impl/DGPackageImpl.java578
-rw-r--r--extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/impl/DefinitionImpl.java86
-rw-r--r--extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/impl/DefinitionsImpl.java114
-rw-r--r--extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/impl/EllipseImpl.java131
-rw-r--r--extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/impl/EllipticalArcToImpl.java223
-rw-r--r--extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/impl/GradientImpl.java59
-rw-r--r--extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/impl/GradientStopImpl.java199
-rw-r--r--extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/impl/GraphicalElementImpl.java318
-rw-r--r--extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/impl/GroupImpl.java103
-rw-r--r--extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/impl/ImageImpl.java173
-rw-r--r--extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/impl/LineImpl.java128
-rw-r--r--extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/impl/LineToImpl.java79
-rw-r--r--extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/impl/LinearGradientImpl.java159
-rw-r--r--extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/impl/MarkedElementImpl.java222
-rw-r--r--extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/impl/MarkerImpl.java131
-rw-r--r--extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/impl/MatrixImpl.java182
-rw-r--r--extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/impl/MoveToImpl.java79
-rw-r--r--extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/impl/PaintImpl.java124
-rw-r--r--extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/impl/PaintServerImpl.java62
-rw-r--r--extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/impl/PathCommandImpl.java57
-rw-r--r--extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/impl/PathImpl.java92
-rw-r--r--extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/impl/PatternImpl.java131
-rw-r--r--extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/impl/PolygonImpl.java59
-rw-r--r--extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/impl/PolylineImpl.java59
-rw-r--r--extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/impl/QuadraticCurveToImpl.java134
-rw-r--r--extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/impl/RadialGradientImpl.java245
-rw-r--r--extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/impl/RectangleImpl.java154
-rw-r--r--extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/impl/RootCanvasImpl.java177
-rw-r--r--extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/impl/RotateImpl.java112
-rw-r--r--extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/impl/ScaleImpl.java113
-rw-r--r--extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/impl/SkewImpl.java82
-rw-r--r--extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/impl/StyleImpl.java642
-rw-r--r--extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/impl/StyleRuleImpl.java114
-rw-r--r--extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/impl/StyleSelectorImpl.java95
-rw-r--r--extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/impl/StyleSheetImpl.java62
-rw-r--r--extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/impl/TextImpl.java171
-rw-r--r--extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/impl/TransformImpl.java12
-rw-r--r--extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/impl/TranslateImpl.java82
-rw-r--r--extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/impl/UseImpl.java149
-rw-r--r--extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/util/DGAdapterFactory.java519
-rw-r--r--extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/util/DGSwitch.java1005
-rw-r--r--extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/util/DGValidator.java1383
-rw-r--r--extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/di/DIFactory.java4
-rw-r--r--extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/di/DIPackage.java92
-rw-r--r--extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/di/Diagram.java32
-rw-r--r--extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/di/DiagramElement.java38
-rw-r--r--extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/di/Edge.java24
-rw-r--r--extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/di/Shape.java16
-rw-r--r--extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/di/Style.java9
-rw-r--r--extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/di/impl/DIFactoryImpl.java18
-rw-r--r--extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/di/impl/DIPackageImpl.java139
-rw-r--r--extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/di/impl/DiagramElementImpl.java113
-rw-r--r--extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/di/impl/DiagramImpl.java109
-rw-r--r--extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/di/impl/EdgeImpl.java90
-rw-r--r--extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/di/impl/ShapeImpl.java78
-rw-r--r--extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/di/impl/StyleImpl.java11
-rw-r--r--extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/di/util/DIAdapterFactory.java85
-rw-r--r--extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/di/util/DIDerivedUnionAdapter.java79
-rw-r--r--extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/di/util/DISwitch.java125
-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/src/org/eclipse/papyrus/umldi/provider/UMLDIEditPlugin.java19
-rw-r--r--extraplugins/diagram-definition/org.eclipse.papyrus.umldi.edit/src/org/eclipse/papyrus/umldi/provider/UMLDIItemProviderAdapterFactory.java74
-rw-r--r--extraplugins/diagram-definition/org.eclipse.papyrus.umldi.edit/src/org/eclipse/papyrus/umldi/provider/UmlCompartmentItemProvider.java52
-rw-r--r--extraplugins/diagram-definition/org.eclipse.papyrus.umldi.edit/src/org/eclipse/papyrus/umldi/provider/UmlDiagramElementItemProvider.java136
-rw-r--r--extraplugins/diagram-definition/org.eclipse.papyrus.umldi.edit/src/org/eclipse/papyrus/umldi/provider/UmlDiagramItemProvider.java86
-rw-r--r--extraplugins/diagram-definition/org.eclipse.papyrus.umldi.edit/src/org/eclipse/papyrus/umldi/provider/UmlEdgeItemProvider.java74
-rw-r--r--extraplugins/diagram-definition/org.eclipse.papyrus.umldi.edit/src/org/eclipse/papyrus/umldi/provider/UmlLabelItemProvider.java52
-rw-r--r--extraplugins/diagram-definition/org.eclipse.papyrus.umldi.edit/src/org/eclipse/papyrus/umldi/provider/UmlShapeItemProvider.java44
-rw-r--r--extraplugins/diagram-definition/org.eclipse.papyrus.umldi.edit/src/org/eclipse/papyrus/umldi/provider/UmlStyleItemProvider.java70
-rw-r--r--extraplugins/diagram-definition/org.eclipse.papyrus.umldi.editor/src/org/eclipse/papyrus/umldi/editor/UMLDIActionBarContributor.java392
-rw-r--r--extraplugins/diagram-definition/org.eclipse.papyrus.umldi.editor/src/org/eclipse/papyrus/umldi/editor/UMLDIEditorPlugin.java72
-rw-r--r--extraplugins/diagram-definition/org.eclipse.papyrus.umldi.editor/src/org/eclipse/papyrus/umldi/editor/UMLDIModelPage.java36
-rw-r--r--extraplugins/diagram-definition/org.eclipse.papyrus.umldi.editor/src/org/eclipse/papyrus/umldi/editor/UMLDIModelWizard.java399
-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/src/org/eclipse/papyrus/umldi/UMLDIFactory.java11
-rw-r--r--extraplugins/diagram-definition/org.eclipse.papyrus.umldi/src/org/eclipse/papyrus/umldi/UMLDIPackage.java225
-rw-r--r--extraplugins/diagram-definition/org.eclipse.papyrus.umldi/src/org/eclipse/papyrus/umldi/UmlCompartment.java17
-rw-r--r--extraplugins/diagram-definition/org.eclipse.papyrus.umldi/src/org/eclipse/papyrus/umldi/UmlCompartmentKind.java54
-rw-r--r--extraplugins/diagram-definition/org.eclipse.papyrus.umldi/src/org/eclipse/papyrus/umldi/UmlDiagram.java6
-rw-r--r--extraplugins/diagram-definition/org.eclipse.papyrus.umldi/src/org/eclipse/papyrus/umldi/UmlDiagramElement.java78
-rw-r--r--extraplugins/diagram-definition/org.eclipse.papyrus.umldi/src/org/eclipse/papyrus/umldi/UmlEdge.java26
-rw-r--r--extraplugins/diagram-definition/org.eclipse.papyrus.umldi/src/org/eclipse/papyrus/umldi/UmlLabel.java17
-rw-r--r--extraplugins/diagram-definition/org.eclipse.papyrus.umldi/src/org/eclipse/papyrus/umldi/UmlLabelKind.java44
-rw-r--r--extraplugins/diagram-definition/org.eclipse.papyrus.umldi/src/org/eclipse/papyrus/umldi/UmlShape.java6
-rw-r--r--extraplugins/diagram-definition/org.eclipse.papyrus.umldi/src/org/eclipse/papyrus/umldi/UmlStyle.java31
-rw-r--r--extraplugins/diagram-definition/org.eclipse.papyrus.umldi/src/org/eclipse/papyrus/umldi/impl/UMLDIFactoryImpl.java83
-rw-r--r--extraplugins/diagram-definition/org.eclipse.papyrus.umldi/src/org/eclipse/papyrus/umldi/impl/UMLDIPackageImpl.java225
-rw-r--r--extraplugins/diagram-definition/org.eclipse.papyrus.umldi/src/org/eclipse/papyrus/umldi/impl/UmlCompartmentImpl.java51
-rw-r--r--extraplugins/diagram-definition/org.eclipse.papyrus.umldi/src/org/eclipse/papyrus/umldi/impl/UmlDiagramElementImpl.java407
-rw-r--r--extraplugins/diagram-definition/org.eclipse.papyrus.umldi/src/org/eclipse/papyrus/umldi/impl/UmlDiagramImpl.java141
-rw-r--r--extraplugins/diagram-definition/org.eclipse.papyrus.umldi/src/org/eclipse/papyrus/umldi/impl/UmlEdgeImpl.java260
-rw-r--r--extraplugins/diagram-definition/org.eclipse.papyrus.umldi/src/org/eclipse/papyrus/umldi/impl/UmlLabelImpl.java51
-rw-r--r--extraplugins/diagram-definition/org.eclipse.papyrus.umldi/src/org/eclipse/papyrus/umldi/impl/UmlShapeImpl.java92
-rw-r--r--extraplugins/diagram-definition/org.eclipse.papyrus.umldi/src/org/eclipse/papyrus/umldi/impl/UmlStyleImpl.java104
-rw-r--r--extraplugins/diagram-definition/org.eclipse.papyrus.umldi/src/org/eclipse/papyrus/umldi/util/UMLDIAdapterFactory.java153
-rw-r--r--extraplugins/diagram-definition/org.eclipse.papyrus.umldi/src/org/eclipse/papyrus/umldi/util/UMLDIDerivedUnionAdapter.java331
-rw-r--r--extraplugins/diagram-definition/org.eclipse.papyrus.umldi/src/org/eclipse/papyrus/umldi/util/UMLDIResourceFactoryImpl.java8
-rw-r--r--extraplugins/diagram-definition/org.eclipse.papyrus.umldi/src/org/eclipse/papyrus/umldi/util/UMLDIResourceImpl.java7
-rw-r--r--extraplugins/diagram-definition/org.eclipse.papyrus.umldi/src/org/eclipse/papyrus/umldi/util/UMLDISwitch.java230
-rw-r--r--extraplugins/diagram-definition/org.eclipse.papyrus.umldi/src/org/eclipse/papyrus/umldi/util/UMLDIValidator.java97
-rw-r--r--extraplugins/diagram-definition/org.eclipse.papyrus.umldi/src/org/eclipse/papyrus/umldi/util/UMLDIXMLProcessor.java8
-rw-r--r--extraplugins/diagram-definition/org.eclipse.papyrus.umldi2dg/src/org/eclipse/papyrus/umldi2dg/UtilitiesLibrary.java11
234 files changed, 13022 insertions, 10836 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
new file mode 100644
index 0000000..e576692
--- /dev/null
+++ b/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/.settings/org.eclipse.jdt.core.prefs
@@ -0,0 +1,281 @@
+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
index e7906de..b5f980c 100644
--- 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
@@ -1,3 +1,3 @@
eclipse.preferences.version=1
-org.eclipse.jdt.ui.javadoc=false
-org.eclipse.jdt.ui.text.custom_code_templates=<?xml version\="1.0" encoding\="UTF-8" standalone\="no"?><templates><template autoinsert\="true" context\="gettercomment_context" deleted\="false" description\="Comment for getter method" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.gettercomment" name\="gettercomment">/**\n * @return the ${bare_field_name}\n */</template><template autoinsert\="true" context\="settercomment_context" deleted\="false" description\="Comment for setter method" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.settercomment" name\="settercomment">/**\n * @param ${param} the ${bare_field_name} to set\n */</template><template autoinsert\="false" context\="constructorcomment_context" deleted\="false" description\="Comment for created constructors" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.constructorcomment" name\="constructorcomment">/**\n * Constructor.\n *\n * ${tags}\n */</template><template autoinsert\="true" context\="filecomment_context" deleted\="false" description\="Comment for created Java files" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.filecomment" name\="filecomment">/**\n * \n */</template><template autoinsert\="true" context\="typecomment_context" deleted\="false" description\="Comment for created types" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.typecomment" name\="typecomment">/**\n * @author ${user}\n *\n * ${tags}\n */</template><template autoinsert\="true" context\="fieldcomment_context" deleted\="false" description\="Comment for fields" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.fieldcomment" name\="fieldcomment">/**\n * \n */</template><template autoinsert\="true" context\="methodcomment_context" deleted\="false" description\="Comment for non-overriding methods" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.methodcomment" name\="methodcomment">/**\n * ${tags}\n */</template><template autoinsert\="false" context\="overridecomment_context" deleted\="false" description\="Comment for overriding methods" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.overridecomment" name\="overridecomment">/**\n * ${see_to_overridden}\n *\n * ${tags}\n */\n</template><template autoinsert\="false" context\="delegatecomment_context" deleted\="false" description\="Comment for delegate methods" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.delegatecomment" name\="delegatecomment">/**\n * ${see_to_target}\n *\n * ${tags}\n */</template><template autoinsert\="true" context\="newtype_context" deleted\="false" description\="Newly created files" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.newtype" name\="newtype">${filecomment}\n${package_declaration}\n\n${typecomment}\n${type_declaration}</template><template autoinsert\="true" context\="classbody_context" deleted\="false" description\="Code in new class type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.classbody" name\="classbody">\n</template><template autoinsert\="true" context\="interfacebody_context" deleted\="false" description\="Code in new interface type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.interfacebody" name\="interfacebody">\n</template><template autoinsert\="true" context\="enumbody_context" deleted\="false" description\="Code in new enum type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.enumbody" name\="enumbody">\n</template><template autoinsert\="true" context\="annotationbody_context" deleted\="false" description\="Code in new annotation type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.annotationbody" name\="annotationbody">\n</template><template autoinsert\="true" context\="catchblock_context" deleted\="false" description\="Code in new catch blocks" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.catchblock" name\="catchblock">// ${todo} Auto-generated catch block\n${exception_var}.printStackTrace();</template><template autoinsert\="true" context\="methodbody_context" deleted\="false" description\="Code in created method stubs" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.methodbody" name\="methodbody">// ${todo} Auto-generated method stub\n${body_statement}</template><template autoinsert\="true" context\="constructorbody_context" deleted\="false" description\="Code in created constructor stubs" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.constructorbody" name\="constructorbody">${body_statement}\n// ${todo} Auto-generated constructor stub</template><template autoinsert\="true" context\="getterbody_context" deleted\="false" description\="Code in created getters" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.getterbody" name\="getterbody">return ${field};</template><template autoinsert\="true" context\="setterbody_context" deleted\="false" description\="Code in created setters" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.setterbody" name\="setterbody">${field} \= ${param};</template></templates>
+formatter_profile=_Zero blank Papyrus Formatter Profile CDM
+formatter_settings_version=12
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 c318b54..fd5d21a 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
@@ -39,11 +39,10 @@ import org.eclipse.papyrus.dd.edit.DDEditPlugin;
* This is the item provider adapter for a {@link org.eclipse.papyrus.dd.dc.Bounds} object.
* <!-- begin-user-doc --> <!--
* end-user-doc -->
+ *
* @generated
*/
-public class BoundsItemProvider extends ItemProviderAdapter implements
- IEditingDomainItemProvider, IStructuredItemContentProvider,
- ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource {
+public class BoundsItemProvider extends ItemProviderAdapter implements IEditingDomainItemProvider, IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource {
/**
* This constructs an instance from a factory and a notifier. <!--
@@ -63,9 +62,8 @@ public class BoundsItemProvider extends ItemProviderAdapter implements
*/
@Override
public List<IItemPropertyDescriptor> getPropertyDescriptors(Object object) {
- if (itemPropertyDescriptors == null) {
+ if(itemPropertyDescriptors == null) {
super.getPropertyDescriptors(object);
-
addXPropertyDescriptor(object);
addYPropertyDescriptor(object);
addWidthPropertyDescriptor(object);
@@ -78,44 +76,22 @@ public class BoundsItemProvider extends ItemProviderAdapter implements
* This adds a property descriptor for the X feature.
* <!-- begin-user-doc
* --> <!-- end-user-doc -->
+ *
* @generated
*/
protected void addXPropertyDescriptor(Object object) {
- itemPropertyDescriptors.add
- (createItemPropertyDescriptor
- (((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
- getResourceLocator(),
- getString("_UI_Bounds_x_feature"),
- getString("_UI_PropertyDescriptor_description", "_UI_Bounds_x_feature", "_UI_Bounds_type"),
- DCPackage.Literals.BOUNDS__X,
- true,
- false,
- false,
- ItemPropertyDescriptor.REAL_VALUE_IMAGE,
- null,
- null));
+ itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(), getResourceLocator(), getString("_UI_Bounds_x_feature"), getString("_UI_PropertyDescriptor_description", "_UI_Bounds_x_feature", "_UI_Bounds_type"), DCPackage.Literals.BOUNDS__X, true, false, false, ItemPropertyDescriptor.REAL_VALUE_IMAGE, null, null));
}
/**
* This adds a property descriptor for the Y feature.
* <!-- begin-user-doc
* --> <!-- end-user-doc -->
+ *
* @generated
*/
protected void addYPropertyDescriptor(Object object) {
- itemPropertyDescriptors.add
- (createItemPropertyDescriptor
- (((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
- getResourceLocator(),
- getString("_UI_Bounds_y_feature"),
- getString("_UI_PropertyDescriptor_description", "_UI_Bounds_y_feature", "_UI_Bounds_type"),
- DCPackage.Literals.BOUNDS__Y,
- true,
- false,
- false,
- ItemPropertyDescriptor.REAL_VALUE_IMAGE,
- null,
- null));
+ itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(), getResourceLocator(), getString("_UI_Bounds_y_feature"), getString("_UI_PropertyDescriptor_description", "_UI_Bounds_y_feature", "_UI_Bounds_type"), DCPackage.Literals.BOUNDS__Y, true, false, false, ItemPropertyDescriptor.REAL_VALUE_IMAGE, null, null));
}
/**
@@ -125,19 +101,7 @@ public class BoundsItemProvider extends ItemProviderAdapter implements
* @generated
*/
protected void addWidthPropertyDescriptor(Object object) {
- itemPropertyDescriptors.add
- (createItemPropertyDescriptor
- (((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
- getResourceLocator(),
- getString("_UI_Bounds_width_feature"),
- getString("_UI_PropertyDescriptor_description", "_UI_Bounds_width_feature", "_UI_Bounds_type"),
- DCPackage.Literals.BOUNDS__WIDTH,
- true,
- false,
- false,
- ItemPropertyDescriptor.REAL_VALUE_IMAGE,
- null,
- null));
+ itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(), getResourceLocator(), getString("_UI_Bounds_width_feature"), getString("_UI_PropertyDescriptor_description", "_UI_Bounds_width_feature", "_UI_Bounds_type"), DCPackage.Literals.BOUNDS__WIDTH, true, false, false, ItemPropertyDescriptor.REAL_VALUE_IMAGE, null, null));
}
/**
@@ -147,24 +111,13 @@ public class BoundsItemProvider extends ItemProviderAdapter implements
* @generated
*/
protected void addHeightPropertyDescriptor(Object object) {
- itemPropertyDescriptors.add
- (createItemPropertyDescriptor
- (((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
- getResourceLocator(),
- getString("_UI_Bounds_height_feature"),
- getString("_UI_PropertyDescriptor_description", "_UI_Bounds_height_feature", "_UI_Bounds_type"),
- DCPackage.Literals.BOUNDS__HEIGHT,
- true,
- false,
- false,
- ItemPropertyDescriptor.REAL_VALUE_IMAGE,
- null,
- null));
+ itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(), getResourceLocator(), getString("_UI_Bounds_height_feature"), getString("_UI_PropertyDescriptor_description", "_UI_Bounds_height_feature", "_UI_Bounds_type"), DCPackage.Literals.BOUNDS__HEIGHT, true, false, false, ItemPropertyDescriptor.REAL_VALUE_IMAGE, null, null));
}
/**
* This returns Bounds.gif.
* <!-- begin-user-doc --> <!-- end-user-doc -->
+ *
* @generated
*/
@Override
@@ -180,10 +133,8 @@ public class BoundsItemProvider extends ItemProviderAdapter implements
*/
@Override
public String getText(Object object) {
- Bounds bounds = (Bounds) object;
- return getString("_UI_Bounds_type") + " " + bounds.getX() + ", "
- + bounds.getY() + ", " + bounds.getWidth() + ", "
- + bounds.getHeight();
+ Bounds bounds = (Bounds)object;
+ return getString("_UI_Bounds_type") + " " + bounds.getX() + ", " + bounds.getY() + ", " + bounds.getWidth() + ", " + bounds.getHeight();
}
/**
@@ -191,19 +142,19 @@ public class BoundsItemProvider extends ItemProviderAdapter implements
* children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
* <!-- begin-user-doc --> <!--
* end-user-doc -->
+ *
* @generated
*/
@Override
public void notifyChanged(Notification notification) {
updateChildren(notification);
-
- switch (notification.getFeatureID(Bounds.class)) {
- case DCPackage.BOUNDS__X:
- case DCPackage.BOUNDS__Y:
- case DCPackage.BOUNDS__WIDTH:
- case DCPackage.BOUNDS__HEIGHT:
- fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), false, true));
- return;
+ switch(notification.getFeatureID(Bounds.class)) {
+ case DCPackage.BOUNDS__X:
+ case DCPackage.BOUNDS__Y:
+ case DCPackage.BOUNDS__WIDTH:
+ case DCPackage.BOUNDS__HEIGHT:
+ fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), false, true));
+ return;
}
super.notifyChanged(notification);
}
@@ -216,8 +167,7 @@ public class BoundsItemProvider extends ItemProviderAdapter implements
* @generated
*/
@Override
- protected void collectNewChildDescriptors(
- Collection<Object> newChildDescriptors, Object object) {
+ protected void collectNewChildDescriptors(Collection<Object> newChildDescriptors, Object object) {
super.collectNewChildDescriptors(newChildDescriptors, object);
}
@@ -231,5 +181,4 @@ public class BoundsItemProvider extends ItemProviderAdapter implements
public ResourceLocator getResourceLocator() {
return DDEditPlugin.INSTANCE;
}
-
}
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 8de50b3..dc9f6b5 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
@@ -39,21 +39,21 @@ import org.eclipse.papyrus.dd.dc.util.DCAdapterFactory;
* Note that most of the adapters are shared among multiple instances.
* <!-- begin-user-doc --> <!--
* end-user-doc -->
+ *
* @generated
*/
-public class DCItemProviderAdapterFactory extends DCAdapterFactory implements
- ComposeableAdapterFactory, IChangeNotifier, IDisposable {
+public class DCItemProviderAdapterFactory extends DCAdapterFactory implements ComposeableAdapterFactory, IChangeNotifier, IDisposable {
/**
* This keeps track of the root adapter factory that delegates to this adapter factory.
* <!-- begin-user-doc --> <!-- end-user-doc -->
+ *
* @generated
*/
protected ComposedAdapterFactory parentAdapterFactory;
/**
- * This is used to implement
- * {@link org.eclipse.emf.edit.provider.IChangeNotifier}. <!--
+ * This is used to implement {@link org.eclipse.emf.edit.provider.IChangeNotifier}. <!--
* begin-user-doc --> <!-- end-user-doc -->
*
* @generated
@@ -64,6 +64,7 @@ public class DCItemProviderAdapterFactory extends DCAdapterFactory implements
* This keeps track of all the supported types checked by {@link #isFactoryForType isFactoryForType}.
* <!-- begin-user-doc --> <!--
* end-user-doc -->
+ *
* @generated
*/
protected Collection<Object> supportedTypes = new ArrayList<Object>();
@@ -86,6 +87,7 @@ public class DCItemProviderAdapterFactory extends DCAdapterFactory implements
* This keeps track of the one adapter used for all {@link org.eclipse.papyrus.dd.dc.Point} instances.
* <!-- begin-user-doc
* --> <!-- end-user-doc -->
+ *
* @generated
*/
protected PointItemProvider pointItemProvider;
@@ -93,20 +95,19 @@ public class DCItemProviderAdapterFactory extends DCAdapterFactory implements
/**
* This creates an adapter for a {@link org.eclipse.papyrus.dd.dc.Point}.
* <!-- begin-user-doc --> <!-- end-user-doc -->
+ *
* @generated
*/
@Override
public Adapter createPointAdapter() {
- if (pointItemProvider == null) {
+ if(pointItemProvider == null) {
pointItemProvider = new PointItemProvider(this);
}
-
return pointItemProvider;
}
/**
- * This keeps track of the one adapter used for all
- * {@link org.eclipse.papyrus.dd.dc.Dimension} instances. <!--
+ * This keeps track of the one adapter used for all {@link org.eclipse.papyrus.dd.dc.Dimension} instances. <!--
* begin-user-doc --> <!-- end-user-doc -->
*
* @generated
@@ -116,14 +117,14 @@ public class DCItemProviderAdapterFactory extends DCAdapterFactory implements
/**
* This creates an adapter for a {@link org.eclipse.papyrus.dd.dc.Dimension}.
* <!-- begin-user-doc --> <!-- end-user-doc -->
+ *
* @generated
*/
@Override
public Adapter createDimensionAdapter() {
- if (dimensionItemProvider == null) {
+ if(dimensionItemProvider == null) {
dimensionItemProvider = new DimensionItemProvider(this);
}
-
return dimensionItemProvider;
}
@@ -131,6 +132,7 @@ public class DCItemProviderAdapterFactory extends DCAdapterFactory implements
* This keeps track of the one adapter used for all {@link org.eclipse.papyrus.dd.dc.Bounds} instances.
* <!-- begin-user-doc
* --> <!-- end-user-doc -->
+ *
* @generated
*/
protected BoundsItemProvider boundsItemProvider;
@@ -138,14 +140,14 @@ public class DCItemProviderAdapterFactory extends DCAdapterFactory implements
/**
* This creates an adapter for a {@link org.eclipse.papyrus.dd.dc.Bounds}.
* <!-- begin-user-doc --> <!-- end-user-doc -->
+ *
* @generated
*/
@Override
public Adapter createBoundsAdapter() {
- if (boundsItemProvider == null) {
+ if(boundsItemProvider == null) {
boundsItemProvider = new BoundsItemProvider(this);
}
-
return boundsItemProvider;
}
@@ -165,13 +167,13 @@ public class DCItemProviderAdapterFactory extends DCAdapterFactory implements
*
* @generated
*/
- public void setParentAdapterFactory(
- ComposedAdapterFactory parentAdapterFactory) {
+ public void setParentAdapterFactory(ComposedAdapterFactory parentAdapterFactory) {
this.parentAdapterFactory = parentAdapterFactory;
}
/**
* <!-- begin-user-doc --> <!-- end-user-doc -->
+ *
* @generated
*/
@Override
@@ -182,6 +184,7 @@ public class DCItemProviderAdapterFactory extends DCAdapterFactory implements
/**
* This implementation substitutes the factory itself as the key for the adapter.
* <!-- begin-user-doc --> <!-- end-user-doc -->
+ *
* @generated
*/
@Override
@@ -191,23 +194,24 @@ public class DCItemProviderAdapterFactory extends DCAdapterFactory implements
/**
* <!-- begin-user-doc --> <!-- end-user-doc -->
+ *
* @generated
*/
@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;
}
}
-
return null;
}
/**
* This adds a listener.
* <!-- begin-user-doc --> <!-- end-user-doc -->
+ *
* @generated
*/
public void addListener(INotifyChangedListener notifyChangedListener) {
@@ -217,6 +221,7 @@ public class DCItemProviderAdapterFactory extends DCAdapterFactory implements
/**
* This removes a listener.
* <!-- begin-user-doc --> <!-- end-user-doc -->
+ *
* @generated
*/
public void removeListener(INotifyChangedListener notifyChangedListener) {
@@ -224,16 +229,14 @@ public class DCItemProviderAdapterFactory extends DCAdapterFactory implements
}
/**
- * This delegates to {@link #changeNotifier} and to
- * {@link #parentAdapterFactory}. <!-- begin-user-doc --> <!-- end-user-doc
+ * This delegates to {@link #changeNotifier} and to {@link #parentAdapterFactory}. <!-- begin-user-doc --> <!-- end-user-doc
* -->
*
* @generated
*/
public void fireNotifyChanged(Notification notification) {
changeNotifier.fireNotifyChanged(notification);
-
- if (parentAdapterFactory != null) {
+ if(parentAdapterFactory != null) {
parentAdapterFactory.fireNotifyChanged(notification);
}
}
@@ -245,9 +248,11 @@ public class DCItemProviderAdapterFactory extends DCAdapterFactory implements
* @generated
*/
public void dispose() {
- if (pointItemProvider != null) pointItemProvider.dispose();
- if (dimensionItemProvider != null) dimensionItemProvider.dispose();
- if (boundsItemProvider != null) boundsItemProvider.dispose();
+ if(pointItemProvider != null)
+ pointItemProvider.dispose();
+ if(dimensionItemProvider != null)
+ dimensionItemProvider.dispose();
+ if(boundsItemProvider != null)
+ boundsItemProvider.dispose();
}
-
}
diff --git a/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/src/org/eclipse/papyrus/dd/dc/provider/DimensionItemProvider.java b/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/src/org/eclipse/papyrus/dd/dc/provider/DimensionItemProvider.java
index cee9cbc..a386d6a 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
@@ -39,11 +39,10 @@ import org.eclipse.papyrus.dd.edit.DDEditPlugin;
* This is the item provider adapter for a {@link org.eclipse.papyrus.dd.dc.Dimension} object.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
+ *
* @generated
*/
-public class DimensionItemProvider extends ItemProviderAdapter implements
- IEditingDomainItemProvider, IStructuredItemContentProvider,
- ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource {
+public class DimensionItemProvider extends ItemProviderAdapter implements IEditingDomainItemProvider, IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource {
/**
* This constructs an instance from a factory and a notifier. <!--
@@ -63,9 +62,8 @@ public class DimensionItemProvider extends ItemProviderAdapter implements
*/
@Override
public List<IItemPropertyDescriptor> getPropertyDescriptors(Object object) {
- if (itemPropertyDescriptors == null) {
+ if(itemPropertyDescriptors == null) {
super.getPropertyDescriptors(object);
-
addWidthPropertyDescriptor(object);
addHeightPropertyDescriptor(object);
}
@@ -79,19 +77,7 @@ public class DimensionItemProvider extends ItemProviderAdapter implements
* @generated
*/
protected void addWidthPropertyDescriptor(Object object) {
- itemPropertyDescriptors.add
- (createItemPropertyDescriptor
- (((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
- getResourceLocator(),
- getString("_UI_Dimension_width_feature"),
- getString("_UI_PropertyDescriptor_description", "_UI_Dimension_width_feature", "_UI_Dimension_type"),
- DCPackage.Literals.DIMENSION__WIDTH,
- true,
- false,
- false,
- ItemPropertyDescriptor.REAL_VALUE_IMAGE,
- null,
- null));
+ itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(), getResourceLocator(), getString("_UI_Dimension_width_feature"), getString("_UI_PropertyDescriptor_description", "_UI_Dimension_width_feature", "_UI_Dimension_type"), DCPackage.Literals.DIMENSION__WIDTH, true, false, false, ItemPropertyDescriptor.REAL_VALUE_IMAGE, null, null));
}
/**
@@ -101,24 +87,13 @@ public class DimensionItemProvider extends ItemProviderAdapter implements
* @generated
*/
protected void addHeightPropertyDescriptor(Object object) {
- itemPropertyDescriptors.add
- (createItemPropertyDescriptor
- (((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
- getResourceLocator(),
- getString("_UI_Dimension_height_feature"),
- getString("_UI_PropertyDescriptor_description", "_UI_Dimension_height_feature", "_UI_Dimension_type"),
- DCPackage.Literals.DIMENSION__HEIGHT,
- true,
- false,
- false,
- ItemPropertyDescriptor.REAL_VALUE_IMAGE,
- null,
- null));
+ itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(), getResourceLocator(), getString("_UI_Dimension_height_feature"), getString("_UI_PropertyDescriptor_description", "_UI_Dimension_height_feature", "_UI_Dimension_type"), DCPackage.Literals.DIMENSION__HEIGHT, true, false, false, ItemPropertyDescriptor.REAL_VALUE_IMAGE, null, null));
}
/**
* This returns Dimension.gif.
* <!-- begin-user-doc --> <!-- end-user-doc -->
+ *
* @generated
*/
@Override
@@ -134,9 +109,8 @@ public class DimensionItemProvider extends ItemProviderAdapter implements
*/
@Override
public String getText(Object object) {
- Dimension dimension = (Dimension) object;
- return getString("_UI_Dimension_type") + " " + dimension.getWidth()
- + ", " + dimension.getHeight();
+ Dimension dimension = (Dimension)object;
+ return getString("_UI_Dimension_type") + " " + dimension.getWidth() + ", " + dimension.getHeight();
}
/**
@@ -144,17 +118,17 @@ public class DimensionItemProvider extends ItemProviderAdapter implements
* children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
* <!-- begin-user-doc --> <!--
* end-user-doc -->
+ *
* @generated
*/
@Override
public void notifyChanged(Notification notification) {
updateChildren(notification);
-
- switch (notification.getFeatureID(Dimension.class)) {
- case DCPackage.DIMENSION__WIDTH:
- case DCPackage.DIMENSION__HEIGHT:
- fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), false, true));
- return;
+ switch(notification.getFeatureID(Dimension.class)) {
+ case DCPackage.DIMENSION__WIDTH:
+ case DCPackage.DIMENSION__HEIGHT:
+ fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), false, true));
+ return;
}
super.notifyChanged(notification);
}
@@ -167,8 +141,7 @@ public class DimensionItemProvider extends ItemProviderAdapter implements
* @generated
*/
@Override
- protected void collectNewChildDescriptors(
- Collection<Object> newChildDescriptors, Object object) {
+ protected void collectNewChildDescriptors(Collection<Object> newChildDescriptors, Object object) {
super.collectNewChildDescriptors(newChildDescriptors, object);
}
@@ -182,5 +155,4 @@ public class DimensionItemProvider extends ItemProviderAdapter implements
public ResourceLocator getResourceLocator() {
return DDEditPlugin.INSTANCE;
}
-
}
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 dd0da37..cffbe9c 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
@@ -39,11 +39,10 @@ import org.eclipse.papyrus.dd.edit.DDEditPlugin;
* This is the item provider adapter for a {@link org.eclipse.papyrus.dd.dc.Point} object.
* <!-- begin-user-doc --> <!--
* end-user-doc -->
+ *
* @generated
*/
-public class PointItemProvider extends ItemProviderAdapter implements
- IEditingDomainItemProvider, IStructuredItemContentProvider,
- ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource {
+public class PointItemProvider extends ItemProviderAdapter implements IEditingDomainItemProvider, IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource {
/**
* This constructs an instance from a factory and a notifier. <!--
@@ -63,9 +62,8 @@ public class PointItemProvider extends ItemProviderAdapter implements
*/
@Override
public List<IItemPropertyDescriptor> getPropertyDescriptors(Object object) {
- if (itemPropertyDescriptors == null) {
+ if(itemPropertyDescriptors == null) {
super.getPropertyDescriptors(object);
-
addXPropertyDescriptor(object);
addYPropertyDescriptor(object);
}
@@ -76,49 +74,28 @@ public class PointItemProvider extends ItemProviderAdapter implements
* This adds a property descriptor for the X feature.
* <!-- begin-user-doc
* --> <!-- end-user-doc -->
+ *
* @generated
*/
protected void addXPropertyDescriptor(Object object) {
- itemPropertyDescriptors.add
- (createItemPropertyDescriptor
- (((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
- getResourceLocator(),
- getString("_UI_Point_x_feature"),
- getString("_UI_PropertyDescriptor_description", "_UI_Point_x_feature", "_UI_Point_type"),
- DCPackage.Literals.POINT__X,
- true,
- false,
- false,
- ItemPropertyDescriptor.REAL_VALUE_IMAGE,
- null,
- null));
+ itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(), getResourceLocator(), getString("_UI_Point_x_feature"), getString("_UI_PropertyDescriptor_description", "_UI_Point_x_feature", "_UI_Point_type"), DCPackage.Literals.POINT__X, true, false, false, ItemPropertyDescriptor.REAL_VALUE_IMAGE, null, null));
}
/**
* This adds a property descriptor for the Y feature.
* <!-- begin-user-doc
* --> <!-- end-user-doc -->
+ *
* @generated
*/
protected void addYPropertyDescriptor(Object object) {
- itemPropertyDescriptors.add
- (createItemPropertyDescriptor
- (((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
- getResourceLocator(),
- getString("_UI_Point_y_feature"),
- getString("_UI_PropertyDescriptor_description", "_UI_Point_y_feature", "_UI_Point_type"),
- DCPackage.Literals.POINT__Y,
- true,
- false,
- false,
- ItemPropertyDescriptor.REAL_VALUE_IMAGE,
- null,
- null));
+ itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(), getResourceLocator(), getString("_UI_Point_y_feature"), getString("_UI_PropertyDescriptor_description", "_UI_Point_y_feature", "_UI_Point_type"), DCPackage.Literals.POINT__Y, true, false, false, ItemPropertyDescriptor.REAL_VALUE_IMAGE, null, null));
}
/**
* This returns Point.gif.
* <!-- begin-user-doc --> <!-- end-user-doc -->
+ *
* @generated
*/
@Override
@@ -134,9 +111,8 @@ public class PointItemProvider extends ItemProviderAdapter implements
*/
@Override
public String getText(Object object) {
- Point point = (Point) object;
- return getString("_UI_Point_type") + " " + point.getX() + ", "
- + point.getY();
+ Point point = (Point)object;
+ return getString("_UI_Point_type") + " " + point.getX() + ", " + point.getY();
}
/**
@@ -144,17 +120,17 @@ public class PointItemProvider extends ItemProviderAdapter implements
* children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
* <!-- begin-user-doc --> <!--
* end-user-doc -->
+ *
* @generated
*/
@Override
public void notifyChanged(Notification notification) {
updateChildren(notification);
-
- switch (notification.getFeatureID(Point.class)) {
- case DCPackage.POINT__X:
- case DCPackage.POINT__Y:
- fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), false, true));
- return;
+ switch(notification.getFeatureID(Point.class)) {
+ case DCPackage.POINT__X:
+ case DCPackage.POINT__Y:
+ fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), false, true));
+ return;
}
super.notifyChanged(notification);
}
@@ -167,8 +143,7 @@ public class PointItemProvider extends ItemProviderAdapter implements
* @generated
*/
@Override
- protected void collectNewChildDescriptors(
- Collection<Object> newChildDescriptors, Object object) {
+ protected void collectNewChildDescriptors(Collection<Object> newChildDescriptors, Object object) {
super.collectNewChildDescriptors(newChildDescriptors, object);
}
@@ -182,5 +157,4 @@ public class PointItemProvider extends ItemProviderAdapter implements
public ResourceLocator getResourceLocator() {
return DDEditPlugin.INSTANCE;
}
-
}
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 3d5b314..b28a017 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
@@ -33,12 +33,11 @@ import org.eclipse.papyrus.dd.dg.DGPackage;
* This is the item provider adapter for a {@link org.eclipse.papyrus.dd.dg.Canvas} object.
* <!-- begin-user-doc --> <!--
* end-user-doc -->
+ *
* @generated
*/
-public class CanvasItemProvider extends GroupItemProvider implements
- IEditingDomainItemProvider, IStructuredItemContentProvider,
- ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource,
- IItemColorProvider, IItemFontProvider {
+public class CanvasItemProvider extends GroupItemProvider implements IEditingDomainItemProvider, IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource, IItemColorProvider, IItemFontProvider {
+
/**
* This constructs an instance from a factory and a notifier. <!--
* begin-user-doc --> <!-- end-user-doc -->
@@ -57,9 +56,8 @@ public class CanvasItemProvider extends GroupItemProvider implements
*/
@Override
public List<IItemPropertyDescriptor> getPropertyDescriptors(Object object) {
- if (itemPropertyDescriptors == null) {
+ if(itemPropertyDescriptors == null) {
super.getPropertyDescriptors(object);
-
}
return itemPropertyDescriptors;
}
@@ -69,12 +67,12 @@ public class CanvasItemProvider extends GroupItemProvider implements
* {@link org.eclipse.emf.edit.command.AddCommand}, {@link org.eclipse.emf.edit.command.RemoveCommand} or
* {@link org.eclipse.emf.edit.command.MoveCommand} in {@link #createCommand}.
* <!-- begin-user-doc --> <!-- end-user-doc -->
+ *
* @generated
*/
@Override
- public Collection<? extends EStructuralFeature> getChildrenFeatures(
- Object object) {
- if (childrenFeatures == null) {
+ public Collection<? extends EStructuralFeature> getChildrenFeatures(Object object) {
+ if(childrenFeatures == null) {
super.getChildrenFeatures(object);
childrenFeatures.add(DGPackage.Literals.CANVAS__BOUNDS);
}
@@ -83,19 +81,20 @@ public class CanvasItemProvider extends GroupItemProvider implements
/**
* <!-- begin-user-doc --> <!-- end-user-doc -->
+ *
* @generated
*/
@Override
protected EStructuralFeature getChildFeature(Object object, Object child) {
// Check the type of the specified child object and return the proper feature to use for
// adding (see {@link AddCommand}) it as a child.
-
return super.getChildFeature(object, child);
}
/**
* This returns Canvas.gif.
* <!-- begin-user-doc --> <!-- end-user-doc -->
+ *
* @generated
*/
@Override
@@ -107,14 +106,13 @@ public class CanvasItemProvider extends GroupItemProvider implements
* This returns the label text for the adapted class.
* <!-- begin-user-doc
* --> <!-- end-user-doc -->
+ *
* @generated
*/
@Override
public String getText(Object object) {
String label = ((Canvas)object).getId();
- return label == null || label.length() == 0 ?
- getString("_UI_Canvas_type") :
- getString("_UI_Canvas_type") + " " + label;
+ return label == null || label.length() == 0 ? getString("_UI_Canvas_type") : getString("_UI_Canvas_type") + " " + label;
}
/**
@@ -122,16 +120,16 @@ public class CanvasItemProvider extends GroupItemProvider implements
* children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
* <!-- begin-user-doc --> <!--
* end-user-doc -->
+ *
* @generated
*/
@Override
public void notifyChanged(Notification notification) {
updateChildren(notification);
-
- switch (notification.getFeatureID(Canvas.class)) {
- case DGPackage.CANVAS__BOUNDS:
- fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), true, false));
- return;
+ switch(notification.getFeatureID(Canvas.class)) {
+ case DGPackage.CANVAS__BOUNDS:
+ fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), true, false));
+ return;
}
super.notifyChanged(notification);
}
@@ -144,14 +142,8 @@ public class CanvasItemProvider extends GroupItemProvider implements
* @generated
*/
@Override
- protected void collectNewChildDescriptors(
- Collection<Object> newChildDescriptors, Object object) {
+ protected void collectNewChildDescriptors(Collection<Object> newChildDescriptors, Object object) {
super.collectNewChildDescriptors(newChildDescriptors, object);
-
- newChildDescriptors.add
- (createChildParameter
- (DGPackage.Literals.CANVAS__BOUNDS,
- DCFactory.eINSTANCE.createBounds()));
+ newChildDescriptors.add(createChildParameter(DGPackage.Literals.CANVAS__BOUNDS, DCFactory.eINSTANCE.createBounds()));
}
-
}
diff --git a/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/src/org/eclipse/papyrus/dd/dg/provider/CircleItemProvider.java b/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/src/org/eclipse/papyrus/dd/dg/provider/CircleItemProvider.java
index 6299674..3376cb7 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
@@ -40,12 +40,11 @@ import org.eclipse.papyrus.dd.dg.DGPackage;
* This is the item provider adapter for a {@link org.eclipse.papyrus.dd.dg.Circle} object.
* <!-- begin-user-doc --> <!--
* end-user-doc -->
+ *
* @generated
*/
-public class CircleItemProvider extends GraphicalElementItemProvider implements
- IEditingDomainItemProvider, IStructuredItemContentProvider,
- ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource,
- IItemColorProvider, IItemFontProvider {
+public class CircleItemProvider extends GraphicalElementItemProvider implements IEditingDomainItemProvider, IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource, IItemColorProvider, IItemFontProvider {
+
/**
* This constructs an instance from a factory and a notifier. <!--
* begin-user-doc --> <!-- end-user-doc -->
@@ -64,9 +63,8 @@ public class CircleItemProvider extends GraphicalElementItemProvider implements
*/
@Override
public List<IItemPropertyDescriptor> getPropertyDescriptors(Object object) {
- if (itemPropertyDescriptors == null) {
+ if(itemPropertyDescriptors == null) {
super.getPropertyDescriptors(object);
-
addRadiusPropertyDescriptor(object);
}
return itemPropertyDescriptors;
@@ -79,19 +77,7 @@ 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));
}
/**
@@ -99,12 +85,12 @@ public class CircleItemProvider extends GraphicalElementItemProvider implements
* {@link org.eclipse.emf.edit.command.AddCommand}, {@link org.eclipse.emf.edit.command.RemoveCommand} or
* {@link org.eclipse.emf.edit.command.MoveCommand} in {@link #createCommand}.
* <!-- begin-user-doc --> <!-- end-user-doc -->
+ *
* @generated
*/
@Override
- public Collection<? extends EStructuralFeature> getChildrenFeatures(
- Object object) {
- if (childrenFeatures == null) {
+ public Collection<? extends EStructuralFeature> getChildrenFeatures(Object object) {
+ if(childrenFeatures == null) {
super.getChildrenFeatures(object);
childrenFeatures.add(DGPackage.Literals.CIRCLE__CENTER);
}
@@ -113,19 +99,20 @@ public class CircleItemProvider extends GraphicalElementItemProvider implements
/**
* <!-- begin-user-doc --> <!-- end-user-doc -->
+ *
* @generated
*/
@Override
protected EStructuralFeature getChildFeature(Object object, Object child) {
// Check the type of the specified child object and return the proper feature to use for
// adding (see {@link AddCommand}) it as a child.
-
return super.getChildFeature(object, child);
}
/**
* This returns Circle.gif.
* <!-- begin-user-doc --> <!-- end-user-doc -->
+ *
* @generated
*/
@Override
@@ -137,14 +124,13 @@ public class CircleItemProvider extends GraphicalElementItemProvider implements
* This returns the label text for the adapted class.
* <!-- begin-user-doc
* --> <!-- end-user-doc -->
+ *
* @generated
*/
@Override
public String getText(Object object) {
String label = ((Circle)object).getId();
- return label == null || label.length() == 0 ?
- getString("_UI_Circle_type") :
- getString("_UI_Circle_type") + " " + label;
+ return label == null || label.length() == 0 ? getString("_UI_Circle_type") : getString("_UI_Circle_type") + " " + label;
}
/**
@@ -152,19 +138,19 @@ public class CircleItemProvider extends GraphicalElementItemProvider implements
* children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
* <!-- begin-user-doc --> <!--
* end-user-doc -->
+ *
* @generated
*/
@Override
public void notifyChanged(Notification notification) {
updateChildren(notification);
-
- switch (notification.getFeatureID(Circle.class)) {
- case DGPackage.CIRCLE__RADIUS:
- fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), false, true));
- return;
- case DGPackage.CIRCLE__CENTER:
- fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), true, false));
- return;
+ switch(notification.getFeatureID(Circle.class)) {
+ case DGPackage.CIRCLE__RADIUS:
+ fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), false, true));
+ return;
+ case DGPackage.CIRCLE__CENTER:
+ fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), true, false));
+ return;
}
super.notifyChanged(notification);
}
@@ -177,14 +163,8 @@ public class CircleItemProvider extends GraphicalElementItemProvider implements
* @generated
*/
@Override
- protected void collectNewChildDescriptors(
- Collection<Object> newChildDescriptors, Object object) {
+ protected void collectNewChildDescriptors(Collection<Object> newChildDescriptors, Object object) {
super.collectNewChildDescriptors(newChildDescriptors, object);
-
- newChildDescriptors.add
- (createChildParameter
- (DGPackage.Literals.CIRCLE__CENTER,
- DCFactory.eINSTANCE.createPoint()));
+ newChildDescriptors.add(createChildParameter(DGPackage.Literals.CIRCLE__CENTER, DCFactory.eINSTANCE.createPoint()));
}
-
}
diff --git a/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/src/org/eclipse/papyrus/dd/dg/provider/ClipPathItemProvider.java b/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/src/org/eclipse/papyrus/dd/dg/provider/ClipPathItemProvider.java
index f8f0e6f..e60df8c 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
@@ -32,12 +32,11 @@ import org.eclipse.papyrus.dd.dg.ClipPath;
* This is the item provider adapter for a {@link org.eclipse.papyrus.dd.dg.ClipPath} object.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
+ *
* @generated
*/
-public class ClipPathItemProvider extends GroupItemProvider implements
- IEditingDomainItemProvider, IStructuredItemContentProvider,
- ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource,
- IItemColorProvider, IItemFontProvider {
+public class ClipPathItemProvider extends GroupItemProvider implements IEditingDomainItemProvider, IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource, IItemColorProvider, IItemFontProvider {
+
/**
* This constructs an instance from a factory and a notifier. <!--
* begin-user-doc --> <!-- end-user-doc -->
@@ -56,9 +55,8 @@ public class ClipPathItemProvider extends GroupItemProvider implements
*/
@Override
public List<IItemPropertyDescriptor> getPropertyDescriptors(Object object) {
- if (itemPropertyDescriptors == null) {
+ if(itemPropertyDescriptors == null) {
super.getPropertyDescriptors(object);
-
}
return itemPropertyDescriptors;
}
@@ -66,6 +64,7 @@ public class ClipPathItemProvider extends GroupItemProvider implements
/**
* This returns ClipPath.gif.
* <!-- begin-user-doc --> <!-- end-user-doc -->
+ *
* @generated
*/
@Override
@@ -77,14 +76,13 @@ public class ClipPathItemProvider extends GroupItemProvider implements
* This returns the label text for the adapted class.
* <!-- begin-user-doc
* --> <!-- end-user-doc -->
+ *
* @generated
*/
@Override
public String getText(Object object) {
String label = ((ClipPath)object).getId();
- return label == null || label.length() == 0 ?
- getString("_UI_ClipPath_type") :
- getString("_UI_ClipPath_type") + " " + label;
+ return label == null || label.length() == 0 ? getString("_UI_ClipPath_type") : getString("_UI_ClipPath_type") + " " + label;
}
/**
@@ -92,6 +90,7 @@ public class ClipPathItemProvider extends GroupItemProvider implements
* children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
* <!-- begin-user-doc --> <!--
* end-user-doc -->
+ *
* @generated
*/
@Override
@@ -108,9 +107,7 @@ public class ClipPathItemProvider extends GroupItemProvider implements
* @generated
*/
@Override
- protected void collectNewChildDescriptors(
- Collection<Object> newChildDescriptors, Object object) {
+ protected void collectNewChildDescriptors(Collection<Object> newChildDescriptors, Object object) {
super.collectNewChildDescriptors(newChildDescriptors, object);
}
-
}
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 9dff16f..08a2131 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
@@ -32,12 +32,11 @@ import org.eclipse.papyrus.dd.dg.ClosePath;
* This is the item provider adapter for a {@link org.eclipse.papyrus.dd.dg.ClosePath} object.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
+ *
* @generated
*/
-public class ClosePathItemProvider extends PathCommandItemProvider implements
- IEditingDomainItemProvider, IStructuredItemContentProvider,
- ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource,
- IItemColorProvider, IItemFontProvider {
+public class ClosePathItemProvider extends PathCommandItemProvider implements IEditingDomainItemProvider, IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource, IItemColorProvider, IItemFontProvider {
+
/**
* This constructs an instance from a factory and a notifier. <!--
* begin-user-doc --> <!-- end-user-doc -->
@@ -56,9 +55,8 @@ public class ClosePathItemProvider extends PathCommandItemProvider implements
*/
@Override
public List<IItemPropertyDescriptor> getPropertyDescriptors(Object object) {
- if (itemPropertyDescriptors == null) {
+ if(itemPropertyDescriptors == null) {
super.getPropertyDescriptors(object);
-
}
return itemPropertyDescriptors;
}
@@ -66,6 +64,7 @@ public class ClosePathItemProvider extends PathCommandItemProvider implements
/**
* This returns ClosePath.gif.
* <!-- begin-user-doc --> <!-- end-user-doc -->
+ *
* @generated
*/
@Override
@@ -77,6 +76,7 @@ public class ClosePathItemProvider extends PathCommandItemProvider implements
* This returns the label text for the adapted class.
* <!-- begin-user-doc
* --> <!-- end-user-doc -->
+ *
* @generated
*/
@Override
@@ -90,6 +90,7 @@ public class ClosePathItemProvider extends PathCommandItemProvider implements
* children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
* <!-- begin-user-doc --> <!--
* end-user-doc -->
+ *
* @generated
*/
@Override
@@ -106,9 +107,7 @@ public class ClosePathItemProvider extends PathCommandItemProvider implements
* @generated
*/
@Override
- protected void collectNewChildDescriptors(
- Collection<Object> newChildDescriptors, Object object) {
+ protected void collectNewChildDescriptors(Collection<Object> newChildDescriptors, Object object) {
super.collectNewChildDescriptors(newChildDescriptors, object);
}
-
}
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 aeb1f0c..9703fa4 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
@@ -38,12 +38,11 @@ import org.eclipse.papyrus.dd.dg.DGPackage;
* This is the item provider adapter for a {@link org.eclipse.papyrus.dd.dg.CubicCurveTo} object.
* <!-- begin-user-doc
* --> <!-- end-user-doc -->
+ *
* @generated
*/
-public class CubicCurveToItemProvider extends PathCommandItemProvider implements
- IEditingDomainItemProvider, IStructuredItemContentProvider,
- ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource,
- IItemColorProvider, IItemFontProvider {
+public class CubicCurveToItemProvider extends PathCommandItemProvider implements IEditingDomainItemProvider, IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource, IItemColorProvider, IItemFontProvider {
+
/**
* This constructs an instance from a factory and a notifier. <!--
* begin-user-doc --> <!-- end-user-doc -->
@@ -62,9 +61,8 @@ public class CubicCurveToItemProvider extends PathCommandItemProvider implements
*/
@Override
public List<IItemPropertyDescriptor> getPropertyDescriptors(Object object) {
- if (itemPropertyDescriptors == null) {
+ if(itemPropertyDescriptors == null) {
super.getPropertyDescriptors(object);
-
}
return itemPropertyDescriptors;
}
@@ -74,12 +72,12 @@ public class CubicCurveToItemProvider extends PathCommandItemProvider implements
* {@link org.eclipse.emf.edit.command.AddCommand}, {@link org.eclipse.emf.edit.command.RemoveCommand} or
* {@link org.eclipse.emf.edit.command.MoveCommand} in {@link #createCommand}.
* <!-- begin-user-doc --> <!-- end-user-doc -->
+ *
* @generated
*/
@Override
- public Collection<? extends EStructuralFeature> getChildrenFeatures(
- Object object) {
- if (childrenFeatures == null) {
+ public Collection<? extends EStructuralFeature> getChildrenFeatures(Object object) {
+ if(childrenFeatures == null) {
super.getChildrenFeatures(object);
childrenFeatures.add(DGPackage.Literals.CUBIC_CURVE_TO__START_CONTROL);
childrenFeatures.add(DGPackage.Literals.CUBIC_CURVE_TO__END_CONTROL);
@@ -90,13 +88,13 @@ public class CubicCurveToItemProvider extends PathCommandItemProvider implements
/**
* <!-- begin-user-doc --> <!-- end-user-doc -->
+ *
* @generated
*/
@Override
protected EStructuralFeature getChildFeature(Object object, Object child) {
// Check the type of the specified child object and return the proper feature to use for
// adding (see {@link AddCommand}) it as a child.
-
return super.getChildFeature(object, child);
}
@@ -115,6 +113,7 @@ public class CubicCurveToItemProvider extends PathCommandItemProvider implements
* This returns the label text for the adapted class.
* <!-- begin-user-doc
* --> <!-- end-user-doc -->
+ *
* @generated
*/
@Override
@@ -128,18 +127,18 @@ public class CubicCurveToItemProvider extends PathCommandItemProvider implements
* children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
* <!-- begin-user-doc --> <!--
* end-user-doc -->
+ *
* @generated
*/
@Override
public void notifyChanged(Notification notification) {
updateChildren(notification);
-
- switch (notification.getFeatureID(CubicCurveTo.class)) {
- case DGPackage.CUBIC_CURVE_TO__START_CONTROL:
- case DGPackage.CUBIC_CURVE_TO__END_CONTROL:
- case DGPackage.CUBIC_CURVE_TO__POINT:
- fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), true, false));
- return;
+ 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:
+ fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), true, false));
+ return;
}
super.notifyChanged(notification);
}
@@ -152,50 +151,27 @@ public class CubicCurveToItemProvider extends PathCommandItemProvider implements
* @generated
*/
@Override
- protected void collectNewChildDescriptors(
- Collection<Object> newChildDescriptors, Object object) {
+ protected void collectNewChildDescriptors(Collection<Object> newChildDescriptors, Object object) {
super.collectNewChildDescriptors(newChildDescriptors, object);
-
- newChildDescriptors.add
- (createChildParameter
- (DGPackage.Literals.CUBIC_CURVE_TO__START_CONTROL,
- DCFactory.eINSTANCE.createPoint()));
-
- newChildDescriptors.add
- (createChildParameter
- (DGPackage.Literals.CUBIC_CURVE_TO__END_CONTROL,
- DCFactory.eINSTANCE.createPoint()));
-
- newChildDescriptors.add
- (createChildParameter
- (DGPackage.Literals.CUBIC_CURVE_TO__POINT,
- DCFactory.eINSTANCE.createPoint()));
+ newChildDescriptors.add(createChildParameter(DGPackage.Literals.CUBIC_CURVE_TO__START_CONTROL, DCFactory.eINSTANCE.createPoint()));
+ newChildDescriptors.add(createChildParameter(DGPackage.Literals.CUBIC_CURVE_TO__END_CONTROL, DCFactory.eINSTANCE.createPoint()));
+ newChildDescriptors.add(createChildParameter(DGPackage.Literals.CUBIC_CURVE_TO__POINT, DCFactory.eINSTANCE.createPoint()));
}
/**
- * This returns the label text for
- * {@link org.eclipse.emf.edit.command.CreateChildCommand}. <!--
+ * This returns the label text for {@link org.eclipse.emf.edit.command.CreateChildCommand}. <!--
* begin-user-doc --> <!-- end-user-doc -->
*
* @generated
*/
@Override
- public String getCreateChildText(Object owner, Object feature,
- Object child, Collection<?> selection) {
+ public String getCreateChildText(Object owner, Object feature, Object child, Collection<?> selection) {
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) });
+ boolean qualify = childFeature == DGPackage.Literals.CUBIC_CURVE_TO__START_CONTROL || childFeature == DGPackage.Literals.CUBIC_CURVE_TO__END_CONTROL || childFeature == DGPackage.Literals.CUBIC_CURVE_TO__POINT;
+ if(qualify) {
+ return getString("_UI_CreateChild_text2", new Object[]{ getTypeText(childObject), getFeatureText(childFeature), getTypeText(owner) });
}
return 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 e09cde6..8553f38 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
@@ -41,20 +41,21 @@ import org.eclipse.papyrus.dd.dg.util.DGAdapterFactory;
* Note that most of the adapters are shared among multiple instances.
* <!-- begin-user-doc --> <!--
* end-user-doc -->
+ *
* @generated
*/
-public class DGItemProviderAdapterFactory extends DGAdapterFactory implements
- ComposeableAdapterFactory, IChangeNotifier, IDisposable {
+public class DGItemProviderAdapterFactory extends DGAdapterFactory implements ComposeableAdapterFactory, IChangeNotifier, IDisposable {
+
/**
* This keeps track of the root adapter factory that delegates to this adapter factory.
* <!-- begin-user-doc --> <!-- end-user-doc -->
+ *
* @generated
*/
protected ComposedAdapterFactory parentAdapterFactory;
/**
- * This is used to implement
- * {@link org.eclipse.emf.edit.provider.IChangeNotifier}. <!--
+ * This is used to implement {@link org.eclipse.emf.edit.provider.IChangeNotifier}. <!--
* begin-user-doc --> <!-- end-user-doc -->
*
* @generated
@@ -65,6 +66,7 @@ public class DGItemProviderAdapterFactory extends DGAdapterFactory implements
* This keeps track of all the supported types checked by {@link #isFactoryForType isFactoryForType}.
* <!-- begin-user-doc --> <!--
* end-user-doc -->
+ *
* @generated
*/
protected Collection<Object> supportedTypes = new ArrayList<Object>();
@@ -89,6 +91,7 @@ public class DGItemProviderAdapterFactory extends DGAdapterFactory implements
* This keeps track of the one adapter used for all {@link org.eclipse.papyrus.dd.dg.Canvas} instances.
* <!-- begin-user-doc
* --> <!-- end-user-doc -->
+ *
* @generated
*/
protected CanvasItemProvider canvasItemProvider;
@@ -96,14 +99,14 @@ public class DGItemProviderAdapterFactory extends DGAdapterFactory implements
/**
* This creates an adapter for a {@link org.eclipse.papyrus.dd.dg.Canvas}.
* <!-- begin-user-doc --> <!-- end-user-doc -->
+ *
* @generated
*/
@Override
public Adapter createCanvasAdapter() {
- if (canvasItemProvider == null) {
+ if(canvasItemProvider == null) {
canvasItemProvider = new CanvasItemProvider(this);
}
-
return canvasItemProvider;
}
@@ -111,6 +114,7 @@ public class DGItemProviderAdapterFactory extends DGAdapterFactory implements
* This keeps track of the one adapter used for all {@link org.eclipse.papyrus.dd.dg.Group} instances.
* <!-- begin-user-doc
* --> <!-- end-user-doc -->
+ *
* @generated
*/
protected GroupItemProvider groupItemProvider;
@@ -118,14 +122,14 @@ public class DGItemProviderAdapterFactory extends DGAdapterFactory implements
/**
* This creates an adapter for a {@link org.eclipse.papyrus.dd.dg.Group}.
* <!-- begin-user-doc --> <!-- end-user-doc -->
+ *
* @generated
*/
@Override
public Adapter createGroupAdapter() {
- if (groupItemProvider == null) {
+ if(groupItemProvider == null) {
groupItemProvider = new GroupItemProvider(this);
}
-
return groupItemProvider;
}
@@ -133,6 +137,7 @@ public class DGItemProviderAdapterFactory extends DGAdapterFactory implements
* This keeps track of the one adapter used for all {@link org.eclipse.papyrus.dd.dg.MoveTo} instances.
* <!-- begin-user-doc
* --> <!-- end-user-doc -->
+ *
* @generated
*/
protected MoveToItemProvider moveToItemProvider;
@@ -140,14 +145,14 @@ public class DGItemProviderAdapterFactory extends DGAdapterFactory implements
/**
* This creates an adapter for a {@link org.eclipse.papyrus.dd.dg.MoveTo}.
* <!-- begin-user-doc --> <!-- end-user-doc -->
+ *
* @generated
*/
@Override
public Adapter createMoveToAdapter() {
- if (moveToItemProvider == null) {
+ if(moveToItemProvider == null) {
moveToItemProvider = new MoveToItemProvider(this);
}
-
return moveToItemProvider;
}
@@ -155,6 +160,7 @@ public class DGItemProviderAdapterFactory extends DGAdapterFactory implements
* This keeps track of the one adapter used for all {@link org.eclipse.papyrus.dd.dg.ClipPath} instances.
* <!-- begin-user-doc
* --> <!-- end-user-doc -->
+ *
* @generated
*/
protected ClipPathItemProvider clipPathItemProvider;
@@ -162,14 +168,14 @@ public class DGItemProviderAdapterFactory extends DGAdapterFactory implements
/**
* This creates an adapter for a {@link org.eclipse.papyrus.dd.dg.ClipPath}.
* <!-- begin-user-doc --> <!-- end-user-doc -->
+ *
* @generated
*/
@Override
public Adapter createClipPathAdapter() {
- if (clipPathItemProvider == null) {
+ if(clipPathItemProvider == null) {
clipPathItemProvider = new ClipPathItemProvider(this);
}
-
return clipPathItemProvider;
}
@@ -177,6 +183,7 @@ public class DGItemProviderAdapterFactory extends DGAdapterFactory implements
* This keeps track of the one adapter used for all {@link org.eclipse.papyrus.dd.dg.Style} instances.
* <!-- begin-user-doc
* --> <!-- end-user-doc -->
+ *
* @generated
*/
protected StyleItemProvider styleItemProvider;
@@ -184,14 +191,14 @@ public class DGItemProviderAdapterFactory extends DGAdapterFactory implements
/**
* This creates an adapter for a {@link org.eclipse.papyrus.dd.dg.Style}.
* <!-- begin-user-doc --> <!-- end-user-doc -->
+ *
* @generated
*/
@Override
public Adapter createStyleAdapter() {
- if (styleItemProvider == null) {
+ if(styleItemProvider == null) {
styleItemProvider = new StyleItemProvider(this);
}
-
return styleItemProvider;
}
@@ -199,6 +206,7 @@ public class DGItemProviderAdapterFactory extends DGAdapterFactory implements
* This keeps track of the one adapter used for all {@link org.eclipse.papyrus.dd.dg.Paint} instances.
* <!-- begin-user-doc
* --> <!-- end-user-doc -->
+ *
* @generated
*/
protected PaintItemProvider paintItemProvider;
@@ -206,14 +214,14 @@ public class DGItemProviderAdapterFactory extends DGAdapterFactory implements
/**
* This creates an adapter for a {@link org.eclipse.papyrus.dd.dg.Paint}.
* <!-- begin-user-doc --> <!-- end-user-doc -->
+ *
* @generated
*/
@Override
public Adapter createPaintAdapter() {
- if (paintItemProvider == null) {
+ if(paintItemProvider == null) {
paintItemProvider = new PaintItemProvider(this);
}
-
return paintItemProvider;
}
@@ -221,6 +229,7 @@ public class DGItemProviderAdapterFactory extends DGAdapterFactory implements
* This keeps track of the one adapter used for all {@link org.eclipse.papyrus.dd.dg.Circle} instances.
* <!-- begin-user-doc
* --> <!-- end-user-doc -->
+ *
* @generated
*/
protected CircleItemProvider circleItemProvider;
@@ -228,20 +237,19 @@ public class DGItemProviderAdapterFactory extends DGAdapterFactory implements
/**
* This creates an adapter for a {@link org.eclipse.papyrus.dd.dg.Circle}.
* <!-- begin-user-doc --> <!-- end-user-doc -->
+ *
* @generated
*/
@Override
public Adapter createCircleAdapter() {
- if (circleItemProvider == null) {
+ if(circleItemProvider == null) {
circleItemProvider = new CircleItemProvider(this);
}
-
return circleItemProvider;
}
/**
- * This keeps track of the one adapter used for all
- * {@link org.eclipse.papyrus.dd.dg.ClosePath} instances. <!--
+ * This keeps track of the one adapter used for all {@link org.eclipse.papyrus.dd.dg.ClosePath} instances. <!--
* begin-user-doc --> <!-- end-user-doc -->
*
* @generated
@@ -251,20 +259,19 @@ public class DGItemProviderAdapterFactory extends DGAdapterFactory implements
/**
* This creates an adapter for a {@link org.eclipse.papyrus.dd.dg.ClosePath}.
* <!-- begin-user-doc --> <!-- end-user-doc -->
+ *
* @generated
*/
@Override
public Adapter createClosePathAdapter() {
- if (closePathItemProvider == null) {
+ if(closePathItemProvider == null) {
closePathItemProvider = new ClosePathItemProvider(this);
}
-
return closePathItemProvider;
}
/**
- * This keeps track of the one adapter used for all
- * {@link org.eclipse.papyrus.dd.dg.CubicCurveTo} instances. <!--
+ * This keeps track of the one adapter used for all {@link org.eclipse.papyrus.dd.dg.CubicCurveTo} instances. <!--
* begin-user-doc --> <!-- end-user-doc -->
*
* @generated
@@ -275,20 +282,19 @@ public class DGItemProviderAdapterFactory extends DGAdapterFactory implements
* This creates an adapter for a {@link org.eclipse.papyrus.dd.dg.CubicCurveTo}.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
+ *
* @generated
*/
@Override
public Adapter createCubicCurveToAdapter() {
- if (cubicCurveToItemProvider == null) {
+ if(cubicCurveToItemProvider == null) {
cubicCurveToItemProvider = new CubicCurveToItemProvider(this);
}
-
return cubicCurveToItemProvider;
}
/**
- * This keeps track of the one adapter used for all
- * {@link org.eclipse.papyrus.dd.dg.Definitions} instances. <!--
+ * This keeps track of the one adapter used for all {@link org.eclipse.papyrus.dd.dg.Definitions} instances. <!--
* begin-user-doc --> <!-- end-user-doc -->
*
* @generated
@@ -299,20 +305,19 @@ public class DGItemProviderAdapterFactory extends DGAdapterFactory implements
* This creates an adapter for a {@link org.eclipse.papyrus.dd.dg.Definitions}.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
+ *
* @generated
*/
@Override
public Adapter createDefinitionsAdapter() {
- if (definitionsItemProvider == null) {
+ if(definitionsItemProvider == null) {
definitionsItemProvider = new DefinitionsItemProvider(this);
}
-
return definitionsItemProvider;
}
/**
- * This keeps track of the one adapter used for all
- * {@link org.eclipse.papyrus.dd.dg.StyleSheet} instances. <!--
+ * This keeps track of the one adapter used for all {@link org.eclipse.papyrus.dd.dg.StyleSheet} instances. <!--
* begin-user-doc --> <!-- end-user-doc -->
*
* @generated
@@ -323,20 +328,19 @@ public class DGItemProviderAdapterFactory extends DGAdapterFactory implements
* This creates an adapter for a {@link org.eclipse.papyrus.dd.dg.StyleSheet}.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
+ *
* @generated
*/
@Override
public Adapter createStyleSheetAdapter() {
- if (styleSheetItemProvider == null) {
+ if(styleSheetItemProvider == null) {
styleSheetItemProvider = new StyleSheetItemProvider(this);
}
-
return styleSheetItemProvider;
}
/**
- * This keeps track of the one adapter used for all
- * {@link org.eclipse.papyrus.dd.dg.StyleRule} instances. <!--
+ * This keeps track of the one adapter used for all {@link org.eclipse.papyrus.dd.dg.StyleRule} instances. <!--
* begin-user-doc --> <!-- end-user-doc -->
*
* @generated
@@ -346,20 +350,19 @@ public class DGItemProviderAdapterFactory extends DGAdapterFactory implements
/**
* This creates an adapter for a {@link org.eclipse.papyrus.dd.dg.StyleRule}.
* <!-- begin-user-doc --> <!-- end-user-doc -->
+ *
* @generated
*/
@Override
public Adapter createStyleRuleAdapter() {
- if (styleRuleItemProvider == null) {
+ if(styleRuleItemProvider == null) {
styleRuleItemProvider = new StyleRuleItemProvider(this);
}
-
return styleRuleItemProvider;
}
/**
- * This keeps track of the one adapter used for all
- * {@link org.eclipse.papyrus.dd.dg.StyleSelector} instances. <!--
+ * This keeps track of the one adapter used for all {@link org.eclipse.papyrus.dd.dg.StyleSelector} instances. <!--
* begin-user-doc --> <!-- end-user-doc -->
*
* @generated
@@ -370,14 +373,14 @@ public class DGItemProviderAdapterFactory extends DGAdapterFactory implements
* This creates an adapter for a {@link org.eclipse.papyrus.dd.dg.StyleSelector}.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
+ *
* @generated
*/
@Override
public Adapter createStyleSelectorAdapter() {
- if (styleSelectorItemProvider == null) {
+ if(styleSelectorItemProvider == null) {
styleSelectorItemProvider = new StyleSelectorItemProvider(this);
}
-
return styleSelectorItemProvider;
}
@@ -385,6 +388,7 @@ public class DGItemProviderAdapterFactory extends DGAdapterFactory implements
* This keeps track of the one adapter used for all {@link org.eclipse.papyrus.dd.dg.Ellipse} instances.
* <!-- begin-user-doc
* --> <!-- end-user-doc -->
+ *
* @generated
*/
protected EllipseItemProvider ellipseItemProvider;
@@ -392,20 +396,19 @@ public class DGItemProviderAdapterFactory extends DGAdapterFactory implements
/**
* This creates an adapter for a {@link org.eclipse.papyrus.dd.dg.Ellipse}.
* <!-- begin-user-doc --> <!-- end-user-doc -->
+ *
* @generated
*/
@Override
public Adapter createEllipseAdapter() {
- if (ellipseItemProvider == null) {
+ if(ellipseItemProvider == null) {
ellipseItemProvider = new EllipseItemProvider(this);
}
-
return ellipseItemProvider;
}
/**
- * This keeps track of the one adapter used for all
- * {@link org.eclipse.papyrus.dd.dg.EllipticalArcTo} instances. <!--
+ * This keeps track of the one adapter used for all {@link org.eclipse.papyrus.dd.dg.EllipticalArcTo} instances. <!--
* begin-user-doc --> <!-- end-user-doc -->
*
* @generated
@@ -416,20 +419,19 @@ public class DGItemProviderAdapterFactory extends DGAdapterFactory implements
* This creates an adapter for a {@link org.eclipse.papyrus.dd.dg.EllipticalArcTo}.
* <!-- begin-user-doc
* --> <!-- end-user-doc -->
+ *
* @generated
*/
@Override
public Adapter createEllipticalArcToAdapter() {
- if (ellipticalArcToItemProvider == null) {
+ if(ellipticalArcToItemProvider == null) {
ellipticalArcToItemProvider = new EllipticalArcToItemProvider(this);
}
-
return ellipticalArcToItemProvider;
}
/**
- * This keeps track of the one adapter used for all
- * {@link org.eclipse.papyrus.dd.dg.QuadraticCurveTo} instances. <!--
+ * This keeps track of the one adapter used for all {@link org.eclipse.papyrus.dd.dg.QuadraticCurveTo} instances. <!--
* begin-user-doc --> <!-- end-user-doc -->
*
* @generated
@@ -440,20 +442,19 @@ public class DGItemProviderAdapterFactory extends DGAdapterFactory implements
* This creates an adapter for a {@link org.eclipse.papyrus.dd.dg.QuadraticCurveTo}.
* <!-- begin-user-doc
* --> <!-- end-user-doc -->
+ *
* @generated
*/
@Override
public Adapter createQuadraticCurveToAdapter() {
- if (quadraticCurveToItemProvider == null) {
+ if(quadraticCurveToItemProvider == null) {
quadraticCurveToItemProvider = new QuadraticCurveToItemProvider(this);
}
-
return quadraticCurveToItemProvider;
}
/**
- * This keeps track of the one adapter used for all
- * {@link org.eclipse.papyrus.dd.dg.GradientStop} instances. <!--
+ * This keeps track of the one adapter used for all {@link org.eclipse.papyrus.dd.dg.GradientStop} instances. <!--
* begin-user-doc --> <!-- end-user-doc -->
*
* @generated
@@ -464,14 +465,14 @@ public class DGItemProviderAdapterFactory extends DGAdapterFactory implements
* This creates an adapter for a {@link org.eclipse.papyrus.dd.dg.GradientStop}.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
+ *
* @generated
*/
@Override
public Adapter createGradientStopAdapter() {
- if (gradientStopItemProvider == null) {
+ if(gradientStopItemProvider == null) {
gradientStopItemProvider = new GradientStopItemProvider(this);
}
-
return gradientStopItemProvider;
}
@@ -479,6 +480,7 @@ public class DGItemProviderAdapterFactory extends DGAdapterFactory implements
* This keeps track of the one adapter used for all {@link org.eclipse.papyrus.dd.dg.Image} instances.
* <!-- begin-user-doc
* --> <!-- end-user-doc -->
+ *
* @generated
*/
protected ImageItemProvider imageItemProvider;
@@ -486,14 +488,14 @@ public class DGItemProviderAdapterFactory extends DGAdapterFactory implements
/**
* This creates an adapter for a {@link org.eclipse.papyrus.dd.dg.Image}.
* <!-- begin-user-doc --> <!-- end-user-doc -->
+ *
* @generated
*/
@Override
public Adapter createImageAdapter() {
- if (imageItemProvider == null) {
+ if(imageItemProvider == null) {
imageItemProvider = new ImageItemProvider(this);
}
-
return imageItemProvider;
}
@@ -501,6 +503,7 @@ public class DGItemProviderAdapterFactory extends DGAdapterFactory implements
* This keeps track of the one adapter used for all {@link org.eclipse.papyrus.dd.dg.Line} instances.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
+ *
* @generated
*/
protected LineItemProvider lineItemProvider;
@@ -508,14 +511,14 @@ public class DGItemProviderAdapterFactory extends DGAdapterFactory implements
/**
* This creates an adapter for a {@link org.eclipse.papyrus.dd.dg.Line}.
* <!-- begin-user-doc --> <!-- end-user-doc -->
+ *
* @generated
*/
@Override
public Adapter createLineAdapter() {
- if (lineItemProvider == null) {
+ if(lineItemProvider == null) {
lineItemProvider = new LineItemProvider(this);
}
-
return lineItemProvider;
}
@@ -523,6 +526,7 @@ public class DGItemProviderAdapterFactory extends DGAdapterFactory implements
* This keeps track of the one adapter used for all {@link org.eclipse.papyrus.dd.dg.Marker} instances.
* <!-- begin-user-doc
* --> <!-- end-user-doc -->
+ *
* @generated
*/
protected MarkerItemProvider markerItemProvider;
@@ -530,20 +534,19 @@ public class DGItemProviderAdapterFactory extends DGAdapterFactory implements
/**
* This creates an adapter for a {@link org.eclipse.papyrus.dd.dg.Marker}.
* <!-- begin-user-doc --> <!-- end-user-doc -->
+ *
* @generated
*/
@Override
public Adapter createMarkerAdapter() {
- if (markerItemProvider == null) {
+ if(markerItemProvider == null) {
markerItemProvider = new MarkerItemProvider(this);
}
-
return markerItemProvider;
}
/**
- * This keeps track of the one adapter used for all
- * {@link org.eclipse.papyrus.dd.dg.LinearGradient} instances. <!--
+ * This keeps track of the one adapter used for all {@link org.eclipse.papyrus.dd.dg.LinearGradient} instances. <!--
* begin-user-doc --> <!-- end-user-doc -->
*
* @generated
@@ -554,14 +557,14 @@ public class DGItemProviderAdapterFactory extends DGAdapterFactory implements
* This creates an adapter for a {@link org.eclipse.papyrus.dd.dg.LinearGradient}.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
+ *
* @generated
*/
@Override
public Adapter createLinearGradientAdapter() {
- if (linearGradientItemProvider == null) {
+ if(linearGradientItemProvider == null) {
linearGradientItemProvider = new LinearGradientItemProvider(this);
}
-
return linearGradientItemProvider;
}
@@ -569,6 +572,7 @@ public class DGItemProviderAdapterFactory extends DGAdapterFactory implements
* This keeps track of the one adapter used for all {@link org.eclipse.papyrus.dd.dg.LineTo} instances.
* <!-- begin-user-doc
* --> <!-- end-user-doc -->
+ *
* @generated
*/
protected LineToItemProvider lineToItemProvider;
@@ -576,14 +580,14 @@ public class DGItemProviderAdapterFactory extends DGAdapterFactory implements
/**
* This creates an adapter for a {@link org.eclipse.papyrus.dd.dg.LineTo}.
* <!-- begin-user-doc --> <!-- end-user-doc -->
+ *
* @generated
*/
@Override
public Adapter createLineToAdapter() {
- if (lineToItemProvider == null) {
+ if(lineToItemProvider == null) {
lineToItemProvider = new LineToItemProvider(this);
}
-
return lineToItemProvider;
}
@@ -591,6 +595,7 @@ public class DGItemProviderAdapterFactory extends DGAdapterFactory implements
* This keeps track of the one adapter used for all {@link org.eclipse.papyrus.dd.dg.Matrix} instances.
* <!-- begin-user-doc
* --> <!-- end-user-doc -->
+ *
* @generated
*/
protected MatrixItemProvider matrixItemProvider;
@@ -598,14 +603,14 @@ public class DGItemProviderAdapterFactory extends DGAdapterFactory implements
/**
* This creates an adapter for a {@link org.eclipse.papyrus.dd.dg.Matrix}.
* <!-- begin-user-doc --> <!-- end-user-doc -->
+ *
* @generated
*/
@Override
public Adapter createMatrixAdapter() {
- if (matrixItemProvider == null) {
+ if(matrixItemProvider == null) {
matrixItemProvider = new MatrixItemProvider(this);
}
-
return matrixItemProvider;
}
@@ -613,6 +618,7 @@ public class DGItemProviderAdapterFactory extends DGAdapterFactory implements
* This keeps track of the one adapter used for all {@link org.eclipse.papyrus.dd.dg.Path} instances.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
+ *
* @generated
*/
protected PathItemProvider pathItemProvider;
@@ -620,14 +626,14 @@ public class DGItemProviderAdapterFactory extends DGAdapterFactory implements
/**
* This creates an adapter for a {@link org.eclipse.papyrus.dd.dg.Path}.
* <!-- begin-user-doc --> <!-- end-user-doc -->
+ *
* @generated
*/
@Override
public Adapter createPathAdapter() {
- if (pathItemProvider == null) {
+ if(pathItemProvider == null) {
pathItemProvider = new PathItemProvider(this);
}
-
return pathItemProvider;
}
@@ -635,6 +641,7 @@ public class DGItemProviderAdapterFactory extends DGAdapterFactory implements
* This keeps track of the one adapter used for all {@link org.eclipse.papyrus.dd.dg.Pattern} instances.
* <!-- begin-user-doc
* --> <!-- end-user-doc -->
+ *
* @generated
*/
protected PatternItemProvider patternItemProvider;
@@ -642,14 +649,14 @@ public class DGItemProviderAdapterFactory extends DGAdapterFactory implements
/**
* This creates an adapter for a {@link org.eclipse.papyrus.dd.dg.Pattern}.
* <!-- begin-user-doc --> <!-- end-user-doc -->
+ *
* @generated
*/
@Override
public Adapter createPatternAdapter() {
- if (patternItemProvider == null) {
+ if(patternItemProvider == null) {
patternItemProvider = new PatternItemProvider(this);
}
-
return patternItemProvider;
}
@@ -657,6 +664,7 @@ public class DGItemProviderAdapterFactory extends DGAdapterFactory implements
* This keeps track of the one adapter used for all {@link org.eclipse.papyrus.dd.dg.Polygon} instances.
* <!-- begin-user-doc
* --> <!-- end-user-doc -->
+ *
* @generated
*/
protected PolygonItemProvider polygonItemProvider;
@@ -664,14 +672,14 @@ public class DGItemProviderAdapterFactory extends DGAdapterFactory implements
/**
* This creates an adapter for a {@link org.eclipse.papyrus.dd.dg.Polygon}.
* <!-- begin-user-doc --> <!-- end-user-doc -->
+ *
* @generated
*/
@Override
public Adapter createPolygonAdapter() {
- if (polygonItemProvider == null) {
+ if(polygonItemProvider == null) {
polygonItemProvider = new PolygonItemProvider(this);
}
-
return polygonItemProvider;
}
@@ -679,6 +687,7 @@ public class DGItemProviderAdapterFactory extends DGAdapterFactory implements
* This keeps track of the one adapter used for all {@link org.eclipse.papyrus.dd.dg.Polyline} instances.
* <!-- begin-user-doc
* --> <!-- end-user-doc -->
+ *
* @generated
*/
protected PolylineItemProvider polylineItemProvider;
@@ -686,20 +695,19 @@ public class DGItemProviderAdapterFactory extends DGAdapterFactory implements
/**
* This creates an adapter for a {@link org.eclipse.papyrus.dd.dg.Polyline}.
* <!-- begin-user-doc --> <!-- end-user-doc -->
+ *
* @generated
*/
@Override
public Adapter createPolylineAdapter() {
- if (polylineItemProvider == null) {
+ if(polylineItemProvider == null) {
polylineItemProvider = new PolylineItemProvider(this);
}
-
return polylineItemProvider;
}
/**
- * This keeps track of the one adapter used for all
- * {@link org.eclipse.papyrus.dd.dg.RadialGradient} instances. <!--
+ * This keeps track of the one adapter used for all {@link org.eclipse.papyrus.dd.dg.RadialGradient} instances. <!--
* begin-user-doc --> <!-- end-user-doc -->
*
* @generated
@@ -710,20 +718,19 @@ public class DGItemProviderAdapterFactory extends DGAdapterFactory implements
* This creates an adapter for a {@link org.eclipse.papyrus.dd.dg.RadialGradient}.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
+ *
* @generated
*/
@Override
public Adapter createRadialGradientAdapter() {
- if (radialGradientItemProvider == null) {
+ if(radialGradientItemProvider == null) {
radialGradientItemProvider = new RadialGradientItemProvider(this);
}
-
return radialGradientItemProvider;
}
/**
- * This keeps track of the one adapter used for all
- * {@link org.eclipse.papyrus.dd.dg.Rectangle} instances. <!--
+ * This keeps track of the one adapter used for all {@link org.eclipse.papyrus.dd.dg.Rectangle} instances. <!--
* begin-user-doc --> <!-- end-user-doc -->
*
* @generated
@@ -733,20 +740,19 @@ public class DGItemProviderAdapterFactory extends DGAdapterFactory implements
/**
* This creates an adapter for a {@link org.eclipse.papyrus.dd.dg.Rectangle}.
* <!-- begin-user-doc --> <!-- end-user-doc -->
+ *
* @generated
*/
@Override
public Adapter createRectangleAdapter() {
- if (rectangleItemProvider == null) {
+ if(rectangleItemProvider == null) {
rectangleItemProvider = new RectangleItemProvider(this);
}
-
return rectangleItemProvider;
}
/**
- * This keeps track of the one adapter used for all
- * {@link org.eclipse.papyrus.dd.dg.RootCanvas} instances. <!--
+ * This keeps track of the one adapter used for all {@link org.eclipse.papyrus.dd.dg.RootCanvas} instances. <!--
* begin-user-doc --> <!-- end-user-doc -->
*
* @generated
@@ -757,14 +763,14 @@ public class DGItemProviderAdapterFactory extends DGAdapterFactory implements
* This creates an adapter for a {@link org.eclipse.papyrus.dd.dg.RootCanvas}.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
+ *
* @generated
*/
@Override
public Adapter createRootCanvasAdapter() {
- if (rootCanvasItemProvider == null) {
+ if(rootCanvasItemProvider == null) {
rootCanvasItemProvider = new RootCanvasItemProvider(this);
}
-
return rootCanvasItemProvider;
}
@@ -772,6 +778,7 @@ public class DGItemProviderAdapterFactory extends DGAdapterFactory implements
* This keeps track of the one adapter used for all {@link org.eclipse.papyrus.dd.dg.Rotate} instances.
* <!-- begin-user-doc
* --> <!-- end-user-doc -->
+ *
* @generated
*/
protected RotateItemProvider rotateItemProvider;
@@ -779,14 +786,14 @@ public class DGItemProviderAdapterFactory extends DGAdapterFactory implements
/**
* This creates an adapter for a {@link org.eclipse.papyrus.dd.dg.Rotate}.
* <!-- begin-user-doc --> <!-- end-user-doc -->
+ *
* @generated
*/
@Override
public Adapter createRotateAdapter() {
- if (rotateItemProvider == null) {
+ if(rotateItemProvider == null) {
rotateItemProvider = new RotateItemProvider(this);
}
-
return rotateItemProvider;
}
@@ -794,6 +801,7 @@ public class DGItemProviderAdapterFactory extends DGAdapterFactory implements
* This keeps track of the one adapter used for all {@link org.eclipse.papyrus.dd.dg.Scale} instances.
* <!-- begin-user-doc
* --> <!-- end-user-doc -->
+ *
* @generated
*/
protected ScaleItemProvider scaleItemProvider;
@@ -801,14 +809,14 @@ public class DGItemProviderAdapterFactory extends DGAdapterFactory implements
/**
* This creates an adapter for a {@link org.eclipse.papyrus.dd.dg.Scale}.
* <!-- begin-user-doc --> <!-- end-user-doc -->
+ *
* @generated
*/
@Override
public Adapter createScaleAdapter() {
- if (scaleItemProvider == null) {
+ if(scaleItemProvider == null) {
scaleItemProvider = new ScaleItemProvider(this);
}
-
return scaleItemProvider;
}
@@ -816,6 +824,7 @@ public class DGItemProviderAdapterFactory extends DGAdapterFactory implements
* This keeps track of the one adapter used for all {@link org.eclipse.papyrus.dd.dg.Skew} instances.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
+ *
* @generated
*/
protected SkewItemProvider skewItemProvider;
@@ -823,14 +832,14 @@ public class DGItemProviderAdapterFactory extends DGAdapterFactory implements
/**
* This creates an adapter for a {@link org.eclipse.papyrus.dd.dg.Skew}.
* <!-- begin-user-doc --> <!-- end-user-doc -->
+ *
* @generated
*/
@Override
public Adapter createSkewAdapter() {
- if (skewItemProvider == null) {
+ if(skewItemProvider == null) {
skewItemProvider = new SkewItemProvider(this);
}
-
return skewItemProvider;
}
@@ -838,6 +847,7 @@ public class DGItemProviderAdapterFactory extends DGAdapterFactory implements
* This keeps track of the one adapter used for all {@link org.eclipse.papyrus.dd.dg.Text} instances.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
+ *
* @generated
*/
protected TextItemProvider textItemProvider;
@@ -845,20 +855,19 @@ public class DGItemProviderAdapterFactory extends DGAdapterFactory implements
/**
* This creates an adapter for a {@link org.eclipse.papyrus.dd.dg.Text}.
* <!-- begin-user-doc --> <!-- end-user-doc -->
+ *
* @generated
*/
@Override
public Adapter createTextAdapter() {
- if (textItemProvider == null) {
+ if(textItemProvider == null) {
textItemProvider = new TextItemProvider(this);
}
-
return textItemProvider;
}
/**
- * This keeps track of the one adapter used for all
- * {@link org.eclipse.papyrus.dd.dg.Translate} instances. <!--
+ * This keeps track of the one adapter used for all {@link org.eclipse.papyrus.dd.dg.Translate} instances. <!--
* begin-user-doc --> <!-- end-user-doc -->
*
* @generated
@@ -868,14 +877,14 @@ public class DGItemProviderAdapterFactory extends DGAdapterFactory implements
/**
* This creates an adapter for a {@link org.eclipse.papyrus.dd.dg.Translate}.
* <!-- begin-user-doc --> <!-- end-user-doc -->
+ *
* @generated
*/
@Override
public Adapter createTranslateAdapter() {
- if (translateItemProvider == null) {
+ if(translateItemProvider == null) {
translateItemProvider = new TranslateItemProvider(this);
}
-
return translateItemProvider;
}
@@ -883,6 +892,7 @@ public class DGItemProviderAdapterFactory extends DGAdapterFactory implements
* This keeps track of the one adapter used for all {@link org.eclipse.papyrus.dd.dg.Use} instances.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
+ *
* @generated
*/
protected UseItemProvider useItemProvider;
@@ -895,10 +905,9 @@ public class DGItemProviderAdapterFactory extends DGAdapterFactory implements
*/
@Override
public Adapter createUseAdapter() {
- if (useItemProvider == null) {
+ if(useItemProvider == null) {
useItemProvider = new UseItemProvider(this);
}
-
return useItemProvider;
}
@@ -918,13 +927,13 @@ public class DGItemProviderAdapterFactory extends DGAdapterFactory implements
*
* @generated
*/
- public void setParentAdapterFactory(
- ComposedAdapterFactory parentAdapterFactory) {
+ public void setParentAdapterFactory(ComposedAdapterFactory parentAdapterFactory) {
this.parentAdapterFactory = parentAdapterFactory;
}
/**
* <!-- begin-user-doc --> <!-- end-user-doc -->
+ *
* @generated
*/
@Override
@@ -935,6 +944,7 @@ public class DGItemProviderAdapterFactory extends DGAdapterFactory implements
/**
* This implementation substitutes the factory itself as the key for the adapter.
* <!-- begin-user-doc --> <!-- end-user-doc -->
+ *
* @generated
*/
@Override
@@ -944,23 +954,24 @@ public class DGItemProviderAdapterFactory extends DGAdapterFactory implements
/**
* <!-- begin-user-doc --> <!-- end-user-doc -->
+ *
* @generated
*/
@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;
}
}
-
return null;
}
/**
* This adds a listener.
* <!-- begin-user-doc --> <!-- end-user-doc -->
+ *
* @generated
*/
public void addListener(INotifyChangedListener notifyChangedListener) {
@@ -970,6 +981,7 @@ public class DGItemProviderAdapterFactory extends DGAdapterFactory implements
/**
* This removes a listener.
* <!-- begin-user-doc --> <!-- end-user-doc -->
+ *
* @generated
*/
public void removeListener(INotifyChangedListener notifyChangedListener) {
@@ -977,16 +989,14 @@ public class DGItemProviderAdapterFactory extends DGAdapterFactory implements
}
/**
- * This delegates to {@link #changeNotifier} and to
- * {@link #parentAdapterFactory}. <!-- begin-user-doc --> <!-- end-user-doc
+ * This delegates to {@link #changeNotifier} and to {@link #parentAdapterFactory}. <!-- begin-user-doc --> <!-- end-user-doc
* -->
*
* @generated
*/
public void fireNotifyChanged(Notification notification) {
changeNotifier.fireNotifyChanged(notification);
-
- if (parentAdapterFactory != null) {
+ if(parentAdapterFactory != null) {
parentAdapterFactory.fireNotifyChanged(notification);
}
}
@@ -998,42 +1008,77 @@ public class DGItemProviderAdapterFactory extends DGAdapterFactory implements
* @generated
*/
public void dispose() {
- if (canvasItemProvider != null) canvasItemProvider.dispose();
- if (groupItemProvider != null) groupItemProvider.dispose();
- if (moveToItemProvider != null) moveToItemProvider.dispose();
- if (clipPathItemProvider != null) clipPathItemProvider.dispose();
- if (styleItemProvider != null) styleItemProvider.dispose();
- if (paintItemProvider != null) paintItemProvider.dispose();
- if (circleItemProvider != null) circleItemProvider.dispose();
- if (closePathItemProvider != null) closePathItemProvider.dispose();
- if (cubicCurveToItemProvider != null) cubicCurveToItemProvider.dispose();
- if (definitionsItemProvider != null) definitionsItemProvider.dispose();
- if (styleSheetItemProvider != null) styleSheetItemProvider.dispose();
- if (styleRuleItemProvider != null) styleRuleItemProvider.dispose();
- if (styleSelectorItemProvider != null) styleSelectorItemProvider.dispose();
- if (ellipseItemProvider != null) ellipseItemProvider.dispose();
- if (ellipticalArcToItemProvider != null) ellipticalArcToItemProvider.dispose();
- if (quadraticCurveToItemProvider != null) quadraticCurveToItemProvider.dispose();
- if (gradientStopItemProvider != null) gradientStopItemProvider.dispose();
- if (imageItemProvider != null) imageItemProvider.dispose();
- if (lineItemProvider != null) lineItemProvider.dispose();
- if (markerItemProvider != null) markerItemProvider.dispose();
- if (linearGradientItemProvider != null) linearGradientItemProvider.dispose();
- if (lineToItemProvider != null) lineToItemProvider.dispose();
- if (matrixItemProvider != null) matrixItemProvider.dispose();
- if (pathItemProvider != null) pathItemProvider.dispose();
- if (patternItemProvider != null) patternItemProvider.dispose();
- if (polygonItemProvider != null) polygonItemProvider.dispose();
- if (polylineItemProvider != null) polylineItemProvider.dispose();
- if (radialGradientItemProvider != null) radialGradientItemProvider.dispose();
- if (rectangleItemProvider != null) rectangleItemProvider.dispose();
- if (rootCanvasItemProvider != null) rootCanvasItemProvider.dispose();
- if (rotateItemProvider != null) rotateItemProvider.dispose();
- if (scaleItemProvider != null) scaleItemProvider.dispose();
- if (skewItemProvider != null) skewItemProvider.dispose();
- if (textItemProvider != null) textItemProvider.dispose();
- if (translateItemProvider != null) translateItemProvider.dispose();
- if (useItemProvider != null) useItemProvider.dispose();
+ if(canvasItemProvider != null)
+ canvasItemProvider.dispose();
+ if(groupItemProvider != null)
+ groupItemProvider.dispose();
+ if(moveToItemProvider != null)
+ moveToItemProvider.dispose();
+ if(clipPathItemProvider != null)
+ clipPathItemProvider.dispose();
+ if(styleItemProvider != null)
+ styleItemProvider.dispose();
+ if(paintItemProvider != null)
+ paintItemProvider.dispose();
+ if(circleItemProvider != null)
+ circleItemProvider.dispose();
+ if(closePathItemProvider != null)
+ closePathItemProvider.dispose();
+ if(cubicCurveToItemProvider != null)
+ cubicCurveToItemProvider.dispose();
+ if(definitionsItemProvider != null)
+ definitionsItemProvider.dispose();
+ if(styleSheetItemProvider != null)
+ styleSheetItemProvider.dispose();
+ if(styleRuleItemProvider != null)
+ styleRuleItemProvider.dispose();
+ if(styleSelectorItemProvider != null)
+ styleSelectorItemProvider.dispose();
+ if(ellipseItemProvider != null)
+ ellipseItemProvider.dispose();
+ if(ellipticalArcToItemProvider != null)
+ ellipticalArcToItemProvider.dispose();
+ if(quadraticCurveToItemProvider != null)
+ quadraticCurveToItemProvider.dispose();
+ if(gradientStopItemProvider != null)
+ gradientStopItemProvider.dispose();
+ if(imageItemProvider != null)
+ imageItemProvider.dispose();
+ if(lineItemProvider != null)
+ lineItemProvider.dispose();
+ if(markerItemProvider != null)
+ markerItemProvider.dispose();
+ if(linearGradientItemProvider != null)
+ linearGradientItemProvider.dispose();
+ if(lineToItemProvider != null)
+ lineToItemProvider.dispose();
+ if(matrixItemProvider != null)
+ matrixItemProvider.dispose();
+ if(pathItemProvider != null)
+ pathItemProvider.dispose();
+ if(patternItemProvider != null)
+ patternItemProvider.dispose();
+ if(polygonItemProvider != null)
+ polygonItemProvider.dispose();
+ if(polylineItemProvider != null)
+ polylineItemProvider.dispose();
+ if(radialGradientItemProvider != null)
+ radialGradientItemProvider.dispose();
+ if(rectangleItemProvider != null)
+ rectangleItemProvider.dispose();
+ if(rootCanvasItemProvider != null)
+ rootCanvasItemProvider.dispose();
+ if(rotateItemProvider != null)
+ rotateItemProvider.dispose();
+ if(scaleItemProvider != null)
+ scaleItemProvider.dispose();
+ if(skewItemProvider != null)
+ skewItemProvider.dispose();
+ if(textItemProvider != null)
+ textItemProvider.dispose();
+ if(translateItemProvider != null)
+ translateItemProvider.dispose();
+ if(useItemProvider != null)
+ useItemProvider.dispose();
}
-
}
diff --git a/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/src/org/eclipse/papyrus/dd/dg/provider/DefinitionItemProvider.java b/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/src/org/eclipse/papyrus/dd/dg/provider/DefinitionItemProvider.java
index d334d2f..bfb6ca0 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
@@ -41,12 +41,11 @@ import org.eclipse.papyrus.dd.edit.DDEditPlugin;
* This is the item provider adapter for a {@link org.eclipse.papyrus.dd.dg.Definition} object.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
+ *
* @generated
*/
-public class DefinitionItemProvider extends ItemProviderAdapter implements
- IEditingDomainItemProvider, IStructuredItemContentProvider,
- ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource,
- IItemColorProvider, IItemFontProvider {
+public class DefinitionItemProvider extends ItemProviderAdapter implements IEditingDomainItemProvider, IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource, IItemColorProvider, IItemFontProvider {
+
/**
* This constructs an instance from a factory and a notifier. <!--
* begin-user-doc --> <!-- end-user-doc -->
@@ -65,9 +64,8 @@ public class DefinitionItemProvider extends ItemProviderAdapter implements
*/
@Override
public List<IItemPropertyDescriptor> getPropertyDescriptors(Object object) {
- if (itemPropertyDescriptors == null) {
+ if(itemPropertyDescriptors == null) {
super.getPropertyDescriptors(object);
-
addIdPropertyDescriptor(object);
}
return itemPropertyDescriptors;
@@ -77,36 +75,24 @@ public class DefinitionItemProvider extends ItemProviderAdapter implements
* This adds a property descriptor for the Id feature.
* <!-- begin-user-doc
* --> <!-- end-user-doc -->
+ *
* @generated
*/
protected void addIdPropertyDescriptor(Object object) {
- itemPropertyDescriptors.add
- (createItemPropertyDescriptor
- (((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
- getResourceLocator(),
- getString("_UI_Definition_id_feature"),
- getString("_UI_PropertyDescriptor_description", "_UI_Definition_id_feature", "_UI_Definition_type"),
- DGPackage.Literals.DEFINITION__ID,
- true,
- false,
- false,
- ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
- null,
- null));
+ itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(), getResourceLocator(), getString("_UI_Definition_id_feature"), getString("_UI_PropertyDescriptor_description", "_UI_Definition_id_feature", "_UI_Definition_type"), DGPackage.Literals.DEFINITION__ID, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null));
}
/**
* This returns the label text for the adapted class.
* <!-- begin-user-doc
* --> <!-- end-user-doc -->
+ *
* @generated
*/
@Override
public String getText(Object object) {
String label = ((Definition)object).getId();
- return label == null || label.length() == 0 ?
- getString("_UI_Definition_type") :
- getString("_UI_Definition_type") + " " + label;
+ return label == null || label.length() == 0 ? getString("_UI_Definition_type") : getString("_UI_Definition_type") + " " + label;
}
/**
@@ -114,16 +100,16 @@ public class DefinitionItemProvider extends ItemProviderAdapter implements
* children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
* <!-- begin-user-doc --> <!--
* end-user-doc -->
+ *
* @generated
*/
@Override
public void notifyChanged(Notification notification) {
updateChildren(notification);
-
- switch (notification.getFeatureID(Definition.class)) {
- case DGPackage.DEFINITION__ID:
- fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), false, true));
- return;
+ switch(notification.getFeatureID(Definition.class)) {
+ case DGPackage.DEFINITION__ID:
+ fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), false, true));
+ return;
}
super.notifyChanged(notification);
}
@@ -136,8 +122,7 @@ public class DefinitionItemProvider extends ItemProviderAdapter implements
* @generated
*/
@Override
- protected void collectNewChildDescriptors(
- Collection<Object> newChildDescriptors, Object object) {
+ protected void collectNewChildDescriptors(Collection<Object> newChildDescriptors, Object object) {
super.collectNewChildDescriptors(newChildDescriptors, object);
}
@@ -151,5 +136,4 @@ public class DefinitionItemProvider extends ItemProviderAdapter implements
public ResourceLocator getResourceLocator() {
return DDEditPlugin.INSTANCE;
}
-
}
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 b2c0a42..df9c938 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
@@ -42,12 +42,11 @@ import org.eclipse.papyrus.dd.edit.DDEditPlugin;
* This is the item provider adapter for a {@link org.eclipse.papyrus.dd.dg.Definitions} object.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
+ *
* @generated
*/
-public class DefinitionsItemProvider extends ItemProviderAdapter implements
- IEditingDomainItemProvider, IStructuredItemContentProvider,
- ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource,
- IItemColorProvider, IItemFontProvider {
+public class DefinitionsItemProvider extends ItemProviderAdapter implements IEditingDomainItemProvider, IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource, IItemColorProvider, IItemFontProvider {
+
/**
* This constructs an instance from a factory and a notifier. <!--
* begin-user-doc --> <!-- end-user-doc -->
@@ -66,9 +65,8 @@ public class DefinitionsItemProvider extends ItemProviderAdapter implements
*/
@Override
public List<IItemPropertyDescriptor> getPropertyDescriptors(Object object) {
- if (itemPropertyDescriptors == null) {
+ if(itemPropertyDescriptors == null) {
super.getPropertyDescriptors(object);
-
}
return itemPropertyDescriptors;
}
@@ -78,12 +76,12 @@ public class DefinitionsItemProvider extends ItemProviderAdapter implements
* {@link org.eclipse.emf.edit.command.AddCommand}, {@link org.eclipse.emf.edit.command.RemoveCommand} or
* {@link org.eclipse.emf.edit.command.MoveCommand} in {@link #createCommand}.
* <!-- begin-user-doc --> <!-- end-user-doc -->
+ *
* @generated
*/
@Override
- public Collection<? extends EStructuralFeature> getChildrenFeatures(
- Object object) {
- if (childrenFeatures == null) {
+ public Collection<? extends EStructuralFeature> getChildrenFeatures(Object object) {
+ if(childrenFeatures == null) {
super.getChildrenFeatures(object);
childrenFeatures.add(DGPackage.Literals.DEFINITIONS__DEFNITION);
childrenFeatures.add(DGPackage.Literals.DEFINITIONS__STYLE_SHEET);
@@ -93,13 +91,13 @@ public class DefinitionsItemProvider extends ItemProviderAdapter implements
/**
* <!-- begin-user-doc --> <!-- end-user-doc -->
+ *
* @generated
*/
@Override
protected EStructuralFeature getChildFeature(Object object, Object child) {
// Check the type of the specified child object and return the proper feature to use for
// adding (see {@link AddCommand}) it as a child.
-
return super.getChildFeature(object, child);
}
@@ -118,6 +116,7 @@ public class DefinitionsItemProvider extends ItemProviderAdapter implements
* This returns the label text for the adapted class.
* <!-- begin-user-doc
* --> <!-- end-user-doc -->
+ *
* @generated
*/
@Override
@@ -130,17 +129,17 @@ public class DefinitionsItemProvider extends ItemProviderAdapter implements
* children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
* <!-- begin-user-doc --> <!--
* end-user-doc -->
+ *
* @generated
*/
@Override
public void notifyChanged(Notification notification) {
updateChildren(notification);
-
- switch (notification.getFeatureID(Definitions.class)) {
- case DGPackage.DEFINITIONS__DEFNITION:
- case DGPackage.DEFINITIONS__STYLE_SHEET:
- fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), true, false));
- return;
+ switch(notification.getFeatureID(Definitions.class)) {
+ case DGPackage.DEFINITIONS__DEFNITION:
+ case DGPackage.DEFINITIONS__STYLE_SHEET:
+ fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), true, false));
+ return;
}
super.notifyChanged(notification);
}
@@ -153,104 +152,27 @@ public class DefinitionsItemProvider extends ItemProviderAdapter implements
* @generated
*/
@Override
- protected void collectNewChildDescriptors(
- Collection<Object> newChildDescriptors, Object object) {
+ 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__STYLE_SHEET,
- DGFactory.eINSTANCE.createStyleSheet()));
+ newChildDescriptors.add(createChildParameter(DGPackage.Literals.DEFINITIONS__DEFNITION, DGFactory.eINSTANCE.createGroup()));
+ newChildDescriptors.add(createChildParameter(DGPackage.Literals.DEFINITIONS__DEFNITION, DGFactory.eINSTANCE.createCanvas()));
+ newChildDescriptors.add(createChildParameter(DGPackage.Literals.DEFINITIONS__DEFNITION, DGFactory.eINSTANCE.createClipPath()));
+ newChildDescriptors.add(createChildParameter(DGPackage.Literals.DEFINITIONS__DEFNITION, DGFactory.eINSTANCE.createCircle()));
+ newChildDescriptors.add(createChildParameter(DGPackage.Literals.DEFINITIONS__DEFNITION, DGFactory.eINSTANCE.createEllipse()));
+ newChildDescriptors.add(createChildParameter(DGPackage.Literals.DEFINITIONS__DEFNITION, DGFactory.eINSTANCE.createImage()));
+ newChildDescriptors.add(createChildParameter(DGPackage.Literals.DEFINITIONS__DEFNITION, DGFactory.eINSTANCE.createLine()));
+ newChildDescriptors.add(createChildParameter(DGPackage.Literals.DEFINITIONS__DEFNITION, DGFactory.eINSTANCE.createMarker()));
+ newChildDescriptors.add(createChildParameter(DGPackage.Literals.DEFINITIONS__DEFNITION, DGFactory.eINSTANCE.createLinearGradient()));
+ newChildDescriptors.add(createChildParameter(DGPackage.Literals.DEFINITIONS__DEFNITION, DGFactory.eINSTANCE.createPath()));
+ newChildDescriptors.add(createChildParameter(DGPackage.Literals.DEFINITIONS__DEFNITION, DGFactory.eINSTANCE.createPattern()));
+ newChildDescriptors.add(createChildParameter(DGPackage.Literals.DEFINITIONS__DEFNITION, DGFactory.eINSTANCE.createPolygon()));
+ newChildDescriptors.add(createChildParameter(DGPackage.Literals.DEFINITIONS__DEFNITION, DGFactory.eINSTANCE.createPolyline()));
+ newChildDescriptors.add(createChildParameter(DGPackage.Literals.DEFINITIONS__DEFNITION, DGFactory.eINSTANCE.createRadialGradient()));
+ newChildDescriptors.add(createChildParameter(DGPackage.Literals.DEFINITIONS__DEFNITION, DGFactory.eINSTANCE.createRectangle()));
+ newChildDescriptors.add(createChildParameter(DGPackage.Literals.DEFINITIONS__DEFNITION, DGFactory.eINSTANCE.createRootCanvas()));
+ newChildDescriptors.add(createChildParameter(DGPackage.Literals.DEFINITIONS__DEFNITION, DGFactory.eINSTANCE.createText()));
+ newChildDescriptors.add(createChildParameter(DGPackage.Literals.DEFINITIONS__DEFNITION, DGFactory.eINSTANCE.createUse()));
+ newChildDescriptors.add(createChildParameter(DGPackage.Literals.DEFINITIONS__STYLE_SHEET, DGFactory.eINSTANCE.createStyleSheet()));
}
/**
@@ -263,5 +185,4 @@ public class DefinitionsItemProvider extends ItemProviderAdapter implements
public ResourceLocator getResourceLocator() {
return DDEditPlugin.INSTANCE;
}
-
}
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 5f1fe66..9b8f94f 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
@@ -38,12 +38,11 @@ import org.eclipse.papyrus.dd.dg.Ellipse;
* This is the item provider adapter for a {@link org.eclipse.papyrus.dd.dg.Ellipse} object.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
+ *
* @generated
*/
-public class EllipseItemProvider extends GraphicalElementItemProvider implements
- IEditingDomainItemProvider, IStructuredItemContentProvider,
- ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource,
- IItemColorProvider, IItemFontProvider {
+public class EllipseItemProvider extends GraphicalElementItemProvider implements IEditingDomainItemProvider, IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource, IItemColorProvider, IItemFontProvider {
+
/**
* This constructs an instance from a factory and a notifier. <!--
* begin-user-doc --> <!-- end-user-doc -->
@@ -62,9 +61,8 @@ public class EllipseItemProvider extends GraphicalElementItemProvider implements
*/
@Override
public List<IItemPropertyDescriptor> getPropertyDescriptors(Object object) {
- if (itemPropertyDescriptors == null) {
+ if(itemPropertyDescriptors == null) {
super.getPropertyDescriptors(object);
-
}
return itemPropertyDescriptors;
}
@@ -74,12 +72,12 @@ public class EllipseItemProvider extends GraphicalElementItemProvider implements
* {@link org.eclipse.emf.edit.command.AddCommand}, {@link org.eclipse.emf.edit.command.RemoveCommand} or
* {@link org.eclipse.emf.edit.command.MoveCommand} in {@link #createCommand}.
* <!-- begin-user-doc --> <!-- end-user-doc -->
+ *
* @generated
*/
@Override
- public Collection<? extends EStructuralFeature> getChildrenFeatures(
- Object object) {
- if (childrenFeatures == null) {
+ public Collection<? extends EStructuralFeature> getChildrenFeatures(Object object) {
+ if(childrenFeatures == null) {
super.getChildrenFeatures(object);
childrenFeatures.add(DGPackage.Literals.ELLIPSE__CENTER);
childrenFeatures.add(DGPackage.Literals.ELLIPSE__RADII);
@@ -89,19 +87,20 @@ public class EllipseItemProvider extends GraphicalElementItemProvider implements
/**
* <!-- begin-user-doc --> <!-- end-user-doc -->
+ *
* @generated
*/
@Override
protected EStructuralFeature getChildFeature(Object object, Object child) {
// Check the type of the specified child object and return the proper feature to use for
// adding (see {@link AddCommand}) it as a child.
-
return super.getChildFeature(object, child);
}
/**
* This returns Ellipse.gif.
* <!-- begin-user-doc --> <!-- end-user-doc -->
+ *
* @generated
*/
@Override
@@ -113,14 +112,13 @@ public class EllipseItemProvider extends GraphicalElementItemProvider implements
* This returns the label text for the adapted class.
* <!-- begin-user-doc
* --> <!-- end-user-doc -->
+ *
* @generated
*/
@Override
public String getText(Object object) {
String label = ((Ellipse)object).getId();
- return label == null || label.length() == 0 ?
- getString("_UI_Ellipse_type") :
- getString("_UI_Ellipse_type") + " " + label;
+ return label == null || label.length() == 0 ? getString("_UI_Ellipse_type") : getString("_UI_Ellipse_type") + " " + label;
}
/**
@@ -128,17 +126,17 @@ public class EllipseItemProvider extends GraphicalElementItemProvider implements
* children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
* <!-- begin-user-doc --> <!--
* end-user-doc -->
+ *
* @generated
*/
@Override
public void notifyChanged(Notification notification) {
updateChildren(notification);
-
- switch (notification.getFeatureID(Ellipse.class)) {
- case DGPackage.ELLIPSE__CENTER:
- case DGPackage.ELLIPSE__RADII:
- fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), true, false));
- return;
+ switch(notification.getFeatureID(Ellipse.class)) {
+ case DGPackage.ELLIPSE__CENTER:
+ case DGPackage.ELLIPSE__RADII:
+ fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), true, false));
+ return;
}
super.notifyChanged(notification);
}
@@ -151,19 +149,9 @@ public class EllipseItemProvider extends GraphicalElementItemProvider implements
* @generated
*/
@Override
- protected void collectNewChildDescriptors(
- Collection<Object> newChildDescriptors, Object object) {
+ protected void collectNewChildDescriptors(Collection<Object> newChildDescriptors, Object object) {
super.collectNewChildDescriptors(newChildDescriptors, object);
-
- newChildDescriptors.add
- (createChildParameter
- (DGPackage.Literals.ELLIPSE__CENTER,
- DCFactory.eINSTANCE.createPoint()));
-
- newChildDescriptors.add
- (createChildParameter
- (DGPackage.Literals.ELLIPSE__RADII,
- DCFactory.eINSTANCE.createDimension()));
+ newChildDescriptors.add(createChildParameter(DGPackage.Literals.ELLIPSE__CENTER, DCFactory.eINSTANCE.createPoint()));
+ newChildDescriptors.add(createChildParameter(DGPackage.Literals.ELLIPSE__RADII, DCFactory.eINSTANCE.createDimension()));
}
-
}
diff --git a/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/src/org/eclipse/papyrus/dd/dg/provider/EllipticalArcToItemProvider.java b/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/src/org/eclipse/papyrus/dd/dg/provider/EllipticalArcToItemProvider.java
index d5ccf84..d613681 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
@@ -40,12 +40,11 @@ import org.eclipse.papyrus.dd.dg.EllipticalArcTo;
* This is the item provider adapter for a {@link org.eclipse.papyrus.dd.dg.EllipticalArcTo} object.
* <!-- begin-user-doc
* --> <!-- end-user-doc -->
+ *
* @generated
*/
-public class EllipticalArcToItemProvider extends PathCommandItemProvider
- implements IEditingDomainItemProvider, IStructuredItemContentProvider,
- ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource,
- IItemColorProvider, IItemFontProvider {
+public class EllipticalArcToItemProvider extends PathCommandItemProvider implements IEditingDomainItemProvider, IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource, IItemColorProvider, IItemFontProvider {
+
/**
* This constructs an instance from a factory and a notifier. <!--
* begin-user-doc --> <!-- end-user-doc -->
@@ -64,9 +63,8 @@ public class EllipticalArcToItemProvider extends PathCommandItemProvider
*/
@Override
public List<IItemPropertyDescriptor> getPropertyDescriptors(Object object) {
- if (itemPropertyDescriptors == null) {
+ if(itemPropertyDescriptors == null) {
super.getPropertyDescriptors(object);
-
addRotationPropertyDescriptor(object);
addIsLargeArcPropertyDescriptor(object);
addIsSweepPropertyDescriptor(object);
@@ -81,19 +79,7 @@ public class EllipticalArcToItemProvider extends PathCommandItemProvider
* @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));
}
/**
@@ -103,19 +89,7 @@ public class EllipticalArcToItemProvider extends PathCommandItemProvider
* @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));
}
/**
@@ -125,19 +99,7 @@ public class EllipticalArcToItemProvider extends PathCommandItemProvider
* @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));
}
/**
@@ -145,12 +107,12 @@ public class EllipticalArcToItemProvider extends PathCommandItemProvider
* {@link org.eclipse.emf.edit.command.AddCommand}, {@link org.eclipse.emf.edit.command.RemoveCommand} or
* {@link org.eclipse.emf.edit.command.MoveCommand} in {@link #createCommand}.
* <!-- begin-user-doc --> <!-- end-user-doc -->
+ *
* @generated
*/
@Override
- public Collection<? extends EStructuralFeature> getChildrenFeatures(
- Object object) {
- if (childrenFeatures == null) {
+ public Collection<? extends EStructuralFeature> getChildrenFeatures(Object object) {
+ if(childrenFeatures == null) {
super.getChildrenFeatures(object);
childrenFeatures.add(DGPackage.Literals.ELLIPTICAL_ARC_TO__RADII);
childrenFeatures.add(DGPackage.Literals.ELLIPTICAL_ARC_TO__POINT);
@@ -160,13 +122,13 @@ public class EllipticalArcToItemProvider extends PathCommandItemProvider
/**
* <!-- begin-user-doc --> <!-- end-user-doc -->
+ *
* @generated
*/
@Override
protected EStructuralFeature getChildFeature(Object object, Object child) {
// Check the type of the specified child object and return the proper feature to use for
// adding (see {@link AddCommand}) it as a child.
-
return super.getChildFeature(object, child);
}
@@ -174,6 +136,7 @@ public class EllipticalArcToItemProvider extends PathCommandItemProvider
* This returns EllipticalArcTo.gif.
* <!-- begin-user-doc --> <!--
* end-user-doc -->
+ *
* @generated
*/
@Override
@@ -185,6 +148,7 @@ public class EllipticalArcToItemProvider extends PathCommandItemProvider
* This returns the label text for the adapted class.
* <!-- begin-user-doc
* --> <!-- end-user-doc -->
+ *
* @generated
*/
@Override
@@ -198,22 +162,22 @@ public class EllipticalArcToItemProvider extends PathCommandItemProvider
* children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
* <!-- begin-user-doc --> <!--
* end-user-doc -->
+ *
* @generated
*/
@Override
public void notifyChanged(Notification notification) {
updateChildren(notification);
-
- switch (notification.getFeatureID(EllipticalArcTo.class)) {
- case DGPackage.ELLIPTICAL_ARC_TO__ROTATION:
- case DGPackage.ELLIPTICAL_ARC_TO__IS_LARGE_ARC:
- case DGPackage.ELLIPTICAL_ARC_TO__IS_SWEEP:
- fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), false, true));
- return;
- case DGPackage.ELLIPTICAL_ARC_TO__RADII:
- case DGPackage.ELLIPTICAL_ARC_TO__POINT:
- fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), true, false));
- return;
+ switch(notification.getFeatureID(EllipticalArcTo.class)) {
+ case DGPackage.ELLIPTICAL_ARC_TO__ROTATION:
+ case DGPackage.ELLIPTICAL_ARC_TO__IS_LARGE_ARC:
+ case DGPackage.ELLIPTICAL_ARC_TO__IS_SWEEP:
+ fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), false, true));
+ return;
+ case DGPackage.ELLIPTICAL_ARC_TO__RADII:
+ case DGPackage.ELLIPTICAL_ARC_TO__POINT:
+ fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), true, false));
+ return;
}
super.notifyChanged(notification);
}
@@ -226,19 +190,9 @@ public class EllipticalArcToItemProvider extends PathCommandItemProvider
* @generated
*/
@Override
- protected void collectNewChildDescriptors(
- Collection<Object> newChildDescriptors, Object object) {
+ protected void collectNewChildDescriptors(Collection<Object> newChildDescriptors, Object object) {
super.collectNewChildDescriptors(newChildDescriptors, object);
-
- newChildDescriptors.add
- (createChildParameter
- (DGPackage.Literals.ELLIPTICAL_ARC_TO__RADII,
- DCFactory.eINSTANCE.createDimension()));
-
- newChildDescriptors.add
- (createChildParameter
- (DGPackage.Literals.ELLIPTICAL_ARC_TO__POINT,
- DCFactory.eINSTANCE.createPoint()));
+ newChildDescriptors.add(createChildParameter(DGPackage.Literals.ELLIPTICAL_ARC_TO__RADII, DCFactory.eINSTANCE.createDimension()));
+ newChildDescriptors.add(createChildParameter(DGPackage.Literals.ELLIPTICAL_ARC_TO__POINT, DCFactory.eINSTANCE.createPoint()));
}
-
}
diff --git a/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/src/org/eclipse/papyrus/dd/dg/provider/GradientItemProvider.java b/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/src/org/eclipse/papyrus/dd/dg/provider/GradientItemProvider.java
index 07eaa39..a4d65eb 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
@@ -33,12 +33,11 @@ import org.eclipse.papyrus.dd.dg.Gradient;
* This is the item provider adapter for a {@link org.eclipse.papyrus.dd.dg.Gradient} object.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
+ *
* @generated
*/
-public class GradientItemProvider extends PaintServerItemProvider implements
- IEditingDomainItemProvider, IStructuredItemContentProvider,
- ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource,
- IItemColorProvider, IItemFontProvider {
+public class GradientItemProvider extends PaintServerItemProvider implements IEditingDomainItemProvider, IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource, IItemColorProvider, IItemFontProvider {
+
/**
* This constructs an instance from a factory and a notifier. <!--
* begin-user-doc --> <!-- end-user-doc -->
@@ -57,9 +56,8 @@ public class GradientItemProvider extends PaintServerItemProvider implements
*/
@Override
public List<IItemPropertyDescriptor> getPropertyDescriptors(Object object) {
- if (itemPropertyDescriptors == null) {
+ if(itemPropertyDescriptors == null) {
super.getPropertyDescriptors(object);
-
}
return itemPropertyDescriptors;
}
@@ -69,12 +67,12 @@ public class GradientItemProvider extends PaintServerItemProvider implements
* {@link org.eclipse.emf.edit.command.AddCommand}, {@link org.eclipse.emf.edit.command.RemoveCommand} or
* {@link org.eclipse.emf.edit.command.MoveCommand} in {@link #createCommand}.
* <!-- begin-user-doc --> <!-- end-user-doc -->
+ *
* @generated
*/
@Override
- public Collection<? extends EStructuralFeature> getChildrenFeatures(
- Object object) {
- if (childrenFeatures == null) {
+ public Collection<? extends EStructuralFeature> getChildrenFeatures(Object object) {
+ if(childrenFeatures == null) {
super.getChildrenFeatures(object);
childrenFeatures.add(DGPackage.Literals.GRADIENT__STOP);
}
@@ -83,13 +81,13 @@ public class GradientItemProvider extends PaintServerItemProvider implements
/**
* <!-- begin-user-doc --> <!-- end-user-doc -->
+ *
* @generated
*/
@Override
protected EStructuralFeature getChildFeature(Object object, Object child) {
// Check the type of the specified child object and return the proper feature to use for
// adding (see {@link AddCommand}) it as a child.
-
return super.getChildFeature(object, child);
}
@@ -97,14 +95,13 @@ public class GradientItemProvider extends PaintServerItemProvider implements
* This returns the label text for the adapted class.
* <!-- begin-user-doc
* --> <!-- end-user-doc -->
+ *
* @generated
*/
@Override
public String getText(Object object) {
String label = ((Gradient)object).getId();
- return label == null || label.length() == 0 ?
- getString("_UI_Gradient_type") :
- getString("_UI_Gradient_type") + " " + label;
+ return label == null || label.length() == 0 ? getString("_UI_Gradient_type") : getString("_UI_Gradient_type") + " " + label;
}
/**
@@ -112,16 +109,16 @@ public class GradientItemProvider extends PaintServerItemProvider implements
* children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
* <!-- begin-user-doc --> <!--
* end-user-doc -->
+ *
* @generated
*/
@Override
public void notifyChanged(Notification notification) {
updateChildren(notification);
-
- switch (notification.getFeatureID(Gradient.class)) {
- case DGPackage.GRADIENT__STOP:
- fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), true, false));
- return;
+ switch(notification.getFeatureID(Gradient.class)) {
+ case DGPackage.GRADIENT__STOP:
+ fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), true, false));
+ return;
}
super.notifyChanged(notification);
}
@@ -134,14 +131,8 @@ public class GradientItemProvider extends PaintServerItemProvider implements
* @generated
*/
@Override
- protected void collectNewChildDescriptors(
- Collection<Object> newChildDescriptors, Object object) {
+ protected void collectNewChildDescriptors(Collection<Object> newChildDescriptors, Object object) {
super.collectNewChildDescriptors(newChildDescriptors, object);
-
- newChildDescriptors.add
- (createChildParameter
- (DGPackage.Literals.GRADIENT__STOP,
- DGFactory.eINSTANCE.createGradientStop()));
+ newChildDescriptors.add(createChildParameter(DGPackage.Literals.GRADIENT__STOP, DGFactory.eINSTANCE.createGradientStop()));
}
-
}
diff --git a/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/src/org/eclipse/papyrus/dd/dg/provider/GradientStopItemProvider.java b/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/src/org/eclipse/papyrus/dd/dg/provider/GradientStopItemProvider.java
index 9f27752..8f566ed 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
@@ -43,12 +43,11 @@ import org.eclipse.papyrus.dd.edit.DDEditPlugin;
* This is the item provider adapter for a {@link org.eclipse.papyrus.dd.dg.GradientStop} object.
* <!-- begin-user-doc
* --> <!-- end-user-doc -->
+ *
* @generated
*/
-public class GradientStopItemProvider extends ItemProviderAdapter implements
- IEditingDomainItemProvider, IStructuredItemContentProvider,
- ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource,
- IItemColorProvider, IItemFontProvider {
+public class GradientStopItemProvider extends ItemProviderAdapter implements IEditingDomainItemProvider, IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource, IItemColorProvider, IItemFontProvider {
+
/**
* This constructs an instance from a factory and a notifier. <!--
* begin-user-doc --> <!-- end-user-doc -->
@@ -67,9 +66,8 @@ public class GradientStopItemProvider extends ItemProviderAdapter implements
*/
@Override
public List<IItemPropertyDescriptor> getPropertyDescriptors(Object object) {
- if (itemPropertyDescriptors == null) {
+ if(itemPropertyDescriptors == null) {
super.getPropertyDescriptors(object);
-
addColorPropertyDescriptor(object);
addOffsetPropertyDescriptor(object);
addOpacityPropertyDescriptor(object);
@@ -84,19 +82,7 @@ public class GradientStopItemProvider extends ItemProviderAdapter implements
* @generated
*/
protected void addColorPropertyDescriptor(Object object) {
- itemPropertyDescriptors.add
- (createItemPropertyDescriptor
- (((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
- getResourceLocator(),
- getString("_UI_GradientStop_color_feature"),
- getString("_UI_PropertyDescriptor_description", "_UI_GradientStop_color_feature", "_UI_GradientStop_type"),
- DGPackage.Literals.GRADIENT_STOP__COLOR,
- true,
- false,
- false,
- ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
- null,
- null));
+ itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(), getResourceLocator(), getString("_UI_GradientStop_color_feature"), getString("_UI_PropertyDescriptor_description", "_UI_GradientStop_color_feature", "_UI_GradientStop_type"), DGPackage.Literals.GRADIENT_STOP__COLOR, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null));
}
/**
@@ -106,19 +92,7 @@ public class GradientStopItemProvider extends ItemProviderAdapter implements
* @generated
*/
protected void addOffsetPropertyDescriptor(Object object) {
- itemPropertyDescriptors.add
- (createItemPropertyDescriptor
- (((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
- getResourceLocator(),
- getString("_UI_GradientStop_offset_feature"),
- getString("_UI_PropertyDescriptor_description", "_UI_GradientStop_offset_feature", "_UI_GradientStop_type"),
- DGPackage.Literals.GRADIENT_STOP__OFFSET,
- true,
- false,
- false,
- ItemPropertyDescriptor.REAL_VALUE_IMAGE,
- null,
- null));
+ itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(), getResourceLocator(), getString("_UI_GradientStop_offset_feature"), getString("_UI_PropertyDescriptor_description", "_UI_GradientStop_offset_feature", "_UI_GradientStop_type"), DGPackage.Literals.GRADIENT_STOP__OFFSET, true, false, false, ItemPropertyDescriptor.REAL_VALUE_IMAGE, null, null));
}
/**
@@ -128,19 +102,7 @@ public class GradientStopItemProvider extends ItemProviderAdapter implements
* @generated
*/
protected void addOpacityPropertyDescriptor(Object object) {
- itemPropertyDescriptors.add
- (createItemPropertyDescriptor
- (((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
- getResourceLocator(),
- getString("_UI_GradientStop_opacity_feature"),
- getString("_UI_PropertyDescriptor_description", "_UI_GradientStop_opacity_feature", "_UI_GradientStop_type"),
- DGPackage.Literals.GRADIENT_STOP__OPACITY,
- true,
- false,
- false,
- ItemPropertyDescriptor.REAL_VALUE_IMAGE,
- null,
- null));
+ itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(), getResourceLocator(), getString("_UI_GradientStop_opacity_feature"), getString("_UI_PropertyDescriptor_description", "_UI_GradientStop_opacity_feature", "_UI_GradientStop_type"), DGPackage.Literals.GRADIENT_STOP__OPACITY, true, false, false, ItemPropertyDescriptor.REAL_VALUE_IMAGE, null, null));
}
/**
@@ -158,15 +120,14 @@ public class GradientStopItemProvider extends ItemProviderAdapter implements
* This returns the label text for the adapted class.
* <!-- begin-user-doc
* --> <!-- end-user-doc -->
+ *
* @generated
*/
@Override
public String getText(Object object) {
Color labelValue = ((GradientStop)object).getColor();
String label = labelValue == null ? null : labelValue.toString();
- return label == null || label.length() == 0 ?
- getString("_UI_GradientStop_type") :
- getString("_UI_GradientStop_type") + " " + label;
+ return label == null || label.length() == 0 ? getString("_UI_GradientStop_type") : getString("_UI_GradientStop_type") + " " + label;
}
/**
@@ -174,18 +135,18 @@ public class GradientStopItemProvider extends ItemProviderAdapter implements
* children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
* <!-- begin-user-doc --> <!--
* end-user-doc -->
+ *
* @generated
*/
@Override
public void notifyChanged(Notification notification) {
updateChildren(notification);
-
- switch (notification.getFeatureID(GradientStop.class)) {
- case DGPackage.GRADIENT_STOP__COLOR:
- case DGPackage.GRADIENT_STOP__OFFSET:
- case DGPackage.GRADIENT_STOP__OPACITY:
- fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), false, true));
- return;
+ switch(notification.getFeatureID(GradientStop.class)) {
+ case DGPackage.GRADIENT_STOP__COLOR:
+ case DGPackage.GRADIENT_STOP__OFFSET:
+ case DGPackage.GRADIENT_STOP__OPACITY:
+ fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), false, true));
+ return;
}
super.notifyChanged(notification);
}
@@ -198,8 +159,7 @@ public class GradientStopItemProvider extends ItemProviderAdapter implements
* @generated
*/
@Override
- protected void collectNewChildDescriptors(
- Collection<Object> newChildDescriptors, Object object) {
+ protected void collectNewChildDescriptors(Collection<Object> newChildDescriptors, Object object) {
super.collectNewChildDescriptors(newChildDescriptors, object);
}
@@ -213,5 +173,4 @@ public class GradientStopItemProvider extends ItemProviderAdapter implements
public ResourceLocator getResourceLocator() {
return DDEditPlugin.INSTANCE;
}
-
}
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 a53434a..14fe780 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
@@ -33,16 +33,13 @@ import org.eclipse.papyrus.dd.dg.DGPackage;
import org.eclipse.papyrus.dd.dg.GraphicalElement;
/**
- * This is the item provider adapter for a
- * {@link org.eclipse.papyrus.dd.dg.GraphicalElement} object. <!--
+ * This is the item provider adapter for a {@link org.eclipse.papyrus.dd.dg.GraphicalElement} object. <!--
* begin-user-doc --> <!-- end-user-doc -->
*
* @generated
*/
-public class GraphicalElementItemProvider extends DefinitionItemProvider
- implements IEditingDomainItemProvider, IStructuredItemContentProvider,
- ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource,
- IItemColorProvider, IItemFontProvider {
+public class GraphicalElementItemProvider extends DefinitionItemProvider implements IEditingDomainItemProvider, IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource, IItemColorProvider, IItemFontProvider {
+
/**
* This constructs an instance from a factory and a notifier. <!--
* begin-user-doc --> <!-- end-user-doc -->
@@ -61,9 +58,8 @@ public class GraphicalElementItemProvider extends DefinitionItemProvider
*/
@Override
public List<IItemPropertyDescriptor> getPropertyDescriptors(Object object) {
- if (itemPropertyDescriptors == null) {
+ if(itemPropertyDescriptors == null) {
super.getPropertyDescriptors(object);
-
addClipPathPropertyDescriptor(object);
addClassPropertyDescriptor(object);
addLayoutDataPropertyDescriptor(object);
@@ -78,19 +74,7 @@ public class GraphicalElementItemProvider extends DefinitionItemProvider
* @generated
*/
protected void addClipPathPropertyDescriptor(Object object) {
- itemPropertyDescriptors.add
- (createItemPropertyDescriptor
- (((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
- getResourceLocator(),
- getString("_UI_GraphicalElement_clipPath_feature"),
- getString("_UI_PropertyDescriptor_description", "_UI_GraphicalElement_clipPath_feature", "_UI_GraphicalElement_type"),
- DGPackage.Literals.GRAPHICAL_ELEMENT__CLIP_PATH,
- true,
- false,
- true,
- null,
- null,
- null));
+ itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(), getResourceLocator(), getString("_UI_GraphicalElement_clipPath_feature"), getString("_UI_PropertyDescriptor_description", "_UI_GraphicalElement_clipPath_feature", "_UI_GraphicalElement_type"), DGPackage.Literals.GRAPHICAL_ELEMENT__CLIP_PATH, true, false, true, null, null, null));
}
/**
@@ -100,41 +84,18 @@ public class GraphicalElementItemProvider extends DefinitionItemProvider
* @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));
}
/**
* This adds a property descriptor for the Layout Data feature.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
+ *
* @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));
}
/**
@@ -142,12 +103,12 @@ public class GraphicalElementItemProvider extends DefinitionItemProvider
* {@link org.eclipse.emf.edit.command.AddCommand}, {@link org.eclipse.emf.edit.command.RemoveCommand} or
* {@link org.eclipse.emf.edit.command.MoveCommand} in {@link #createCommand}.
* <!-- begin-user-doc --> <!-- end-user-doc -->
+ *
* @generated
*/
@Override
- public Collection<? extends EStructuralFeature> getChildrenFeatures(
- Object object) {
- if (childrenFeatures == null) {
+ public Collection<? extends EStructuralFeature> getChildrenFeatures(Object object) {
+ if(childrenFeatures == null) {
super.getChildrenFeatures(object);
childrenFeatures.add(DGPackage.Literals.GRAPHICAL_ELEMENT__STYLE);
childrenFeatures.add(DGPackage.Literals.GRAPHICAL_ELEMENT__TRANSFORM);
@@ -157,13 +118,13 @@ public class GraphicalElementItemProvider extends DefinitionItemProvider
/**
* <!-- begin-user-doc --> <!-- end-user-doc -->
+ *
* @generated
*/
@Override
protected EStructuralFeature getChildFeature(Object object, Object child) {
// Check the type of the specified child object and return the proper feature to use for
// adding (see {@link AddCommand}) it as a child.
-
return super.getChildFeature(object, child);
}
@@ -171,64 +132,61 @@ public class GraphicalElementItemProvider extends DefinitionItemProvider
* This returns the label text for the adapted class.
* <!-- begin-user-doc
* --> <!-- end-user-doc -->
+ *
* @generated NOT
*/
@Override
public String getText(Object object) {
String label = getLabel((GraphicalElement)object);
- return label == null || label.length() == 0 ?
- getString("_UI_GraphicalElement_type") :
- getString("_UI_GraphicalElement_type") + " " + label;
+ return label == null || label.length() == 0 ? getString("_UI_GraphicalElement_type") : getString("_UI_GraphicalElement_type") + " " + label;
}
/**
* Get the label of the given graphical element
*
- * @param element The graphical element
+ * @param element
+ * The graphical element
* @return String label of the graphical element
*/
protected String getLabel(GraphicalElement element) {
String label = "";
-
- if (element.getId() != null)
- label += "id="+element.getId();
-
- if (!element.getClasses().isEmpty()) {
- if (label.length()>0)
+ if(element.getId() != null)
+ label += "id=" + element.getId();
+ if(!element.getClasses().isEmpty()) {
+ if(label.length() > 0)
label += ", ";
label += joinString("class", element.getClasses(), ",");
}
-
- return (label.length()>0) ? "["+label+"]" : "";
+ return (label.length() > 0) ? "[" + label + "]" : "";
}
-
+
private String joinString(String key, Collection<String> values, String sep) {
String s = "";
- for (String v : values)
- s += (s.length()>0) ? ", "+v : v;
- return key+"="+s;
+ for(String v : values)
+ s += (s.length() > 0) ? ", " + v : v;
+ return key + "=" + s;
}
-
+
/**
* This handles model notifications by calling {@link #updateChildren} to update any cached
* children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
* <!-- begin-user-doc --> <!--
* end-user-doc -->
+ *
* @generated
*/
@Override
public void notifyChanged(Notification notification) {
updateChildren(notification);
-
- switch (notification.getFeatureID(GraphicalElement.class)) {
- case DGPackage.GRAPHICAL_ELEMENT__CLASS:
- case DGPackage.GRAPHICAL_ELEMENT__LAYOUT_DATA:
- fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), false, true));
- return;
- case DGPackage.GRAPHICAL_ELEMENT__STYLE:
- case DGPackage.GRAPHICAL_ELEMENT__TRANSFORM:
- fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), true, false));
- return;
+ switch(notification.getFeatureID(GraphicalElement.class)) {
+ case DGPackage.GRAPHICAL_ELEMENT__CLASS:
+ case DGPackage.GRAPHICAL_ELEMENT__LAYOUT_DATA:
+ fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), false, true));
+ return;
+ case DGPackage.GRAPHICAL_ELEMENT__STYLE:
+ case DGPackage.GRAPHICAL_ELEMENT__TRANSFORM:
+ fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), true, false));
+ return;
}
super.notifyChanged(notification);
}
@@ -241,39 +199,13 @@ public class GraphicalElementItemProvider extends DefinitionItemProvider
* @generated
*/
@Override
- protected void collectNewChildDescriptors(
- Collection<Object> newChildDescriptors, Object object) {
+ protected void collectNewChildDescriptors(Collection<Object> newChildDescriptors, Object object) {
super.collectNewChildDescriptors(newChildDescriptors, object);
-
- newChildDescriptors.add
- (createChildParameter
- (DGPackage.Literals.GRAPHICAL_ELEMENT__STYLE,
- DGFactory.eINSTANCE.createStyle()));
-
- newChildDescriptors.add
- (createChildParameter
- (DGPackage.Literals.GRAPHICAL_ELEMENT__TRANSFORM,
- DGFactory.eINSTANCE.createMatrix()));
-
- newChildDescriptors.add
- (createChildParameter
- (DGPackage.Literals.GRAPHICAL_ELEMENT__TRANSFORM,
- DGFactory.eINSTANCE.createRotate()));
-
- newChildDescriptors.add
- (createChildParameter
- (DGPackage.Literals.GRAPHICAL_ELEMENT__TRANSFORM,
- DGFactory.eINSTANCE.createScale()));
-
- newChildDescriptors.add
- (createChildParameter
- (DGPackage.Literals.GRAPHICAL_ELEMENT__TRANSFORM,
- DGFactory.eINSTANCE.createSkew()));
-
- newChildDescriptors.add
- (createChildParameter
- (DGPackage.Literals.GRAPHICAL_ELEMENT__TRANSFORM,
- DGFactory.eINSTANCE.createTranslate()));
+ newChildDescriptors.add(createChildParameter(DGPackage.Literals.GRAPHICAL_ELEMENT__STYLE, DGFactory.eINSTANCE.createStyle()));
+ newChildDescriptors.add(createChildParameter(DGPackage.Literals.GRAPHICAL_ELEMENT__TRANSFORM, DGFactory.eINSTANCE.createMatrix()));
+ newChildDescriptors.add(createChildParameter(DGPackage.Literals.GRAPHICAL_ELEMENT__TRANSFORM, DGFactory.eINSTANCE.createRotate()));
+ newChildDescriptors.add(createChildParameter(DGPackage.Literals.GRAPHICAL_ELEMENT__TRANSFORM, DGFactory.eINSTANCE.createScale()));
+ newChildDescriptors.add(createChildParameter(DGPackage.Literals.GRAPHICAL_ELEMENT__TRANSFORM, DGFactory.eINSTANCE.createSkew()));
+ newChildDescriptors.add(createChildParameter(DGPackage.Literals.GRAPHICAL_ELEMENT__TRANSFORM, DGFactory.eINSTANCE.createTranslate()));
}
-
}
diff --git a/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/src/org/eclipse/papyrus/dd/dg/provider/GroupItemProvider.java b/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/src/org/eclipse/papyrus/dd/dg/provider/GroupItemProvider.java
index 4b0e325..0bbf89c 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
@@ -39,12 +39,11 @@ import org.eclipse.papyrus.dd.dg.Group;
* This is the item provider adapter for a {@link org.eclipse.papyrus.dd.dg.Group} object.
* <!-- begin-user-doc --> <!--
* end-user-doc -->
+ *
* @generated
*/
-public class GroupItemProvider extends GraphicalElementItemProvider implements
- IEditingDomainItemProvider, IStructuredItemContentProvider,
- ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource,
- IItemColorProvider, IItemFontProvider {
+public class GroupItemProvider extends GraphicalElementItemProvider implements IEditingDomainItemProvider, IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource, IItemColorProvider, IItemFontProvider {
+
/**
* This constructs an instance from a factory and a notifier. <!--
* begin-user-doc --> <!-- end-user-doc -->
@@ -63,9 +62,8 @@ public class GroupItemProvider extends GraphicalElementItemProvider implements
*/
@Override
public List<IItemPropertyDescriptor> getPropertyDescriptors(Object object) {
- if (itemPropertyDescriptors == null) {
+ if(itemPropertyDescriptors == null) {
super.getPropertyDescriptors(object);
-
addLayoutPropertyDescriptor(object);
}
return itemPropertyDescriptors;
@@ -75,22 +73,11 @@ public class GroupItemProvider extends GraphicalElementItemProvider implements
* This adds a property descriptor for the Layout feature.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
+ *
* @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));
}
/**
@@ -98,12 +85,12 @@ public class GroupItemProvider extends GraphicalElementItemProvider implements
* {@link org.eclipse.emf.edit.command.AddCommand}, {@link org.eclipse.emf.edit.command.RemoveCommand} or
* {@link org.eclipse.emf.edit.command.MoveCommand} in {@link #createCommand}.
* <!-- begin-user-doc --> <!-- end-user-doc -->
+ *
* @generated
*/
@Override
- public Collection<? extends EStructuralFeature> getChildrenFeatures(
- Object object) {
- if (childrenFeatures == null) {
+ public Collection<? extends EStructuralFeature> getChildrenFeatures(Object object) {
+ if(childrenFeatures == null) {
super.getChildrenFeatures(object);
childrenFeatures.add(DGPackage.Literals.GROUP__MEMBER);
}
@@ -112,19 +99,20 @@ public class GroupItemProvider extends GraphicalElementItemProvider implements
/**
* <!-- begin-user-doc --> <!-- end-user-doc -->
+ *
* @generated
*/
@Override
protected EStructuralFeature getChildFeature(Object object, Object child) {
// Check the type of the specified child object and return the proper feature to use for
// adding (see {@link AddCommand}) it as a child.
-
return super.getChildFeature(object, child);
}
/**
* This returns Group.gif.
* <!-- begin-user-doc --> <!-- end-user-doc -->
+ *
* @generated
*/
@Override
@@ -136,14 +124,13 @@ public class GroupItemProvider extends GraphicalElementItemProvider implements
* This returns the label text for the adapted class.
* <!-- begin-user-doc
* --> <!-- end-user-doc -->
+ *
* @generated NOT
*/
@Override
public String getText(Object object) {
String label = getLabel((Group)object);
- return label == null || label.length() == 0 ?
- getString("_UI_Group_type") :
- getString("_UI_Group_type") + " " + label;
+ return label == null || label.length() == 0 ? getString("_UI_Group_type") : getString("_UI_Group_type") + " " + label;
}
/**
@@ -151,19 +138,19 @@ public class GroupItemProvider extends GraphicalElementItemProvider implements
* children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
* <!-- begin-user-doc --> <!--
* end-user-doc -->
+ *
* @generated
*/
@Override
public void notifyChanged(Notification notification) {
updateChildren(notification);
-
- switch (notification.getFeatureID(Group.class)) {
- case DGPackage.GROUP__LAYOUT:
- fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), false, true));
- return;
- case DGPackage.GROUP__MEMBER:
- fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), true, false));
- return;
+ switch(notification.getFeatureID(Group.class)) {
+ case DGPackage.GROUP__LAYOUT:
+ fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), false, true));
+ return;
+ case DGPackage.GROUP__MEMBER:
+ fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), true, false));
+ return;
}
super.notifyChanged(notification);
}
@@ -176,84 +163,22 @@ public class GroupItemProvider extends GraphicalElementItemProvider implements
* @generated
*/
@Override
- protected void collectNewChildDescriptors(
- Collection<Object> newChildDescriptors, Object object) {
+ protected void collectNewChildDescriptors(Collection<Object> newChildDescriptors, Object object) {
super.collectNewChildDescriptors(newChildDescriptors, object);
-
- newChildDescriptors.add
- (createChildParameter
- (DGPackage.Literals.GROUP__MEMBER,
- DGFactory.eINSTANCE.createGroup()));
-
- newChildDescriptors.add
- (createChildParameter
- (DGPackage.Literals.GROUP__MEMBER,
- DGFactory.eINSTANCE.createCanvas()));
-
- newChildDescriptors.add
- (createChildParameter
- (DGPackage.Literals.GROUP__MEMBER,
- DGFactory.eINSTANCE.createClipPath()));
-
- newChildDescriptors.add
- (createChildParameter
- (DGPackage.Literals.GROUP__MEMBER,
- DGFactory.eINSTANCE.createCircle()));
-
- newChildDescriptors.add
- (createChildParameter
- (DGPackage.Literals.GROUP__MEMBER,
- DGFactory.eINSTANCE.createEllipse()));
-
- newChildDescriptors.add
- (createChildParameter
- (DGPackage.Literals.GROUP__MEMBER,
- DGFactory.eINSTANCE.createImage()));
-
- newChildDescriptors.add
- (createChildParameter
- (DGPackage.Literals.GROUP__MEMBER,
- DGFactory.eINSTANCE.createLine()));
-
- newChildDescriptors.add
- (createChildParameter
- (DGPackage.Literals.GROUP__MEMBER,
- DGFactory.eINSTANCE.createMarker()));
-
- newChildDescriptors.add
- (createChildParameter
- (DGPackage.Literals.GROUP__MEMBER,
- DGFactory.eINSTANCE.createPath()));
-
- newChildDescriptors.add
- (createChildParameter
- (DGPackage.Literals.GROUP__MEMBER,
- DGFactory.eINSTANCE.createPolygon()));
-
- newChildDescriptors.add
- (createChildParameter
- (DGPackage.Literals.GROUP__MEMBER,
- DGFactory.eINSTANCE.createPolyline()));
-
- newChildDescriptors.add
- (createChildParameter
- (DGPackage.Literals.GROUP__MEMBER,
- DGFactory.eINSTANCE.createRectangle()));
-
- newChildDescriptors.add
- (createChildParameter
- (DGPackage.Literals.GROUP__MEMBER,
- DGFactory.eINSTANCE.createRootCanvas()));
-
- newChildDescriptors.add
- (createChildParameter
- (DGPackage.Literals.GROUP__MEMBER,
- DGFactory.eINSTANCE.createText()));
-
- newChildDescriptors.add
- (createChildParameter
- (DGPackage.Literals.GROUP__MEMBER,
- DGFactory.eINSTANCE.createUse()));
+ newChildDescriptors.add(createChildParameter(DGPackage.Literals.GROUP__MEMBER, DGFactory.eINSTANCE.createGroup()));
+ newChildDescriptors.add(createChildParameter(DGPackage.Literals.GROUP__MEMBER, DGFactory.eINSTANCE.createCanvas()));
+ newChildDescriptors.add(createChildParameter(DGPackage.Literals.GROUP__MEMBER, DGFactory.eINSTANCE.createClipPath()));
+ newChildDescriptors.add(createChildParameter(DGPackage.Literals.GROUP__MEMBER, DGFactory.eINSTANCE.createCircle()));
+ newChildDescriptors.add(createChildParameter(DGPackage.Literals.GROUP__MEMBER, DGFactory.eINSTANCE.createEllipse()));
+ newChildDescriptors.add(createChildParameter(DGPackage.Literals.GROUP__MEMBER, DGFactory.eINSTANCE.createImage()));
+ newChildDescriptors.add(createChildParameter(DGPackage.Literals.GROUP__MEMBER, DGFactory.eINSTANCE.createLine()));
+ newChildDescriptors.add(createChildParameter(DGPackage.Literals.GROUP__MEMBER, DGFactory.eINSTANCE.createMarker()));
+ newChildDescriptors.add(createChildParameter(DGPackage.Literals.GROUP__MEMBER, DGFactory.eINSTANCE.createPath()));
+ newChildDescriptors.add(createChildParameter(DGPackage.Literals.GROUP__MEMBER, DGFactory.eINSTANCE.createPolygon()));
+ newChildDescriptors.add(createChildParameter(DGPackage.Literals.GROUP__MEMBER, DGFactory.eINSTANCE.createPolyline()));
+ newChildDescriptors.add(createChildParameter(DGPackage.Literals.GROUP__MEMBER, DGFactory.eINSTANCE.createRectangle()));
+ newChildDescriptors.add(createChildParameter(DGPackage.Literals.GROUP__MEMBER, DGFactory.eINSTANCE.createRootCanvas()));
+ newChildDescriptors.add(createChildParameter(DGPackage.Literals.GROUP__MEMBER, DGFactory.eINSTANCE.createText()));
+ newChildDescriptors.add(createChildParameter(DGPackage.Literals.GROUP__MEMBER, DGFactory.eINSTANCE.createUse()));
}
-
}
diff --git a/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/src/org/eclipse/papyrus/dd/dg/provider/ImageItemProvider.java b/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/src/org/eclipse/papyrus/dd/dg/provider/ImageItemProvider.java
index 833458f..462886f 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
@@ -40,12 +40,11 @@ import org.eclipse.papyrus.dd.dg.Image;
* This is the item provider adapter for a {@link org.eclipse.papyrus.dd.dg.Image} object.
* <!-- begin-user-doc --> <!--
* end-user-doc -->
+ *
* @generated
*/
-public class ImageItemProvider extends GraphicalElementItemProvider implements
- IEditingDomainItemProvider, IStructuredItemContentProvider,
- ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource,
- IItemColorProvider, IItemFontProvider {
+public class ImageItemProvider extends GraphicalElementItemProvider implements IEditingDomainItemProvider, IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource, IItemColorProvider, IItemFontProvider {
+
/**
* This constructs an instance from a factory and a notifier. <!--
* begin-user-doc --> <!-- end-user-doc -->
@@ -64,9 +63,8 @@ public class ImageItemProvider extends GraphicalElementItemProvider implements
*/
@Override
public List<IItemPropertyDescriptor> getPropertyDescriptors(Object object) {
- if (itemPropertyDescriptors == null) {
+ if(itemPropertyDescriptors == null) {
super.getPropertyDescriptors(object);
-
addSourcePropertyDescriptor(object);
addIsAspectRatioPreservedPropertyDescriptor(object);
}
@@ -80,40 +78,17 @@ public class ImageItemProvider extends GraphicalElementItemProvider implements
* @generated
*/
protected void addSourcePropertyDescriptor(Object object) {
- itemPropertyDescriptors.add
- (createItemPropertyDescriptor
- (((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
- getResourceLocator(),
- getString("_UI_Image_source_feature"),
- getString("_UI_PropertyDescriptor_description", "_UI_Image_source_feature", "_UI_Image_type"),
- DGPackage.Literals.IMAGE__SOURCE,
- true,
- false,
- false,
- ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
- null,
- null));
+ itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(), getResourceLocator(), getString("_UI_Image_source_feature"), getString("_UI_PropertyDescriptor_description", "_UI_Image_source_feature", "_UI_Image_type"), DGPackage.Literals.IMAGE__SOURCE, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null));
}
/**
* This adds a property descriptor for the Is Aspect Ratio Preserved feature.
* <!-- begin-user-doc --> <!-- end-user-doc -->
+ *
* @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));
}
/**
@@ -121,12 +96,12 @@ public class ImageItemProvider extends GraphicalElementItemProvider implements
* {@link org.eclipse.emf.edit.command.AddCommand}, {@link org.eclipse.emf.edit.command.RemoveCommand} or
* {@link org.eclipse.emf.edit.command.MoveCommand} in {@link #createCommand}.
* <!-- begin-user-doc --> <!-- end-user-doc -->
+ *
* @generated
*/
@Override
- public Collection<? extends EStructuralFeature> getChildrenFeatures(
- Object object) {
- if (childrenFeatures == null) {
+ public Collection<? extends EStructuralFeature> getChildrenFeatures(Object object) {
+ if(childrenFeatures == null) {
super.getChildrenFeatures(object);
childrenFeatures.add(DGPackage.Literals.IMAGE__BOUNDS);
}
@@ -135,19 +110,20 @@ public class ImageItemProvider extends GraphicalElementItemProvider implements
/**
* <!-- begin-user-doc --> <!-- end-user-doc -->
+ *
* @generated
*/
@Override
protected EStructuralFeature getChildFeature(Object object, Object child) {
// Check the type of the specified child object and return the proper feature to use for
// adding (see {@link AddCommand}) it as a child.
-
return super.getChildFeature(object, child);
}
/**
* This returns Image.gif.
* <!-- begin-user-doc --> <!-- end-user-doc -->
+ *
* @generated
*/
@Override
@@ -159,14 +135,13 @@ public class ImageItemProvider extends GraphicalElementItemProvider implements
* This returns the label text for the adapted class.
* <!-- begin-user-doc
* --> <!-- end-user-doc -->
+ *
* @generated
*/
@Override
public String getText(Object object) {
String label = ((Image)object).getId();
- return label == null || label.length() == 0 ?
- getString("_UI_Image_type") :
- getString("_UI_Image_type") + " " + label;
+ return label == null || label.length() == 0 ? getString("_UI_Image_type") : getString("_UI_Image_type") + " " + label;
}
/**
@@ -174,20 +149,20 @@ public class ImageItemProvider extends GraphicalElementItemProvider implements
* children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
* <!-- begin-user-doc --> <!--
* end-user-doc -->
+ *
* @generated
*/
@Override
public void notifyChanged(Notification notification) {
updateChildren(notification);
-
- switch (notification.getFeatureID(Image.class)) {
- case DGPackage.IMAGE__SOURCE:
- case DGPackage.IMAGE__IS_ASPECT_RATIO_PRESERVED:
- fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), false, true));
- return;
- case DGPackage.IMAGE__BOUNDS:
- fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), true, false));
- return;
+ switch(notification.getFeatureID(Image.class)) {
+ case DGPackage.IMAGE__SOURCE:
+ case DGPackage.IMAGE__IS_ASPECT_RATIO_PRESERVED:
+ fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), false, true));
+ return;
+ case DGPackage.IMAGE__BOUNDS:
+ fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), true, false));
+ return;
}
super.notifyChanged(notification);
}
@@ -200,14 +175,8 @@ public class ImageItemProvider extends GraphicalElementItemProvider implements
* @generated
*/
@Override
- protected void collectNewChildDescriptors(
- Collection<Object> newChildDescriptors, Object object) {
+ protected void collectNewChildDescriptors(Collection<Object> newChildDescriptors, Object object) {
super.collectNewChildDescriptors(newChildDescriptors, object);
-
- newChildDescriptors.add
- (createChildParameter
- (DGPackage.Literals.IMAGE__BOUNDS,
- DCFactory.eINSTANCE.createBounds()));
+ newChildDescriptors.add(createChildParameter(DGPackage.Literals.IMAGE__BOUNDS, DCFactory.eINSTANCE.createBounds()));
}
-
}
diff --git a/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/src/org/eclipse/papyrus/dd/dg/provider/LineItemProvider.java b/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/src/org/eclipse/papyrus/dd/dg/provider/LineItemProvider.java
index 1c5325c..68f8e73 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
@@ -38,12 +38,11 @@ import org.eclipse.papyrus.dd.dg.Line;
* This is the item provider adapter for a {@link org.eclipse.papyrus.dd.dg.Line} object.
* <!-- begin-user-doc --> <!--
* end-user-doc -->
+ *
* @generated
*/
-public class LineItemProvider extends MarkedElementItemProvider implements
- IEditingDomainItemProvider, IStructuredItemContentProvider,
- ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource,
- IItemColorProvider, IItemFontProvider {
+public class LineItemProvider extends MarkedElementItemProvider implements IEditingDomainItemProvider, IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource, IItemColorProvider, IItemFontProvider {
+
/**
* This constructs an instance from a factory and a notifier. <!--
* begin-user-doc --> <!-- end-user-doc -->
@@ -62,9 +61,8 @@ public class LineItemProvider extends MarkedElementItemProvider implements
*/
@Override
public List<IItemPropertyDescriptor> getPropertyDescriptors(Object object) {
- if (itemPropertyDescriptors == null) {
+ if(itemPropertyDescriptors == null) {
super.getPropertyDescriptors(object);
-
}
return itemPropertyDescriptors;
}
@@ -74,12 +72,12 @@ public class LineItemProvider extends MarkedElementItemProvider implements
* {@link org.eclipse.emf.edit.command.AddCommand}, {@link org.eclipse.emf.edit.command.RemoveCommand} or
* {@link org.eclipse.emf.edit.command.MoveCommand} in {@link #createCommand}.
* <!-- begin-user-doc --> <!-- end-user-doc -->
+ *
* @generated
*/
@Override
- public Collection<? extends EStructuralFeature> getChildrenFeatures(
- Object object) {
- if (childrenFeatures == null) {
+ public Collection<? extends EStructuralFeature> getChildrenFeatures(Object object) {
+ if(childrenFeatures == null) {
super.getChildrenFeatures(object);
childrenFeatures.add(DGPackage.Literals.LINE__START);
childrenFeatures.add(DGPackage.Literals.LINE__END);
@@ -89,19 +87,20 @@ public class LineItemProvider extends MarkedElementItemProvider implements
/**
* <!-- begin-user-doc --> <!-- end-user-doc -->
+ *
* @generated
*/
@Override
protected EStructuralFeature getChildFeature(Object object, Object child) {
// Check the type of the specified child object and return the proper feature to use for
// adding (see {@link AddCommand}) it as a child.
-
return super.getChildFeature(object, child);
}
/**
* This returns Line.gif.
* <!-- begin-user-doc --> <!-- end-user-doc -->
+ *
* @generated
*/
@Override
@@ -113,14 +112,13 @@ public class LineItemProvider extends MarkedElementItemProvider implements
* This returns the label text for the adapted class.
* <!-- begin-user-doc
* --> <!-- end-user-doc -->
+ *
* @generated
*/
@Override
public String getText(Object object) {
String label = ((Line)object).getId();
- return label == null || label.length() == 0 ?
- getString("_UI_Line_type") :
- getString("_UI_Line_type") + " " + label;
+ return label == null || label.length() == 0 ? getString("_UI_Line_type") : getString("_UI_Line_type") + " " + label;
}
/**
@@ -128,17 +126,17 @@ public class LineItemProvider extends MarkedElementItemProvider implements
* children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
* <!-- begin-user-doc --> <!--
* end-user-doc -->
+ *
* @generated
*/
@Override
public void notifyChanged(Notification notification) {
updateChildren(notification);
-
- switch (notification.getFeatureID(Line.class)) {
- case DGPackage.LINE__START:
- case DGPackage.LINE__END:
- fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), true, false));
- return;
+ switch(notification.getFeatureID(Line.class)) {
+ case DGPackage.LINE__START:
+ case DGPackage.LINE__END:
+ fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), true, false));
+ return;
}
super.notifyChanged(notification);
}
@@ -151,44 +149,26 @@ public class LineItemProvider extends MarkedElementItemProvider implements
* @generated
*/
@Override
- protected void collectNewChildDescriptors(
- Collection<Object> newChildDescriptors, Object object) {
+ protected void collectNewChildDescriptors(Collection<Object> newChildDescriptors, Object object) {
super.collectNewChildDescriptors(newChildDescriptors, object);
-
- newChildDescriptors.add
- (createChildParameter
- (DGPackage.Literals.LINE__START,
- DCFactory.eINSTANCE.createPoint()));
-
- newChildDescriptors.add
- (createChildParameter
- (DGPackage.Literals.LINE__END,
- DCFactory.eINSTANCE.createPoint()));
+ newChildDescriptors.add(createChildParameter(DGPackage.Literals.LINE__START, DCFactory.eINSTANCE.createPoint()));
+ newChildDescriptors.add(createChildParameter(DGPackage.Literals.LINE__END, DCFactory.eINSTANCE.createPoint()));
}
/**
- * This returns the label text for
- * {@link org.eclipse.emf.edit.command.CreateChildCommand}. <!--
+ * This returns the label text for {@link org.eclipse.emf.edit.command.CreateChildCommand}. <!--
* begin-user-doc --> <!-- end-user-doc -->
*
* @generated
*/
@Override
- public String getCreateChildText(Object owner, Object feature,
- Object child, Collection<?> selection) {
+ public String getCreateChildText(Object owner, Object feature, Object child, Collection<?> selection) {
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) });
+ boolean qualify = childFeature == DGPackage.Literals.LINE__START || childFeature == DGPackage.Literals.LINE__END;
+ if(qualify) {
+ return getString("_UI_CreateChild_text2", new Object[]{ getTypeText(childObject), getFeatureText(childFeature), getTypeText(owner) });
}
return 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 8cb70eb..f043752 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
@@ -38,12 +38,11 @@ import org.eclipse.papyrus.dd.dg.LineTo;
* This is the item provider adapter for a {@link org.eclipse.papyrus.dd.dg.LineTo} object.
* <!-- begin-user-doc --> <!--
* end-user-doc -->
+ *
* @generated
*/
-public class LineToItemProvider extends PathCommandItemProvider implements
- IEditingDomainItemProvider, IStructuredItemContentProvider,
- ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource,
- IItemColorProvider, IItemFontProvider {
+public class LineToItemProvider extends PathCommandItemProvider implements IEditingDomainItemProvider, IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource, IItemColorProvider, IItemFontProvider {
+
/**
* This constructs an instance from a factory and a notifier. <!--
* begin-user-doc --> <!-- end-user-doc -->
@@ -62,9 +61,8 @@ public class LineToItemProvider extends PathCommandItemProvider implements
*/
@Override
public List<IItemPropertyDescriptor> getPropertyDescriptors(Object object) {
- if (itemPropertyDescriptors == null) {
+ if(itemPropertyDescriptors == null) {
super.getPropertyDescriptors(object);
-
}
return itemPropertyDescriptors;
}
@@ -74,12 +72,12 @@ public class LineToItemProvider extends PathCommandItemProvider implements
* {@link org.eclipse.emf.edit.command.AddCommand}, {@link org.eclipse.emf.edit.command.RemoveCommand} or
* {@link org.eclipse.emf.edit.command.MoveCommand} in {@link #createCommand}.
* <!-- begin-user-doc --> <!-- end-user-doc -->
+ *
* @generated
*/
@Override
- public Collection<? extends EStructuralFeature> getChildrenFeatures(
- Object object) {
- if (childrenFeatures == null) {
+ public Collection<? extends EStructuralFeature> getChildrenFeatures(Object object) {
+ if(childrenFeatures == null) {
super.getChildrenFeatures(object);
childrenFeatures.add(DGPackage.Literals.LINE_TO__POINT);
}
@@ -88,19 +86,20 @@ public class LineToItemProvider extends PathCommandItemProvider implements
/**
* <!-- begin-user-doc --> <!-- end-user-doc -->
+ *
* @generated
*/
@Override
protected EStructuralFeature getChildFeature(Object object, Object child) {
// Check the type of the specified child object and return the proper feature to use for
// adding (see {@link AddCommand}) it as a child.
-
return super.getChildFeature(object, child);
}
/**
* This returns LineTo.gif.
* <!-- begin-user-doc --> <!-- end-user-doc -->
+ *
* @generated
*/
@Override
@@ -112,6 +111,7 @@ public class LineToItemProvider extends PathCommandItemProvider implements
* This returns the label text for the adapted class.
* <!-- begin-user-doc
* --> <!-- end-user-doc -->
+ *
* @generated
*/
@Override
@@ -125,16 +125,16 @@ public class LineToItemProvider extends PathCommandItemProvider implements
* children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
* <!-- begin-user-doc --> <!--
* end-user-doc -->
+ *
* @generated
*/
@Override
public void notifyChanged(Notification notification) {
updateChildren(notification);
-
- switch (notification.getFeatureID(LineTo.class)) {
- case DGPackage.LINE_TO__POINT:
- fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), true, false));
- return;
+ switch(notification.getFeatureID(LineTo.class)) {
+ case DGPackage.LINE_TO__POINT:
+ fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), true, false));
+ return;
}
super.notifyChanged(notification);
}
@@ -147,14 +147,8 @@ public class LineToItemProvider extends PathCommandItemProvider implements
* @generated
*/
@Override
- protected void collectNewChildDescriptors(
- Collection<Object> newChildDescriptors, Object object) {
+ protected void collectNewChildDescriptors(Collection<Object> newChildDescriptors, Object object) {
super.collectNewChildDescriptors(newChildDescriptors, object);
-
- newChildDescriptors.add
- (createChildParameter
- (DGPackage.Literals.LINE_TO__POINT,
- DCFactory.eINSTANCE.createPoint()));
+ newChildDescriptors.add(createChildParameter(DGPackage.Literals.LINE_TO__POINT, DCFactory.eINSTANCE.createPoint()));
}
-
}
diff --git a/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/src/org/eclipse/papyrus/dd/dg/provider/LinearGradientItemProvider.java b/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/src/org/eclipse/papyrus/dd/dg/provider/LinearGradientItemProvider.java
index 28a5b7b..af2f283 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
@@ -33,12 +33,11 @@ import org.eclipse.papyrus.dd.dg.LinearGradient;
* This is the item provider adapter for a {@link org.eclipse.papyrus.dd.dg.LinearGradient} object.
* <!-- begin-user-doc
* --> <!-- end-user-doc -->
+ *
* @generated
*/
-public class LinearGradientItemProvider extends GradientItemProvider implements
- IEditingDomainItemProvider, IStructuredItemContentProvider,
- ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource,
- IItemColorProvider, IItemFontProvider {
+public class LinearGradientItemProvider extends GradientItemProvider implements IEditingDomainItemProvider, IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource, IItemColorProvider, IItemFontProvider {
+
/**
* This constructs an instance from a factory and a notifier. <!--
* begin-user-doc --> <!-- end-user-doc -->
@@ -57,9 +56,8 @@ public class LinearGradientItemProvider extends GradientItemProvider implements
*/
@Override
public List<IItemPropertyDescriptor> getPropertyDescriptors(Object object) {
- if (itemPropertyDescriptors == null) {
+ if(itemPropertyDescriptors == null) {
super.getPropertyDescriptors(object);
-
}
return itemPropertyDescriptors;
}
@@ -69,12 +67,12 @@ public class LinearGradientItemProvider extends GradientItemProvider implements
* {@link org.eclipse.emf.edit.command.AddCommand}, {@link org.eclipse.emf.edit.command.RemoveCommand} or
* {@link org.eclipse.emf.edit.command.MoveCommand} in {@link #createCommand}.
* <!-- begin-user-doc --> <!-- end-user-doc -->
+ *
* @generated
*/
@Override
- public Collection<? extends EStructuralFeature> getChildrenFeatures(
- Object object) {
- if (childrenFeatures == null) {
+ public Collection<? extends EStructuralFeature> getChildrenFeatures(Object object) {
+ if(childrenFeatures == null) {
super.getChildrenFeatures(object);
childrenFeatures.add(DGPackage.Literals.LINEAR_GRADIENT__START);
childrenFeatures.add(DGPackage.Literals.LINEAR_GRADIENT__END);
@@ -84,13 +82,13 @@ public class LinearGradientItemProvider extends GradientItemProvider implements
/**
* <!-- begin-user-doc --> <!-- end-user-doc -->
+ *
* @generated
*/
@Override
protected EStructuralFeature getChildFeature(Object object, Object child) {
// Check the type of the specified child object and return the proper feature to use for
// adding (see {@link AddCommand}) it as a child.
-
return super.getChildFeature(object, child);
}
@@ -98,6 +96,7 @@ public class LinearGradientItemProvider extends GradientItemProvider implements
* This returns LinearGradient.gif.
* <!-- begin-user-doc --> <!--
* end-user-doc -->
+ *
* @generated
*/
@Override
@@ -109,14 +108,13 @@ public class LinearGradientItemProvider extends GradientItemProvider implements
* This returns the label text for the adapted class.
* <!-- begin-user-doc
* --> <!-- end-user-doc -->
+ *
* @generated
*/
@Override
public String getText(Object object) {
String label = ((LinearGradient)object).getId();
- return label == null || label.length() == 0 ?
- getString("_UI_LinearGradient_type") :
- getString("_UI_LinearGradient_type") + " " + label;
+ return label == null || label.length() == 0 ? getString("_UI_LinearGradient_type") : getString("_UI_LinearGradient_type") + " " + label;
}
/**
@@ -124,17 +122,17 @@ public class LinearGradientItemProvider extends GradientItemProvider implements
* children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
* <!-- begin-user-doc --> <!--
* end-user-doc -->
+ *
* @generated
*/
@Override
public void notifyChanged(Notification notification) {
updateChildren(notification);
-
- switch (notification.getFeatureID(LinearGradient.class)) {
- case DGPackage.LINEAR_GRADIENT__START:
- case DGPackage.LINEAR_GRADIENT__END:
- fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), true, false));
- return;
+ switch(notification.getFeatureID(LinearGradient.class)) {
+ case DGPackage.LINEAR_GRADIENT__START:
+ case DGPackage.LINEAR_GRADIENT__END:
+ fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), true, false));
+ return;
}
super.notifyChanged(notification);
}
@@ -147,44 +145,26 @@ public class LinearGradientItemProvider extends GradientItemProvider implements
* @generated
*/
@Override
- protected void collectNewChildDescriptors(
- Collection<Object> newChildDescriptors, Object object) {
+ protected void collectNewChildDescriptors(Collection<Object> newChildDescriptors, Object object) {
super.collectNewChildDescriptors(newChildDescriptors, object);
-
- newChildDescriptors.add
- (createChildParameter
- (DGPackage.Literals.LINEAR_GRADIENT__START,
- DCFactory.eINSTANCE.createPoint()));
-
- newChildDescriptors.add
- (createChildParameter
- (DGPackage.Literals.LINEAR_GRADIENT__END,
- DCFactory.eINSTANCE.createPoint()));
+ newChildDescriptors.add(createChildParameter(DGPackage.Literals.LINEAR_GRADIENT__START, DCFactory.eINSTANCE.createPoint()));
+ newChildDescriptors.add(createChildParameter(DGPackage.Literals.LINEAR_GRADIENT__END, DCFactory.eINSTANCE.createPoint()));
}
/**
- * This returns the label text for
- * {@link org.eclipse.emf.edit.command.CreateChildCommand}. <!--
+ * This returns the label text for {@link org.eclipse.emf.edit.command.CreateChildCommand}. <!--
* begin-user-doc --> <!-- end-user-doc -->
*
* @generated
*/
@Override
- public String getCreateChildText(Object owner, Object feature,
- Object child, Collection<?> selection) {
+ public String getCreateChildText(Object owner, Object feature, Object child, Collection<?> selection) {
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) });
+ boolean qualify = childFeature == DGPackage.Literals.LINEAR_GRADIENT__START || childFeature == DGPackage.Literals.LINEAR_GRADIENT__END;
+ if(qualify) {
+ return getString("_UI_CreateChild_text2", new Object[]{ getTypeText(childObject), getFeatureText(childFeature), getTypeText(owner) });
}
return 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 87d0edd..a810433 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
@@ -34,12 +34,11 @@ import org.eclipse.papyrus.dd.dg.MarkedElement;
* This is the item provider adapter for a {@link org.eclipse.papyrus.dd.dg.MarkedElement} object.
* <!-- begin-user-doc
* --> <!-- end-user-doc -->
+ *
* @generated
*/
-public class MarkedElementItemProvider extends GraphicalElementItemProvider
- implements IEditingDomainItemProvider, IStructuredItemContentProvider,
- ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource,
- IItemColorProvider, IItemFontProvider {
+public class MarkedElementItemProvider extends GraphicalElementItemProvider implements IEditingDomainItemProvider, IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource, IItemColorProvider, IItemFontProvider {
+
/**
* This constructs an instance from a factory and a notifier. <!--
* begin-user-doc --> <!-- end-user-doc -->
@@ -58,9 +57,8 @@ public class MarkedElementItemProvider extends GraphicalElementItemProvider
*/
@Override
public List<IItemPropertyDescriptor> getPropertyDescriptors(Object object) {
- if (itemPropertyDescriptors == null) {
+ if(itemPropertyDescriptors == null) {
super.getPropertyDescriptors(object);
-
addEndMarkerPropertyDescriptor(object);
addMidMarkerPropertyDescriptor(object);
addStartMarkerPropertyDescriptor(object);
@@ -75,19 +73,7 @@ public class MarkedElementItemProvider extends GraphicalElementItemProvider
* @generated
*/
protected void addEndMarkerPropertyDescriptor(Object object) {
- itemPropertyDescriptors.add
- (createItemPropertyDescriptor
- (((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
- getResourceLocator(),
- getString("_UI_MarkedElement_endMarker_feature"),
- getString("_UI_PropertyDescriptor_description", "_UI_MarkedElement_endMarker_feature", "_UI_MarkedElement_type"),
- DGPackage.Literals.MARKED_ELEMENT__END_MARKER,
- true,
- false,
- true,
- null,
- null,
- null));
+ itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(), getResourceLocator(), getString("_UI_MarkedElement_endMarker_feature"), getString("_UI_PropertyDescriptor_description", "_UI_MarkedElement_endMarker_feature", "_UI_MarkedElement_type"), DGPackage.Literals.MARKED_ELEMENT__END_MARKER, true, false, true, null, null, null));
}
/**
@@ -97,19 +83,7 @@ public class MarkedElementItemProvider extends GraphicalElementItemProvider
* @generated
*/
protected void addMidMarkerPropertyDescriptor(Object object) {
- itemPropertyDescriptors.add
- (createItemPropertyDescriptor
- (((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
- getResourceLocator(),
- getString("_UI_MarkedElement_midMarker_feature"),
- getString("_UI_PropertyDescriptor_description", "_UI_MarkedElement_midMarker_feature", "_UI_MarkedElement_type"),
- DGPackage.Literals.MARKED_ELEMENT__MID_MARKER,
- true,
- false,
- true,
- null,
- null,
- null));
+ itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(), getResourceLocator(), getString("_UI_MarkedElement_midMarker_feature"), getString("_UI_PropertyDescriptor_description", "_UI_MarkedElement_midMarker_feature", "_UI_MarkedElement_type"), DGPackage.Literals.MARKED_ELEMENT__MID_MARKER, true, false, true, null, null, null));
}
/**
@@ -119,33 +93,20 @@ public class MarkedElementItemProvider extends GraphicalElementItemProvider
* @generated
*/
protected void addStartMarkerPropertyDescriptor(Object object) {
- itemPropertyDescriptors.add
- (createItemPropertyDescriptor
- (((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
- getResourceLocator(),
- getString("_UI_MarkedElement_startMarker_feature"),
- getString("_UI_PropertyDescriptor_description", "_UI_MarkedElement_startMarker_feature", "_UI_MarkedElement_type"),
- DGPackage.Literals.MARKED_ELEMENT__START_MARKER,
- true,
- false,
- true,
- null,
- null,
- null));
+ itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(), getResourceLocator(), getString("_UI_MarkedElement_startMarker_feature"), getString("_UI_PropertyDescriptor_description", "_UI_MarkedElement_startMarker_feature", "_UI_MarkedElement_type"), DGPackage.Literals.MARKED_ELEMENT__START_MARKER, true, false, true, null, null, null));
}
/**
* This returns the label text for the adapted class.
* <!-- begin-user-doc
* --> <!-- end-user-doc -->
+ *
* @generated
*/
@Override
public String getText(Object object) {
String label = ((MarkedElement)object).getId();
- return label == null || label.length() == 0 ?
- getString("_UI_MarkedElement_type") :
- getString("_UI_MarkedElement_type") + " " + label;
+ return label == null || label.length() == 0 ? getString("_UI_MarkedElement_type") : getString("_UI_MarkedElement_type") + " " + label;
}
/**
@@ -153,6 +114,7 @@ public class MarkedElementItemProvider extends GraphicalElementItemProvider
* children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
* <!-- begin-user-doc --> <!--
* end-user-doc -->
+ *
* @generated
*/
@Override
@@ -169,9 +131,7 @@ public class MarkedElementItemProvider extends GraphicalElementItemProvider
* @generated
*/
@Override
- protected void collectNewChildDescriptors(
- Collection<Object> newChildDescriptors, Object object) {
+ protected void collectNewChildDescriptors(Collection<Object> newChildDescriptors, Object object) {
super.collectNewChildDescriptors(newChildDescriptors, object);
}
-
}
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 8fb604f..0fbe78b 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
@@ -38,12 +38,11 @@ import org.eclipse.papyrus.dd.dg.Marker;
* This is the item provider adapter for a {@link org.eclipse.papyrus.dd.dg.Marker} object.
* <!-- begin-user-doc --> <!--
* end-user-doc -->
+ *
* @generated
*/
-public class MarkerItemProvider extends GroupItemProvider implements
- IEditingDomainItemProvider, IStructuredItemContentProvider,
- ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource,
- IItemColorProvider, IItemFontProvider {
+public class MarkerItemProvider extends GroupItemProvider implements IEditingDomainItemProvider, IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource, IItemColorProvider, IItemFontProvider {
+
/**
* This constructs an instance from a factory and a notifier. <!--
* begin-user-doc --> <!-- end-user-doc -->
@@ -62,9 +61,8 @@ public class MarkerItemProvider extends GroupItemProvider implements
*/
@Override
public List<IItemPropertyDescriptor> getPropertyDescriptors(Object object) {
- if (itemPropertyDescriptors == null) {
+ if(itemPropertyDescriptors == null) {
super.getPropertyDescriptors(object);
-
}
return itemPropertyDescriptors;
}
@@ -74,12 +72,12 @@ public class MarkerItemProvider extends GroupItemProvider implements
* {@link org.eclipse.emf.edit.command.AddCommand}, {@link org.eclipse.emf.edit.command.RemoveCommand} or
* {@link org.eclipse.emf.edit.command.MoveCommand} in {@link #createCommand}.
* <!-- begin-user-doc --> <!-- end-user-doc -->
+ *
* @generated
*/
@Override
- public Collection<? extends EStructuralFeature> getChildrenFeatures(
- Object object) {
- if (childrenFeatures == null) {
+ public Collection<? extends EStructuralFeature> getChildrenFeatures(Object object) {
+ if(childrenFeatures == null) {
super.getChildrenFeatures(object);
childrenFeatures.add(DGPackage.Literals.MARKER__SIZE);
childrenFeatures.add(DGPackage.Literals.MARKER__REFERENCE);
@@ -89,19 +87,20 @@ public class MarkerItemProvider extends GroupItemProvider implements
/**
* <!-- begin-user-doc --> <!-- end-user-doc -->
+ *
* @generated
*/
@Override
protected EStructuralFeature getChildFeature(Object object, Object child) {
// Check the type of the specified child object and return the proper feature to use for
// adding (see {@link AddCommand}) it as a child.
-
return super.getChildFeature(object, child);
}
/**
* This returns Marker.gif.
* <!-- begin-user-doc --> <!-- end-user-doc -->
+ *
* @generated
*/
@Override
@@ -113,14 +112,13 @@ public class MarkerItemProvider extends GroupItemProvider implements
* This returns the label text for the adapted class.
* <!-- begin-user-doc
* --> <!-- end-user-doc -->
+ *
* @generated
*/
@Override
public String getText(Object object) {
String label = ((Marker)object).getId();
- return label == null || label.length() == 0 ?
- getString("_UI_Marker_type") :
- getString("_UI_Marker_type") + " " + label;
+ return label == null || label.length() == 0 ? getString("_UI_Marker_type") : getString("_UI_Marker_type") + " " + label;
}
/**
@@ -128,17 +126,17 @@ public class MarkerItemProvider extends GroupItemProvider implements
* children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
* <!-- begin-user-doc --> <!--
* end-user-doc -->
+ *
* @generated
*/
@Override
public void notifyChanged(Notification notification) {
updateChildren(notification);
-
- switch (notification.getFeatureID(Marker.class)) {
- case DGPackage.MARKER__SIZE:
- case DGPackage.MARKER__REFERENCE:
- fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), true, false));
- return;
+ switch(notification.getFeatureID(Marker.class)) {
+ case DGPackage.MARKER__SIZE:
+ case DGPackage.MARKER__REFERENCE:
+ fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), true, false));
+ return;
}
super.notifyChanged(notification);
}
@@ -151,19 +149,9 @@ public class MarkerItemProvider extends GroupItemProvider implements
* @generated
*/
@Override
- protected void collectNewChildDescriptors(
- Collection<Object> newChildDescriptors, Object object) {
+ protected void collectNewChildDescriptors(Collection<Object> newChildDescriptors, Object object) {
super.collectNewChildDescriptors(newChildDescriptors, object);
-
- newChildDescriptors.add
- (createChildParameter
- (DGPackage.Literals.MARKER__SIZE,
- DCFactory.eINSTANCE.createDimension()));
-
- newChildDescriptors.add
- (createChildParameter
- (DGPackage.Literals.MARKER__REFERENCE,
- DCFactory.eINSTANCE.createPoint()));
+ newChildDescriptors.add(createChildParameter(DGPackage.Literals.MARKER__SIZE, DCFactory.eINSTANCE.createDimension()));
+ newChildDescriptors.add(createChildParameter(DGPackage.Literals.MARKER__REFERENCE, DCFactory.eINSTANCE.createPoint()));
}
-
}
diff --git a/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/src/org/eclipse/papyrus/dd/dg/provider/MatrixItemProvider.java b/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/src/org/eclipse/papyrus/dd/dg/provider/MatrixItemProvider.java
index b12c130..ae4088f 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
@@ -36,12 +36,11 @@ import org.eclipse.papyrus.dd.dg.Matrix;
* This is the item provider adapter for a {@link org.eclipse.papyrus.dd.dg.Matrix} object.
* <!-- begin-user-doc --> <!--
* end-user-doc -->
+ *
* @generated
*/
-public class MatrixItemProvider extends TransformItemProvider implements
- IEditingDomainItemProvider, IStructuredItemContentProvider,
- ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource,
- IItemColorProvider, IItemFontProvider {
+public class MatrixItemProvider extends TransformItemProvider implements IEditingDomainItemProvider, IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource, IItemColorProvider, IItemFontProvider {
+
/**
* This constructs an instance from a factory and a notifier. <!--
* begin-user-doc --> <!-- end-user-doc -->
@@ -60,9 +59,8 @@ public class MatrixItemProvider extends TransformItemProvider implements
*/
@Override
public List<IItemPropertyDescriptor> getPropertyDescriptors(Object object) {
- if (itemPropertyDescriptors == null) {
+ if(itemPropertyDescriptors == null) {
super.getPropertyDescriptors(object);
-
addAPropertyDescriptor(object);
addBPropertyDescriptor(object);
addCPropertyDescriptor(object);
@@ -77,137 +75,72 @@ public class MatrixItemProvider extends TransformItemProvider implements
* This adds a property descriptor for the A feature.
* <!-- begin-user-doc
* --> <!-- end-user-doc -->
+ *
* @generated
*/
protected void addAPropertyDescriptor(Object object) {
- itemPropertyDescriptors.add
- (createItemPropertyDescriptor
- (((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
- getResourceLocator(),
- getString("_UI_Matrix_a_feature"),
- getString("_UI_PropertyDescriptor_description", "_UI_Matrix_a_feature", "_UI_Matrix_type"),
- DGPackage.Literals.MATRIX__A,
- true,
- false,
- false,
- ItemPropertyDescriptor.REAL_VALUE_IMAGE,
- null,
- null));
+ itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(), getResourceLocator(), getString("_UI_Matrix_a_feature"), getString("_UI_PropertyDescriptor_description", "_UI_Matrix_a_feature", "_UI_Matrix_type"), DGPackage.Literals.MATRIX__A, true, false, false, ItemPropertyDescriptor.REAL_VALUE_IMAGE, null, null));
}
/**
* This adds a property descriptor for the B feature.
* <!-- begin-user-doc
* --> <!-- end-user-doc -->
+ *
* @generated
*/
protected void addBPropertyDescriptor(Object object) {
- itemPropertyDescriptors.add
- (createItemPropertyDescriptor
- (((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
- getResourceLocator(),
- getString("_UI_Matrix_b_feature"),
- getString("_UI_PropertyDescriptor_description", "_UI_Matrix_b_feature", "_UI_Matrix_type"),
- DGPackage.Literals.MATRIX__B,
- true,
- false,
- false,
- ItemPropertyDescriptor.REAL_VALUE_IMAGE,
- null,
- null));
+ itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(), getResourceLocator(), getString("_UI_Matrix_b_feature"), getString("_UI_PropertyDescriptor_description", "_UI_Matrix_b_feature", "_UI_Matrix_type"), DGPackage.Literals.MATRIX__B, true, false, false, ItemPropertyDescriptor.REAL_VALUE_IMAGE, null, null));
}
/**
* This adds a property descriptor for the C feature.
* <!-- begin-user-doc
* --> <!-- end-user-doc -->
+ *
* @generated
*/
protected void addCPropertyDescriptor(Object object) {
- itemPropertyDescriptors.add
- (createItemPropertyDescriptor
- (((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
- getResourceLocator(),
- getString("_UI_Matrix_c_feature"),
- getString("_UI_PropertyDescriptor_description", "_UI_Matrix_c_feature", "_UI_Matrix_type"),
- DGPackage.Literals.MATRIX__C,
- true,
- false,
- false,
- ItemPropertyDescriptor.REAL_VALUE_IMAGE,
- null,
- null));
+ itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(), getResourceLocator(), getString("_UI_Matrix_c_feature"), getString("_UI_PropertyDescriptor_description", "_UI_Matrix_c_feature", "_UI_Matrix_type"), DGPackage.Literals.MATRIX__C, true, false, false, ItemPropertyDescriptor.REAL_VALUE_IMAGE, null, null));
}
/**
* This adds a property descriptor for the D feature.
* <!-- begin-user-doc
* --> <!-- end-user-doc -->
+ *
* @generated
*/
protected void addDPropertyDescriptor(Object object) {
- itemPropertyDescriptors.add
- (createItemPropertyDescriptor
- (((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
- getResourceLocator(),
- getString("_UI_Matrix_d_feature"),
- getString("_UI_PropertyDescriptor_description", "_UI_Matrix_d_feature", "_UI_Matrix_type"),
- DGPackage.Literals.MATRIX__D,
- true,
- false,
- false,
- ItemPropertyDescriptor.REAL_VALUE_IMAGE,
- null,
- null));
+ itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(), getResourceLocator(), getString("_UI_Matrix_d_feature"), getString("_UI_PropertyDescriptor_description", "_UI_Matrix_d_feature", "_UI_Matrix_type"), DGPackage.Literals.MATRIX__D, true, false, false, ItemPropertyDescriptor.REAL_VALUE_IMAGE, null, null));
}
/**
* This adds a property descriptor for the E feature.
* <!-- begin-user-doc
* --> <!-- end-user-doc -->
+ *
* @generated
*/
protected void addEPropertyDescriptor(Object object) {
- itemPropertyDescriptors.add
- (createItemPropertyDescriptor
- (((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
- getResourceLocator(),
- getString("_UI_Matrix_e_feature"),
- getString("_UI_PropertyDescriptor_description", "_UI_Matrix_e_feature", "_UI_Matrix_type"),
- DGPackage.Literals.MATRIX__E,
- true,
- false,
- false,
- ItemPropertyDescriptor.REAL_VALUE_IMAGE,
- null,
- null));
+ itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(), getResourceLocator(), getString("_UI_Matrix_e_feature"), getString("_UI_PropertyDescriptor_description", "_UI_Matrix_e_feature", "_UI_Matrix_type"), DGPackage.Literals.MATRIX__E, true, false, false, ItemPropertyDescriptor.REAL_VALUE_IMAGE, null, null));
}
/**
* This adds a property descriptor for the F feature.
* <!-- begin-user-doc
* --> <!-- end-user-doc -->
+ *
* @generated
*/
protected void addFPropertyDescriptor(Object object) {
- itemPropertyDescriptors.add
- (createItemPropertyDescriptor
- (((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
- getResourceLocator(),
- getString("_UI_Matrix_f_feature"),
- getString("_UI_PropertyDescriptor_description", "_UI_Matrix_f_feature", "_UI_Matrix_type"),
- DGPackage.Literals.MATRIX__F,
- true,
- false,
- false,
- ItemPropertyDescriptor.REAL_VALUE_IMAGE,
- null,
- null));
+ itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(), getResourceLocator(), getString("_UI_Matrix_f_feature"), getString("_UI_PropertyDescriptor_description", "_UI_Matrix_f_feature", "_UI_Matrix_type"), DGPackage.Literals.MATRIX__F, true, false, false, ItemPropertyDescriptor.REAL_VALUE_IMAGE, null, null));
}
/**
* This returns Matrix.gif.
* <!-- begin-user-doc --> <!-- end-user-doc -->
+ *
* @generated
*/
@Override
@@ -219,6 +152,7 @@ public class MatrixItemProvider extends TransformItemProvider implements
* This returns the label text for the adapted class.
* <!-- begin-user-doc
* --> <!-- end-user-doc -->
+ *
* @generated
*/
@Override
@@ -232,21 +166,21 @@ public class MatrixItemProvider extends TransformItemProvider implements
* children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
* <!-- begin-user-doc --> <!--
* end-user-doc -->
+ *
* @generated
*/
@Override
public void notifyChanged(Notification notification) {
updateChildren(notification);
-
- switch (notification.getFeatureID(Matrix.class)) {
- case DGPackage.MATRIX__A:
- case DGPackage.MATRIX__B:
- case DGPackage.MATRIX__C:
- case DGPackage.MATRIX__D:
- case DGPackage.MATRIX__E:
- case DGPackage.MATRIX__F:
- fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), false, true));
- return;
+ switch(notification.getFeatureID(Matrix.class)) {
+ case DGPackage.MATRIX__A:
+ case DGPackage.MATRIX__B:
+ case DGPackage.MATRIX__C:
+ case DGPackage.MATRIX__D:
+ case DGPackage.MATRIX__E:
+ case DGPackage.MATRIX__F:
+ fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), false, true));
+ return;
}
super.notifyChanged(notification);
}
@@ -259,9 +193,7 @@ public class MatrixItemProvider extends TransformItemProvider implements
* @generated
*/
@Override
- protected void collectNewChildDescriptors(
- Collection<Object> newChildDescriptors, Object object) {
+ protected void collectNewChildDescriptors(Collection<Object> newChildDescriptors, Object object) {
super.collectNewChildDescriptors(newChildDescriptors, object);
}
-
}
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 6987e9f..74df552 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
@@ -38,12 +38,11 @@ import org.eclipse.papyrus.dd.dg.MoveTo;
* This is the item provider adapter for a {@link org.eclipse.papyrus.dd.dg.MoveTo} object.
* <!-- begin-user-doc --> <!--
* end-user-doc -->
+ *
* @generated
*/
-public class MoveToItemProvider extends PathCommandItemProvider implements
- IEditingDomainItemProvider, IStructuredItemContentProvider,
- ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource,
- IItemColorProvider, IItemFontProvider {
+public class MoveToItemProvider extends PathCommandItemProvider implements IEditingDomainItemProvider, IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource, IItemColorProvider, IItemFontProvider {
+
/**
* This constructs an instance from a factory and a notifier. <!--
* begin-user-doc --> <!-- end-user-doc -->
@@ -62,9 +61,8 @@ public class MoveToItemProvider extends PathCommandItemProvider implements
*/
@Override
public List<IItemPropertyDescriptor> getPropertyDescriptors(Object object) {
- if (itemPropertyDescriptors == null) {
+ if(itemPropertyDescriptors == null) {
super.getPropertyDescriptors(object);
-
}
return itemPropertyDescriptors;
}
@@ -74,12 +72,12 @@ public class MoveToItemProvider extends PathCommandItemProvider implements
* {@link org.eclipse.emf.edit.command.AddCommand}, {@link org.eclipse.emf.edit.command.RemoveCommand} or
* {@link org.eclipse.emf.edit.command.MoveCommand} in {@link #createCommand}.
* <!-- begin-user-doc --> <!-- end-user-doc -->
+ *
* @generated
*/
@Override
- public Collection<? extends EStructuralFeature> getChildrenFeatures(
- Object object) {
- if (childrenFeatures == null) {
+ public Collection<? extends EStructuralFeature> getChildrenFeatures(Object object) {
+ if(childrenFeatures == null) {
super.getChildrenFeatures(object);
childrenFeatures.add(DGPackage.Literals.MOVE_TO__POINT);
}
@@ -88,19 +86,20 @@ public class MoveToItemProvider extends PathCommandItemProvider implements
/**
* <!-- begin-user-doc --> <!-- end-user-doc -->
+ *
* @generated
*/
@Override
protected EStructuralFeature getChildFeature(Object object, Object child) {
// Check the type of the specified child object and return the proper feature to use for
// adding (see {@link AddCommand}) it as a child.
-
return super.getChildFeature(object, child);
}
/**
* This returns MoveTo.gif.
* <!-- begin-user-doc --> <!-- end-user-doc -->
+ *
* @generated
*/
@Override
@@ -112,6 +111,7 @@ public class MoveToItemProvider extends PathCommandItemProvider implements
* This returns the label text for the adapted class.
* <!-- begin-user-doc
* --> <!-- end-user-doc -->
+ *
* @generated
*/
@Override
@@ -125,16 +125,16 @@ public class MoveToItemProvider extends PathCommandItemProvider implements
* children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
* <!-- begin-user-doc --> <!--
* end-user-doc -->
+ *
* @generated
*/
@Override
public void notifyChanged(Notification notification) {
updateChildren(notification);
-
- switch (notification.getFeatureID(MoveTo.class)) {
- case DGPackage.MOVE_TO__POINT:
- fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), true, false));
- return;
+ switch(notification.getFeatureID(MoveTo.class)) {
+ case DGPackage.MOVE_TO__POINT:
+ fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), true, false));
+ return;
}
super.notifyChanged(notification);
}
@@ -147,14 +147,8 @@ public class MoveToItemProvider extends PathCommandItemProvider implements
* @generated
*/
@Override
- protected void collectNewChildDescriptors(
- Collection<Object> newChildDescriptors, Object object) {
+ protected void collectNewChildDescriptors(Collection<Object> newChildDescriptors, Object object) {
super.collectNewChildDescriptors(newChildDescriptors, object);
-
- newChildDescriptors.add
- (createChildParameter
- (DGPackage.Literals.MOVE_TO__POINT,
- DCFactory.eINSTANCE.createPoint()));
+ newChildDescriptors.add(createChildParameter(DGPackage.Literals.MOVE_TO__POINT, DCFactory.eINSTANCE.createPoint()));
}
-
}
diff --git a/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/src/org/eclipse/papyrus/dd/dg/provider/PaintItemProvider.java b/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/src/org/eclipse/papyrus/dd/dg/provider/PaintItemProvider.java
index 81fbd4c..1cc187b 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
@@ -43,12 +43,11 @@ import org.eclipse.papyrus.dd.edit.DDEditPlugin;
* This is the item provider adapter for a {@link org.eclipse.papyrus.dd.dg.Paint} object.
* <!-- begin-user-doc --> <!--
* end-user-doc -->
+ *
* @generated
*/
-public class PaintItemProvider extends ItemProviderAdapter implements
- IEditingDomainItemProvider, IStructuredItemContentProvider,
- ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource,
- IItemColorProvider, IItemFontProvider {
+public class PaintItemProvider extends ItemProviderAdapter implements IEditingDomainItemProvider, IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource, IItemColorProvider, IItemFontProvider {
+
/**
* This constructs an instance from a factory and a notifier. <!--
* begin-user-doc --> <!-- end-user-doc -->
@@ -67,9 +66,8 @@ public class PaintItemProvider extends ItemProviderAdapter implements
*/
@Override
public List<IItemPropertyDescriptor> getPropertyDescriptors(Object object) {
- if (itemPropertyDescriptors == null) {
+ if(itemPropertyDescriptors == null) {
super.getPropertyDescriptors(object);
-
addColorPropertyDescriptor(object);
addPaintServerPropertyDescriptor(object);
}
@@ -83,19 +81,7 @@ public class PaintItemProvider extends ItemProviderAdapter implements
* @generated
*/
protected void addColorPropertyDescriptor(Object object) {
- itemPropertyDescriptors.add
- (createItemPropertyDescriptor
- (((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
- getResourceLocator(),
- getString("_UI_Paint_color_feature"),
- getString("_UI_PropertyDescriptor_description", "_UI_Paint_color_feature", "_UI_Paint_type"),
- DGPackage.Literals.PAINT__COLOR,
- true,
- false,
- false,
- ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
- null,
- null));
+ itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(), getResourceLocator(), getString("_UI_Paint_color_feature"), getString("_UI_PropertyDescriptor_description", "_UI_Paint_color_feature", "_UI_Paint_type"), DGPackage.Literals.PAINT__COLOR, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null));
}
/**
@@ -105,24 +91,13 @@ public class PaintItemProvider extends ItemProviderAdapter implements
* @generated
*/
protected void addPaintServerPropertyDescriptor(Object object) {
- itemPropertyDescriptors.add
- (createItemPropertyDescriptor
- (((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
- getResourceLocator(),
- getString("_UI_Paint_paintServer_feature"),
- getString("_UI_PropertyDescriptor_description", "_UI_Paint_paintServer_feature", "_UI_Paint_type"),
- DGPackage.Literals.PAINT__PAINT_SERVER,
- true,
- false,
- true,
- null,
- null,
- null));
+ itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(), getResourceLocator(), getString("_UI_Paint_paintServer_feature"), getString("_UI_PropertyDescriptor_description", "_UI_Paint_paintServer_feature", "_UI_Paint_type"), DGPackage.Literals.PAINT__PAINT_SERVER, true, false, true, null, null, null));
}
/**
* This returns Paint.gif.
* <!-- begin-user-doc --> <!-- end-user-doc -->
+ *
* @generated
*/
@Override
@@ -134,15 +109,14 @@ public class PaintItemProvider extends ItemProviderAdapter implements
* This returns the label text for the adapted class.
* <!-- begin-user-doc
* --> <!-- end-user-doc -->
+ *
* @generated
*/
@Override
public String getText(Object object) {
Color labelValue = ((Paint)object).getColor();
String label = labelValue == null ? null : labelValue.toString();
- return label == null || label.length() == 0 ?
- getString("_UI_Paint_type") :
- getString("_UI_Paint_type") + " " + label;
+ return label == null || label.length() == 0 ? getString("_UI_Paint_type") : getString("_UI_Paint_type") + " " + label;
}
/**
@@ -150,16 +124,16 @@ public class PaintItemProvider extends ItemProviderAdapter implements
* children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
* <!-- begin-user-doc --> <!--
* end-user-doc -->
+ *
* @generated
*/
@Override
public void notifyChanged(Notification notification) {
updateChildren(notification);
-
- switch (notification.getFeatureID(Paint.class)) {
- case DGPackage.PAINT__COLOR:
- fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), false, true));
- return;
+ switch(notification.getFeatureID(Paint.class)) {
+ case DGPackage.PAINT__COLOR:
+ fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), false, true));
+ return;
}
super.notifyChanged(notification);
}
@@ -172,8 +146,7 @@ public class PaintItemProvider extends ItemProviderAdapter implements
* @generated
*/
@Override
- protected void collectNewChildDescriptors(
- Collection<Object> newChildDescriptors, Object object) {
+ protected void collectNewChildDescriptors(Collection<Object> newChildDescriptors, Object object) {
super.collectNewChildDescriptors(newChildDescriptors, object);
}
@@ -187,5 +160,4 @@ public class PaintItemProvider extends ItemProviderAdapter implements
public ResourceLocator getResourceLocator() {
return DDEditPlugin.INSTANCE;
}
-
}
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 ebaded5..c041934 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
@@ -37,12 +37,11 @@ import org.eclipse.papyrus.dd.dg.PaintServer;
* This is the item provider adapter for a {@link org.eclipse.papyrus.dd.dg.PaintServer} object.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
+ *
* @generated
*/
-public class PaintServerItemProvider extends DefinitionItemProvider implements
- IEditingDomainItemProvider, IStructuredItemContentProvider,
- ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource,
- IItemColorProvider, IItemFontProvider {
+public class PaintServerItemProvider extends DefinitionItemProvider implements IEditingDomainItemProvider, IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource, IItemColorProvider, IItemFontProvider {
+
/**
* This constructs an instance from a factory and a notifier. <!--
* begin-user-doc --> <!-- end-user-doc -->
@@ -61,9 +60,8 @@ public class PaintServerItemProvider extends DefinitionItemProvider implements
*/
@Override
public List<IItemPropertyDescriptor> getPropertyDescriptors(Object object) {
- if (itemPropertyDescriptors == null) {
+ if(itemPropertyDescriptors == null) {
super.getPropertyDescriptors(object);
-
}
return itemPropertyDescriptors;
}
@@ -73,12 +71,12 @@ public class PaintServerItemProvider extends DefinitionItemProvider implements
* {@link org.eclipse.emf.edit.command.AddCommand}, {@link org.eclipse.emf.edit.command.RemoveCommand} or
* {@link org.eclipse.emf.edit.command.MoveCommand} in {@link #createCommand}.
* <!-- begin-user-doc --> <!-- end-user-doc -->
+ *
* @generated
*/
@Override
- public Collection<? extends EStructuralFeature> getChildrenFeatures(
- Object object) {
- if (childrenFeatures == null) {
+ public Collection<? extends EStructuralFeature> getChildrenFeatures(Object object) {
+ if(childrenFeatures == null) {
super.getChildrenFeatures(object);
childrenFeatures.add(DGPackage.Literals.PAINT_SERVER__TRANSFORM);
}
@@ -87,13 +85,13 @@ public class PaintServerItemProvider extends DefinitionItemProvider implements
/**
* <!-- begin-user-doc --> <!-- end-user-doc -->
+ *
* @generated
*/
@Override
protected EStructuralFeature getChildFeature(Object object, Object child) {
// Check the type of the specified child object and return the proper feature to use for
// adding (see {@link AddCommand}) it as a child.
-
return super.getChildFeature(object, child);
}
@@ -101,14 +99,13 @@ public class PaintServerItemProvider extends DefinitionItemProvider implements
* This returns the label text for the adapted class.
* <!-- begin-user-doc
* --> <!-- end-user-doc -->
+ *
* @generated
*/
@Override
public String getText(Object object) {
String label = ((PaintServer)object).getId();
- return label == null || label.length() == 0 ?
- getString("_UI_PaintServer_type") :
- getString("_UI_PaintServer_type") + " " + label;
+ return label == null || label.length() == 0 ? getString("_UI_PaintServer_type") : getString("_UI_PaintServer_type") + " " + label;
}
/**
@@ -116,16 +113,16 @@ public class PaintServerItemProvider extends DefinitionItemProvider implements
* children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
* <!-- begin-user-doc --> <!--
* end-user-doc -->
+ *
* @generated
*/
@Override
public void notifyChanged(Notification notification) {
updateChildren(notification);
-
- switch (notification.getFeatureID(PaintServer.class)) {
- case DGPackage.PAINT_SERVER__TRANSFORM:
- fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), true, false));
- return;
+ switch(notification.getFeatureID(PaintServer.class)) {
+ case DGPackage.PAINT_SERVER__TRANSFORM:
+ fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), true, false));
+ return;
}
super.notifyChanged(notification);
}
@@ -138,34 +135,12 @@ public class PaintServerItemProvider extends DefinitionItemProvider implements
* @generated
*/
@Override
- protected void collectNewChildDescriptors(
- Collection<Object> newChildDescriptors, Object object) {
+ protected void collectNewChildDescriptors(Collection<Object> newChildDescriptors, Object object) {
super.collectNewChildDescriptors(newChildDescriptors, object);
-
- newChildDescriptors.add
- (createChildParameter
- (DGPackage.Literals.PAINT_SERVER__TRANSFORM,
- DGFactory.eINSTANCE.createMatrix()));
-
- newChildDescriptors.add
- (createChildParameter
- (DGPackage.Literals.PAINT_SERVER__TRANSFORM,
- DGFactory.eINSTANCE.createRotate()));
-
- newChildDescriptors.add
- (createChildParameter
- (DGPackage.Literals.PAINT_SERVER__TRANSFORM,
- DGFactory.eINSTANCE.createScale()));
-
- newChildDescriptors.add
- (createChildParameter
- (DGPackage.Literals.PAINT_SERVER__TRANSFORM,
- DGFactory.eINSTANCE.createSkew()));
-
- newChildDescriptors.add
- (createChildParameter
- (DGPackage.Literals.PAINT_SERVER__TRANSFORM,
- DGFactory.eINSTANCE.createTranslate()));
+ newChildDescriptors.add(createChildParameter(DGPackage.Literals.PAINT_SERVER__TRANSFORM, DGFactory.eINSTANCE.createMatrix()));
+ newChildDescriptors.add(createChildParameter(DGPackage.Literals.PAINT_SERVER__TRANSFORM, DGFactory.eINSTANCE.createRotate()));
+ newChildDescriptors.add(createChildParameter(DGPackage.Literals.PAINT_SERVER__TRANSFORM, DGFactory.eINSTANCE.createScale()));
+ newChildDescriptors.add(createChildParameter(DGPackage.Literals.PAINT_SERVER__TRANSFORM, DGFactory.eINSTANCE.createSkew()));
+ newChildDescriptors.add(createChildParameter(DGPackage.Literals.PAINT_SERVER__TRANSFORM, DGFactory.eINSTANCE.createTranslate()));
}
-
}
diff --git a/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/src/org/eclipse/papyrus/dd/dg/provider/PathCommandItemProvider.java b/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/src/org/eclipse/papyrus/dd/dg/provider/PathCommandItemProvider.java
index 10955bc..d57937b 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
@@ -41,12 +41,11 @@ import org.eclipse.papyrus.dd.edit.DDEditPlugin;
* This is the item provider adapter for a {@link org.eclipse.papyrus.dd.dg.PathCommand} object.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
+ *
* @generated
*/
-public class PathCommandItemProvider extends ItemProviderAdapter implements
- IEditingDomainItemProvider, IStructuredItemContentProvider,
- ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource,
- IItemColorProvider, IItemFontProvider {
+public class PathCommandItemProvider extends ItemProviderAdapter implements IEditingDomainItemProvider, IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource, IItemColorProvider, IItemFontProvider {
+
/**
* This constructs an instance from a factory and a notifier. <!--
* begin-user-doc --> <!-- end-user-doc -->
@@ -65,9 +64,8 @@ public class PathCommandItemProvider extends ItemProviderAdapter implements
*/
@Override
public List<IItemPropertyDescriptor> getPropertyDescriptors(Object object) {
- if (itemPropertyDescriptors == null) {
+ if(itemPropertyDescriptors == null) {
super.getPropertyDescriptors(object);
-
addIsRelativePropertyDescriptor(object);
}
return itemPropertyDescriptors;
@@ -80,25 +78,14 @@ public class PathCommandItemProvider extends ItemProviderAdapter implements
* @generated
*/
protected void addIsRelativePropertyDescriptor(Object object) {
- itemPropertyDescriptors.add
- (createItemPropertyDescriptor
- (((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
- getResourceLocator(),
- getString("_UI_PathCommand_isRelative_feature"),
- getString("_UI_PropertyDescriptor_description", "_UI_PathCommand_isRelative_feature", "_UI_PathCommand_type"),
- DGPackage.Literals.PATH_COMMAND__IS_RELATIVE,
- true,
- false,
- false,
- ItemPropertyDescriptor.BOOLEAN_VALUE_IMAGE,
- null,
- null));
+ itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(), getResourceLocator(), getString("_UI_PathCommand_isRelative_feature"), getString("_UI_PropertyDescriptor_description", "_UI_PathCommand_isRelative_feature", "_UI_PathCommand_type"), DGPackage.Literals.PATH_COMMAND__IS_RELATIVE, true, false, false, ItemPropertyDescriptor.BOOLEAN_VALUE_IMAGE, null, null));
}
/**
* This returns the label text for the adapted class.
* <!-- begin-user-doc
* --> <!-- end-user-doc -->
+ *
* @generated
*/
@Override
@@ -112,16 +99,16 @@ public class PathCommandItemProvider extends ItemProviderAdapter implements
* children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
* <!-- begin-user-doc --> <!--
* end-user-doc -->
+ *
* @generated
*/
@Override
public void notifyChanged(Notification notification) {
updateChildren(notification);
-
- switch (notification.getFeatureID(PathCommand.class)) {
- case DGPackage.PATH_COMMAND__IS_RELATIVE:
- fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), false, true));
- return;
+ switch(notification.getFeatureID(PathCommand.class)) {
+ case DGPackage.PATH_COMMAND__IS_RELATIVE:
+ fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), false, true));
+ return;
}
super.notifyChanged(notification);
}
@@ -134,8 +121,7 @@ public class PathCommandItemProvider extends ItemProviderAdapter implements
* @generated
*/
@Override
- protected void collectNewChildDescriptors(
- Collection<Object> newChildDescriptors, Object object) {
+ protected void collectNewChildDescriptors(Collection<Object> newChildDescriptors, Object object) {
super.collectNewChildDescriptors(newChildDescriptors, object);
}
@@ -149,5 +135,4 @@ public class PathCommandItemProvider extends ItemProviderAdapter implements
public ResourceLocator getResourceLocator() {
return DDEditPlugin.INSTANCE;
}
-
}
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 01d4e89..6d10e28 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
@@ -37,12 +37,11 @@ import org.eclipse.papyrus.dd.dg.Path;
* This is the item provider adapter for a {@link org.eclipse.papyrus.dd.dg.Path} object.
* <!-- begin-user-doc --> <!--
* end-user-doc -->
+ *
* @generated
*/
-public class PathItemProvider extends MarkedElementItemProvider implements
- IEditingDomainItemProvider, IStructuredItemContentProvider,
- ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource,
- IItemColorProvider, IItemFontProvider {
+public class PathItemProvider extends MarkedElementItemProvider implements IEditingDomainItemProvider, IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource, IItemColorProvider, IItemFontProvider {
+
/**
* This constructs an instance from a factory and a notifier. <!--
* begin-user-doc --> <!-- end-user-doc -->
@@ -61,9 +60,8 @@ public class PathItemProvider extends MarkedElementItemProvider implements
*/
@Override
public List<IItemPropertyDescriptor> getPropertyDescriptors(Object object) {
- if (itemPropertyDescriptors == null) {
+ if(itemPropertyDescriptors == null) {
super.getPropertyDescriptors(object);
-
}
return itemPropertyDescriptors;
}
@@ -73,12 +71,12 @@ public class PathItemProvider extends MarkedElementItemProvider implements
* {@link org.eclipse.emf.edit.command.AddCommand}, {@link org.eclipse.emf.edit.command.RemoveCommand} or
* {@link org.eclipse.emf.edit.command.MoveCommand} in {@link #createCommand}.
* <!-- begin-user-doc --> <!-- end-user-doc -->
+ *
* @generated
*/
@Override
- public Collection<? extends EStructuralFeature> getChildrenFeatures(
- Object object) {
- if (childrenFeatures == null) {
+ public Collection<? extends EStructuralFeature> getChildrenFeatures(Object object) {
+ if(childrenFeatures == null) {
super.getChildrenFeatures(object);
childrenFeatures.add(DGPackage.Literals.PATH__COMMAND);
}
@@ -87,19 +85,20 @@ public class PathItemProvider extends MarkedElementItemProvider implements
/**
* <!-- begin-user-doc --> <!-- end-user-doc -->
+ *
* @generated
*/
@Override
protected EStructuralFeature getChildFeature(Object object, Object child) {
// Check the type of the specified child object and return the proper feature to use for
// adding (see {@link AddCommand}) it as a child.
-
return super.getChildFeature(object, child);
}
/**
* This returns Path.gif.
* <!-- begin-user-doc --> <!-- end-user-doc -->
+ *
* @generated
*/
@Override
@@ -111,14 +110,13 @@ public class PathItemProvider extends MarkedElementItemProvider implements
* This returns the label text for the adapted class.
* <!-- begin-user-doc
* --> <!-- end-user-doc -->
+ *
* @generated
*/
@Override
public String getText(Object object) {
String label = ((Path)object).getId();
- return label == null || label.length() == 0 ?
- getString("_UI_Path_type") :
- getString("_UI_Path_type") + " " + label;
+ return label == null || label.length() == 0 ? getString("_UI_Path_type") : getString("_UI_Path_type") + " " + label;
}
/**
@@ -126,16 +124,16 @@ public class PathItemProvider extends MarkedElementItemProvider implements
* children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
* <!-- begin-user-doc --> <!--
* end-user-doc -->
+ *
* @generated
*/
@Override
public void notifyChanged(Notification notification) {
updateChildren(notification);
-
- switch (notification.getFeatureID(Path.class)) {
- case DGPackage.PATH__COMMAND:
- fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), true, false));
- return;
+ switch(notification.getFeatureID(Path.class)) {
+ case DGPackage.PATH__COMMAND:
+ fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), true, false));
+ return;
}
super.notifyChanged(notification);
}
@@ -148,39 +146,13 @@ public class PathItemProvider extends MarkedElementItemProvider implements
* @generated
*/
@Override
- protected void collectNewChildDescriptors(
- Collection<Object> newChildDescriptors, Object object) {
+ protected void collectNewChildDescriptors(Collection<Object> newChildDescriptors, Object object) {
super.collectNewChildDescriptors(newChildDescriptors, object);
-
- newChildDescriptors.add
- (createChildParameter
- (DGPackage.Literals.PATH__COMMAND,
- DGFactory.eINSTANCE.createMoveTo()));
-
- newChildDescriptors.add
- (createChildParameter
- (DGPackage.Literals.PATH__COMMAND,
- DGFactory.eINSTANCE.createClosePath()));
-
- newChildDescriptors.add
- (createChildParameter
- (DGPackage.Literals.PATH__COMMAND,
- DGFactory.eINSTANCE.createCubicCurveTo()));
-
- newChildDescriptors.add
- (createChildParameter
- (DGPackage.Literals.PATH__COMMAND,
- DGFactory.eINSTANCE.createEllipticalArcTo()));
-
- newChildDescriptors.add
- (createChildParameter
- (DGPackage.Literals.PATH__COMMAND,
- DGFactory.eINSTANCE.createQuadraticCurveTo()));
-
- newChildDescriptors.add
- (createChildParameter
- (DGPackage.Literals.PATH__COMMAND,
- DGFactory.eINSTANCE.createLineTo()));
+ newChildDescriptors.add(createChildParameter(DGPackage.Literals.PATH__COMMAND, DGFactory.eINSTANCE.createMoveTo()));
+ newChildDescriptors.add(createChildParameter(DGPackage.Literals.PATH__COMMAND, DGFactory.eINSTANCE.createClosePath()));
+ newChildDescriptors.add(createChildParameter(DGPackage.Literals.PATH__COMMAND, DGFactory.eINSTANCE.createCubicCurveTo()));
+ newChildDescriptors.add(createChildParameter(DGPackage.Literals.PATH__COMMAND, DGFactory.eINSTANCE.createEllipticalArcTo()));
+ newChildDescriptors.add(createChildParameter(DGPackage.Literals.PATH__COMMAND, DGFactory.eINSTANCE.createQuadraticCurveTo()));
+ newChildDescriptors.add(createChildParameter(DGPackage.Literals.PATH__COMMAND, DGFactory.eINSTANCE.createLineTo()));
}
-
}
diff --git a/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/src/org/eclipse/papyrus/dd/dg/provider/PatternItemProvider.java b/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/src/org/eclipse/papyrus/dd/dg/provider/PatternItemProvider.java
index 0aa9e09..ab7979c 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
@@ -39,12 +39,11 @@ import org.eclipse.papyrus.dd.dg.Pattern;
* This is the item provider adapter for a {@link org.eclipse.papyrus.dd.dg.Pattern} object.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
+ *
* @generated
*/
-public class PatternItemProvider extends PaintServerItemProvider implements
- IEditingDomainItemProvider, IStructuredItemContentProvider,
- ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource,
- IItemColorProvider, IItemFontProvider {
+public class PatternItemProvider extends PaintServerItemProvider implements IEditingDomainItemProvider, IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource, IItemColorProvider, IItemFontProvider {
+
/**
* This constructs an instance from a factory and a notifier. <!--
* begin-user-doc --> <!-- end-user-doc -->
@@ -63,9 +62,8 @@ public class PatternItemProvider extends PaintServerItemProvider implements
*/
@Override
public List<IItemPropertyDescriptor> getPropertyDescriptors(Object object) {
- if (itemPropertyDescriptors == null) {
+ if(itemPropertyDescriptors == null) {
super.getPropertyDescriptors(object);
-
}
return itemPropertyDescriptors;
}
@@ -75,12 +73,12 @@ public class PatternItemProvider extends PaintServerItemProvider implements
* {@link org.eclipse.emf.edit.command.AddCommand}, {@link org.eclipse.emf.edit.command.RemoveCommand} or
* {@link org.eclipse.emf.edit.command.MoveCommand} in {@link #createCommand}.
* <!-- begin-user-doc --> <!-- end-user-doc -->
+ *
* @generated
*/
@Override
- public Collection<? extends EStructuralFeature> getChildrenFeatures(
- Object object) {
- if (childrenFeatures == null) {
+ public Collection<? extends EStructuralFeature> getChildrenFeatures(Object object) {
+ if(childrenFeatures == null) {
super.getChildrenFeatures(object);
childrenFeatures.add(DGPackage.Literals.PATTERN__BOUNDS);
childrenFeatures.add(DGPackage.Literals.PATTERN__TILE);
@@ -90,19 +88,20 @@ public class PatternItemProvider extends PaintServerItemProvider implements
/**
* <!-- begin-user-doc --> <!-- end-user-doc -->
+ *
* @generated
*/
@Override
protected EStructuralFeature getChildFeature(Object object, Object child) {
// Check the type of the specified child object and return the proper feature to use for
// adding (see {@link AddCommand}) it as a child.
-
return super.getChildFeature(object, child);
}
/**
* This returns Pattern.gif.
* <!-- begin-user-doc --> <!-- end-user-doc -->
+ *
* @generated
*/
@Override
@@ -114,14 +113,13 @@ public class PatternItemProvider extends PaintServerItemProvider implements
* This returns the label text for the adapted class.
* <!-- begin-user-doc
* --> <!-- end-user-doc -->
+ *
* @generated
*/
@Override
public String getText(Object object) {
String label = ((Pattern)object).getId();
- return label == null || label.length() == 0 ?
- getString("_UI_Pattern_type") :
- getString("_UI_Pattern_type") + " " + label;
+ return label == null || label.length() == 0 ? getString("_UI_Pattern_type") : getString("_UI_Pattern_type") + " " + label;
}
/**
@@ -129,17 +127,17 @@ public class PatternItemProvider extends PaintServerItemProvider implements
* children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
* <!-- begin-user-doc --> <!--
* end-user-doc -->
+ *
* @generated
*/
@Override
public void notifyChanged(Notification notification) {
updateChildren(notification);
-
- switch (notification.getFeatureID(Pattern.class)) {
- case DGPackage.PATTERN__BOUNDS:
- case DGPackage.PATTERN__TILE:
- fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), true, false));
- return;
+ switch(notification.getFeatureID(Pattern.class)) {
+ case DGPackage.PATTERN__BOUNDS:
+ case DGPackage.PATTERN__TILE:
+ fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), true, false));
+ return;
}
super.notifyChanged(notification);
}
@@ -152,89 +150,23 @@ public class PatternItemProvider extends PaintServerItemProvider implements
* @generated
*/
@Override
- protected void collectNewChildDescriptors(
- Collection<Object> newChildDescriptors, Object object) {
+ protected void collectNewChildDescriptors(Collection<Object> newChildDescriptors, Object object) {
super.collectNewChildDescriptors(newChildDescriptors, object);
-
- newChildDescriptors.add
- (createChildParameter
- (DGPackage.Literals.PATTERN__BOUNDS,
- DCFactory.eINSTANCE.createBounds()));
-
- newChildDescriptors.add
- (createChildParameter
- (DGPackage.Literals.PATTERN__TILE,
- DGFactory.eINSTANCE.createGroup()));
-
- newChildDescriptors.add
- (createChildParameter
- (DGPackage.Literals.PATTERN__TILE,
- DGFactory.eINSTANCE.createCanvas()));
-
- newChildDescriptors.add
- (createChildParameter
- (DGPackage.Literals.PATTERN__TILE,
- DGFactory.eINSTANCE.createClipPath()));
-
- newChildDescriptors.add
- (createChildParameter
- (DGPackage.Literals.PATTERN__TILE,
- DGFactory.eINSTANCE.createCircle()));
-
- newChildDescriptors.add
- (createChildParameter
- (DGPackage.Literals.PATTERN__TILE,
- DGFactory.eINSTANCE.createEllipse()));
-
- newChildDescriptors.add
- (createChildParameter
- (DGPackage.Literals.PATTERN__TILE,
- DGFactory.eINSTANCE.createImage()));
-
- newChildDescriptors.add
- (createChildParameter
- (DGPackage.Literals.PATTERN__TILE,
- DGFactory.eINSTANCE.createLine()));
-
- newChildDescriptors.add
- (createChildParameter
- (DGPackage.Literals.PATTERN__TILE,
- DGFactory.eINSTANCE.createMarker()));
-
- newChildDescriptors.add
- (createChildParameter
- (DGPackage.Literals.PATTERN__TILE,
- DGFactory.eINSTANCE.createPath()));
-
- newChildDescriptors.add
- (createChildParameter
- (DGPackage.Literals.PATTERN__TILE,
- DGFactory.eINSTANCE.createPolygon()));
-
- newChildDescriptors.add
- (createChildParameter
- (DGPackage.Literals.PATTERN__TILE,
- DGFactory.eINSTANCE.createPolyline()));
-
- newChildDescriptors.add
- (createChildParameter
- (DGPackage.Literals.PATTERN__TILE,
- DGFactory.eINSTANCE.createRectangle()));
-
- newChildDescriptors.add
- (createChildParameter
- (DGPackage.Literals.PATTERN__TILE,
- DGFactory.eINSTANCE.createRootCanvas()));
-
- newChildDescriptors.add
- (createChildParameter
- (DGPackage.Literals.PATTERN__TILE,
- DGFactory.eINSTANCE.createText()));
-
- newChildDescriptors.add
- (createChildParameter
- (DGPackage.Literals.PATTERN__TILE,
- DGFactory.eINSTANCE.createUse()));
+ newChildDescriptors.add(createChildParameter(DGPackage.Literals.PATTERN__BOUNDS, DCFactory.eINSTANCE.createBounds()));
+ newChildDescriptors.add(createChildParameter(DGPackage.Literals.PATTERN__TILE, DGFactory.eINSTANCE.createGroup()));
+ newChildDescriptors.add(createChildParameter(DGPackage.Literals.PATTERN__TILE, DGFactory.eINSTANCE.createCanvas()));
+ newChildDescriptors.add(createChildParameter(DGPackage.Literals.PATTERN__TILE, DGFactory.eINSTANCE.createClipPath()));
+ newChildDescriptors.add(createChildParameter(DGPackage.Literals.PATTERN__TILE, DGFactory.eINSTANCE.createCircle()));
+ newChildDescriptors.add(createChildParameter(DGPackage.Literals.PATTERN__TILE, DGFactory.eINSTANCE.createEllipse()));
+ newChildDescriptors.add(createChildParameter(DGPackage.Literals.PATTERN__TILE, DGFactory.eINSTANCE.createImage()));
+ newChildDescriptors.add(createChildParameter(DGPackage.Literals.PATTERN__TILE, DGFactory.eINSTANCE.createLine()));
+ newChildDescriptors.add(createChildParameter(DGPackage.Literals.PATTERN__TILE, DGFactory.eINSTANCE.createMarker()));
+ newChildDescriptors.add(createChildParameter(DGPackage.Literals.PATTERN__TILE, DGFactory.eINSTANCE.createPath()));
+ newChildDescriptors.add(createChildParameter(DGPackage.Literals.PATTERN__TILE, DGFactory.eINSTANCE.createPolygon()));
+ newChildDescriptors.add(createChildParameter(DGPackage.Literals.PATTERN__TILE, DGFactory.eINSTANCE.createPolyline()));
+ newChildDescriptors.add(createChildParameter(DGPackage.Literals.PATTERN__TILE, DGFactory.eINSTANCE.createRectangle()));
+ newChildDescriptors.add(createChildParameter(DGPackage.Literals.PATTERN__TILE, DGFactory.eINSTANCE.createRootCanvas()));
+ newChildDescriptors.add(createChildParameter(DGPackage.Literals.PATTERN__TILE, DGFactory.eINSTANCE.createText()));
+ newChildDescriptors.add(createChildParameter(DGPackage.Literals.PATTERN__TILE, DGFactory.eINSTANCE.createUse()));
}
-
}
diff --git a/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/src/org/eclipse/papyrus/dd/dg/provider/PolygonItemProvider.java b/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/src/org/eclipse/papyrus/dd/dg/provider/PolygonItemProvider.java
index 1d9e77c..73cc2f2 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
@@ -38,12 +38,11 @@ import org.eclipse.papyrus.dd.dg.Polygon;
* This is the item provider adapter for a {@link org.eclipse.papyrus.dd.dg.Polygon} object.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
+ *
* @generated
*/
-public class PolygonItemProvider extends MarkedElementItemProvider implements
- IEditingDomainItemProvider, IStructuredItemContentProvider,
- ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource,
- IItemColorProvider, IItemFontProvider {
+public class PolygonItemProvider extends MarkedElementItemProvider implements IEditingDomainItemProvider, IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource, IItemColorProvider, IItemFontProvider {
+
/**
* This constructs an instance from a factory and a notifier. <!--
* begin-user-doc --> <!-- end-user-doc -->
@@ -62,9 +61,8 @@ public class PolygonItemProvider extends MarkedElementItemProvider implements
*/
@Override
public List<IItemPropertyDescriptor> getPropertyDescriptors(Object object) {
- if (itemPropertyDescriptors == null) {
+ if(itemPropertyDescriptors == null) {
super.getPropertyDescriptors(object);
-
}
return itemPropertyDescriptors;
}
@@ -74,12 +72,12 @@ public class PolygonItemProvider extends MarkedElementItemProvider implements
* {@link org.eclipse.emf.edit.command.AddCommand}, {@link org.eclipse.emf.edit.command.RemoveCommand} or
* {@link org.eclipse.emf.edit.command.MoveCommand} in {@link #createCommand}.
* <!-- begin-user-doc --> <!-- end-user-doc -->
+ *
* @generated
*/
@Override
- public Collection<? extends EStructuralFeature> getChildrenFeatures(
- Object object) {
- if (childrenFeatures == null) {
+ public Collection<? extends EStructuralFeature> getChildrenFeatures(Object object) {
+ if(childrenFeatures == null) {
super.getChildrenFeatures(object);
childrenFeatures.add(DGPackage.Literals.POLYGON__POINT);
}
@@ -88,19 +86,20 @@ public class PolygonItemProvider extends MarkedElementItemProvider implements
/**
* <!-- begin-user-doc --> <!-- end-user-doc -->
+ *
* @generated
*/
@Override
protected EStructuralFeature getChildFeature(Object object, Object child) {
// Check the type of the specified child object and return the proper feature to use for
// adding (see {@link AddCommand}) it as a child.
-
return super.getChildFeature(object, child);
}
/**
* This returns Polygon.gif.
* <!-- begin-user-doc --> <!-- end-user-doc -->
+ *
* @generated
*/
@Override
@@ -112,14 +111,13 @@ public class PolygonItemProvider extends MarkedElementItemProvider implements
* This returns the label text for the adapted class.
* <!-- begin-user-doc
* --> <!-- end-user-doc -->
+ *
* @generated
*/
@Override
public String getText(Object object) {
String label = ((Polygon)object).getId();
- return label == null || label.length() == 0 ?
- getString("_UI_Polygon_type") :
- getString("_UI_Polygon_type") + " " + label;
+ return label == null || label.length() == 0 ? getString("_UI_Polygon_type") : getString("_UI_Polygon_type") + " " + label;
}
/**
@@ -127,16 +125,16 @@ public class PolygonItemProvider extends MarkedElementItemProvider implements
* children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
* <!-- begin-user-doc --> <!--
* end-user-doc -->
+ *
* @generated
*/
@Override
public void notifyChanged(Notification notification) {
updateChildren(notification);
-
- switch (notification.getFeatureID(Polygon.class)) {
- case DGPackage.POLYGON__POINT:
- fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), true, false));
- return;
+ switch(notification.getFeatureID(Polygon.class)) {
+ case DGPackage.POLYGON__POINT:
+ fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), true, false));
+ return;
}
super.notifyChanged(notification);
}
@@ -149,14 +147,8 @@ public class PolygonItemProvider extends MarkedElementItemProvider implements
* @generated
*/
@Override
- protected void collectNewChildDescriptors(
- Collection<Object> newChildDescriptors, Object object) {
+ protected void collectNewChildDescriptors(Collection<Object> newChildDescriptors, Object object) {
super.collectNewChildDescriptors(newChildDescriptors, object);
-
- newChildDescriptors.add
- (createChildParameter
- (DGPackage.Literals.POLYGON__POINT,
- DCFactory.eINSTANCE.createPoint()));
+ newChildDescriptors.add(createChildParameter(DGPackage.Literals.POLYGON__POINT, DCFactory.eINSTANCE.createPoint()));
}
-
}
diff --git a/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/src/org/eclipse/papyrus/dd/dg/provider/PolylineItemProvider.java b/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/src/org/eclipse/papyrus/dd/dg/provider/PolylineItemProvider.java
index f15043a..26f038b 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
@@ -38,12 +38,11 @@ import org.eclipse.papyrus.dd.dg.Polyline;
* This is the item provider adapter for a {@link org.eclipse.papyrus.dd.dg.Polyline} object.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
+ *
* @generated
*/
-public class PolylineItemProvider extends MarkedElementItemProvider implements
- IEditingDomainItemProvider, IStructuredItemContentProvider,
- ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource,
- IItemColorProvider, IItemFontProvider {
+public class PolylineItemProvider extends MarkedElementItemProvider implements IEditingDomainItemProvider, IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource, IItemColorProvider, IItemFontProvider {
+
/**
* This constructs an instance from a factory and a notifier. <!--
* begin-user-doc --> <!-- end-user-doc -->
@@ -62,9 +61,8 @@ public class PolylineItemProvider extends MarkedElementItemProvider implements
*/
@Override
public List<IItemPropertyDescriptor> getPropertyDescriptors(Object object) {
- if (itemPropertyDescriptors == null) {
+ if(itemPropertyDescriptors == null) {
super.getPropertyDescriptors(object);
-
}
return itemPropertyDescriptors;
}
@@ -74,12 +72,12 @@ public class PolylineItemProvider extends MarkedElementItemProvider implements
* {@link org.eclipse.emf.edit.command.AddCommand}, {@link org.eclipse.emf.edit.command.RemoveCommand} or
* {@link org.eclipse.emf.edit.command.MoveCommand} in {@link #createCommand}.
* <!-- begin-user-doc --> <!-- end-user-doc -->
+ *
* @generated
*/
@Override
- public Collection<? extends EStructuralFeature> getChildrenFeatures(
- Object object) {
- if (childrenFeatures == null) {
+ public Collection<? extends EStructuralFeature> getChildrenFeatures(Object object) {
+ if(childrenFeatures == null) {
super.getChildrenFeatures(object);
childrenFeatures.add(DGPackage.Literals.POLYLINE__POINT);
}
@@ -88,19 +86,20 @@ public class PolylineItemProvider extends MarkedElementItemProvider implements
/**
* <!-- begin-user-doc --> <!-- end-user-doc -->
+ *
* @generated
*/
@Override
protected EStructuralFeature getChildFeature(Object object, Object child) {
// Check the type of the specified child object and return the proper feature to use for
// adding (see {@link AddCommand}) it as a child.
-
return super.getChildFeature(object, child);
}
/**
* This returns Polyline.gif.
* <!-- begin-user-doc --> <!-- end-user-doc -->
+ *
* @generated
*/
@Override
@@ -112,14 +111,13 @@ public class PolylineItemProvider extends MarkedElementItemProvider implements
* This returns the label text for the adapted class.
* <!-- begin-user-doc
* --> <!-- end-user-doc -->
+ *
* @generated
*/
@Override
public String getText(Object object) {
String label = ((Polyline)object).getId();
- return label == null || label.length() == 0 ?
- getString("_UI_Polyline_type") :
- getString("_UI_Polyline_type") + " " + label;
+ return label == null || label.length() == 0 ? getString("_UI_Polyline_type") : getString("_UI_Polyline_type") + " " + label;
}
/**
@@ -127,16 +125,16 @@ public class PolylineItemProvider extends MarkedElementItemProvider implements
* children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
* <!-- begin-user-doc --> <!--
* end-user-doc -->
+ *
* @generated
*/
@Override
public void notifyChanged(Notification notification) {
updateChildren(notification);
-
- switch (notification.getFeatureID(Polyline.class)) {
- case DGPackage.POLYLINE__POINT:
- fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), true, false));
- return;
+ switch(notification.getFeatureID(Polyline.class)) {
+ case DGPackage.POLYLINE__POINT:
+ fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), true, false));
+ return;
}
super.notifyChanged(notification);
}
@@ -149,14 +147,8 @@ public class PolylineItemProvider extends MarkedElementItemProvider implements
* @generated
*/
@Override
- protected void collectNewChildDescriptors(
- Collection<Object> newChildDescriptors, Object object) {
+ protected void collectNewChildDescriptors(Collection<Object> newChildDescriptors, Object object) {
super.collectNewChildDescriptors(newChildDescriptors, object);
-
- newChildDescriptors.add
- (createChildParameter
- (DGPackage.Literals.POLYLINE__POINT,
- DCFactory.eINSTANCE.createPoint()));
+ newChildDescriptors.add(createChildParameter(DGPackage.Literals.POLYLINE__POINT, DCFactory.eINSTANCE.createPoint()));
}
-
}
diff --git a/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/src/org/eclipse/papyrus/dd/dg/provider/QuadraticCurveToItemProvider.java b/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/src/org/eclipse/papyrus/dd/dg/provider/QuadraticCurveToItemProvider.java
index b53005c..f92f223 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
@@ -35,16 +35,13 @@ import org.eclipse.papyrus.dd.dg.DGPackage;
import org.eclipse.papyrus.dd.dg.QuadraticCurveTo;
/**
- * This is the item provider adapter for a
- * {@link org.eclipse.papyrus.dd.dg.QuadraticCurveTo} object. <!--
+ * This is the item provider adapter for a {@link org.eclipse.papyrus.dd.dg.QuadraticCurveTo} object. <!--
* begin-user-doc --> <!-- end-user-doc -->
*
* @generated
*/
-public class QuadraticCurveToItemProvider extends PathCommandItemProvider
- implements IEditingDomainItemProvider, IStructuredItemContentProvider,
- ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource,
- IItemColorProvider, IItemFontProvider {
+public class QuadraticCurveToItemProvider extends PathCommandItemProvider implements IEditingDomainItemProvider, IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource, IItemColorProvider, IItemFontProvider {
+
/**
* This constructs an instance from a factory and a notifier. <!--
* begin-user-doc --> <!-- end-user-doc -->
@@ -63,9 +60,8 @@ public class QuadraticCurveToItemProvider extends PathCommandItemProvider
*/
@Override
public List<IItemPropertyDescriptor> getPropertyDescriptors(Object object) {
- if (itemPropertyDescriptors == null) {
+ if(itemPropertyDescriptors == null) {
super.getPropertyDescriptors(object);
-
}
return itemPropertyDescriptors;
}
@@ -75,12 +71,12 @@ public class QuadraticCurveToItemProvider extends PathCommandItemProvider
* {@link org.eclipse.emf.edit.command.AddCommand}, {@link org.eclipse.emf.edit.command.RemoveCommand} or
* {@link org.eclipse.emf.edit.command.MoveCommand} in {@link #createCommand}.
* <!-- begin-user-doc --> <!-- end-user-doc -->
+ *
* @generated
*/
@Override
- public Collection<? extends EStructuralFeature> getChildrenFeatures(
- Object object) {
- if (childrenFeatures == null) {
+ public Collection<? extends EStructuralFeature> getChildrenFeatures(Object object) {
+ if(childrenFeatures == null) {
super.getChildrenFeatures(object);
childrenFeatures.add(DGPackage.Literals.QUADRATIC_CURVE_TO__CONTROL);
childrenFeatures.add(DGPackage.Literals.QUADRATIC_CURVE_TO__POINT);
@@ -90,13 +86,13 @@ public class QuadraticCurveToItemProvider extends PathCommandItemProvider
/**
* <!-- begin-user-doc --> <!-- end-user-doc -->
+ *
* @generated
*/
@Override
protected EStructuralFeature getChildFeature(Object object, Object child) {
// Check the type of the specified child object and return the proper feature to use for
// adding (see {@link AddCommand}) it as a child.
-
return super.getChildFeature(object, child);
}
@@ -104,6 +100,7 @@ public class QuadraticCurveToItemProvider extends PathCommandItemProvider
* This returns QuadraticCurveTo.gif.
* <!-- begin-user-doc --> <!--
* end-user-doc -->
+ *
* @generated
*/
@Override
@@ -115,6 +112,7 @@ public class QuadraticCurveToItemProvider extends PathCommandItemProvider
* This returns the label text for the adapted class.
* <!-- begin-user-doc
* --> <!-- end-user-doc -->
+ *
* @generated
*/
@Override
@@ -128,17 +126,17 @@ public class QuadraticCurveToItemProvider extends PathCommandItemProvider
* children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
* <!-- begin-user-doc --> <!--
* end-user-doc -->
+ *
* @generated
*/
@Override
public void notifyChanged(Notification notification) {
updateChildren(notification);
-
- switch (notification.getFeatureID(QuadraticCurveTo.class)) {
- case DGPackage.QUADRATIC_CURVE_TO__CONTROL:
- case DGPackage.QUADRATIC_CURVE_TO__POINT:
- fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), true, false));
- return;
+ 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));
+ return;
}
super.notifyChanged(notification);
}
@@ -151,44 +149,26 @@ public class QuadraticCurveToItemProvider extends PathCommandItemProvider
* @generated
*/
@Override
- protected void collectNewChildDescriptors(
- Collection<Object> newChildDescriptors, Object object) {
+ protected void collectNewChildDescriptors(Collection<Object> newChildDescriptors, Object object) {
super.collectNewChildDescriptors(newChildDescriptors, object);
-
- newChildDescriptors.add
- (createChildParameter
- (DGPackage.Literals.QUADRATIC_CURVE_TO__CONTROL,
- DCFactory.eINSTANCE.createPoint()));
-
- newChildDescriptors.add
- (createChildParameter
- (DGPackage.Literals.QUADRATIC_CURVE_TO__POINT,
- DCFactory.eINSTANCE.createPoint()));
+ newChildDescriptors.add(createChildParameter(DGPackage.Literals.QUADRATIC_CURVE_TO__CONTROL, DCFactory.eINSTANCE.createPoint()));
+ newChildDescriptors.add(createChildParameter(DGPackage.Literals.QUADRATIC_CURVE_TO__POINT, DCFactory.eINSTANCE.createPoint()));
}
/**
- * This returns the label text for
- * {@link org.eclipse.emf.edit.command.CreateChildCommand}. <!--
+ * This returns the label text for {@link org.eclipse.emf.edit.command.CreateChildCommand}. <!--
* begin-user-doc --> <!-- end-user-doc -->
*
* @generated
*/
@Override
- public String getCreateChildText(Object owner, Object feature,
- Object child, Collection<?> selection) {
+ public String getCreateChildText(Object owner, Object feature, Object child, Collection<?> selection) {
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) });
+ boolean qualify = childFeature == DGPackage.Literals.QUADRATIC_CURVE_TO__CONTROL || childFeature == DGPackage.Literals.QUADRATIC_CURVE_TO__POINT;
+ if(qualify) {
+ return getString("_UI_CreateChild_text2", new Object[]{ getTypeText(childObject), getFeatureText(childFeature), getTypeText(owner) });
}
return 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 8eccf4c..d5ae1e8 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
@@ -38,12 +38,11 @@ import org.eclipse.papyrus.dd.dg.RadialGradient;
* This is the item provider adapter for a {@link org.eclipse.papyrus.dd.dg.RadialGradient} object.
* <!-- begin-user-doc
* --> <!-- end-user-doc -->
+ *
* @generated
*/
-public class RadialGradientItemProvider extends GradientItemProvider implements
- IEditingDomainItemProvider, IStructuredItemContentProvider,
- ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource,
- IItemColorProvider, IItemFontProvider {
+public class RadialGradientItemProvider extends GradientItemProvider implements IEditingDomainItemProvider, IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource, IItemColorProvider, IItemFontProvider {
+
/**
* This constructs an instance from a factory and a notifier. <!--
* begin-user-doc --> <!-- end-user-doc -->
@@ -62,9 +61,8 @@ public class RadialGradientItemProvider extends GradientItemProvider implements
*/
@Override
public List<IItemPropertyDescriptor> getPropertyDescriptors(Object object) {
- if (itemPropertyDescriptors == null) {
+ if(itemPropertyDescriptors == null) {
super.getPropertyDescriptors(object);
-
addRadiusPropertyDescriptor(object);
}
return itemPropertyDescriptors;
@@ -77,19 +75,7 @@ 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));
}
/**
@@ -97,12 +83,12 @@ public class RadialGradientItemProvider extends GradientItemProvider implements
* {@link org.eclipse.emf.edit.command.AddCommand}, {@link org.eclipse.emf.edit.command.RemoveCommand} or
* {@link org.eclipse.emf.edit.command.MoveCommand} in {@link #createCommand}.
* <!-- begin-user-doc --> <!-- end-user-doc -->
+ *
* @generated
*/
@Override
- public Collection<? extends EStructuralFeature> getChildrenFeatures(
- Object object) {
- if (childrenFeatures == null) {
+ public Collection<? extends EStructuralFeature> getChildrenFeatures(Object object) {
+ if(childrenFeatures == null) {
super.getChildrenFeatures(object);
childrenFeatures.add(DGPackage.Literals.RADIAL_GRADIENT__CENTER);
childrenFeatures.add(DGPackage.Literals.RADIAL_GRADIENT__FOCUS);
@@ -112,13 +98,13 @@ public class RadialGradientItemProvider extends GradientItemProvider implements
/**
* <!-- begin-user-doc --> <!-- end-user-doc -->
+ *
* @generated
*/
@Override
protected EStructuralFeature getChildFeature(Object object, Object child) {
// Check the type of the specified child object and return the proper feature to use for
// adding (see {@link AddCommand}) it as a child.
-
return super.getChildFeature(object, child);
}
@@ -126,6 +112,7 @@ public class RadialGradientItemProvider extends GradientItemProvider implements
* This returns RadialGradient.gif.
* <!-- begin-user-doc --> <!--
* end-user-doc -->
+ *
* @generated
*/
@Override
@@ -137,14 +124,13 @@ public class RadialGradientItemProvider extends GradientItemProvider implements
* This returns the label text for the adapted class.
* <!-- begin-user-doc
* --> <!-- end-user-doc -->
+ *
* @generated
*/
@Override
public String getText(Object object) {
String label = ((RadialGradient)object).getId();
- return label == null || label.length() == 0 ?
- getString("_UI_RadialGradient_type") :
- getString("_UI_RadialGradient_type") + " " + label;
+ return label == null || label.length() == 0 ? getString("_UI_RadialGradient_type") : getString("_UI_RadialGradient_type") + " " + label;
}
/**
@@ -152,20 +138,20 @@ public class RadialGradientItemProvider extends GradientItemProvider implements
* children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
* <!-- begin-user-doc --> <!--
* end-user-doc -->
+ *
* @generated
*/
@Override
public void notifyChanged(Notification notification) {
updateChildren(notification);
-
- switch (notification.getFeatureID(RadialGradient.class)) {
- case DGPackage.RADIAL_GRADIENT__RADIUS:
- fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), false, true));
- return;
- case DGPackage.RADIAL_GRADIENT__CENTER:
- case DGPackage.RADIAL_GRADIENT__FOCUS:
- fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), true, false));
- return;
+ switch(notification.getFeatureID(RadialGradient.class)) {
+ case DGPackage.RADIAL_GRADIENT__RADIUS:
+ fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), false, true));
+ return;
+ case DGPackage.RADIAL_GRADIENT__CENTER:
+ case DGPackage.RADIAL_GRADIENT__FOCUS:
+ fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), true, false));
+ return;
}
super.notifyChanged(notification);
}
@@ -178,44 +164,26 @@ public class RadialGradientItemProvider extends GradientItemProvider implements
* @generated
*/
@Override
- protected void collectNewChildDescriptors(
- Collection<Object> newChildDescriptors, Object object) {
+ protected void collectNewChildDescriptors(Collection<Object> newChildDescriptors, Object object) {
super.collectNewChildDescriptors(newChildDescriptors, object);
-
- newChildDescriptors.add
- (createChildParameter
- (DGPackage.Literals.RADIAL_GRADIENT__CENTER,
- DCFactory.eINSTANCE.createPoint()));
-
- newChildDescriptors.add
- (createChildParameter
- (DGPackage.Literals.RADIAL_GRADIENT__FOCUS,
- DCFactory.eINSTANCE.createPoint()));
+ newChildDescriptors.add(createChildParameter(DGPackage.Literals.RADIAL_GRADIENT__CENTER, DCFactory.eINSTANCE.createPoint()));
+ newChildDescriptors.add(createChildParameter(DGPackage.Literals.RADIAL_GRADIENT__FOCUS, DCFactory.eINSTANCE.createPoint()));
}
/**
- * This returns the label text for
- * {@link org.eclipse.emf.edit.command.CreateChildCommand}. <!--
+ * This returns the label text for {@link org.eclipse.emf.edit.command.CreateChildCommand}. <!--
* begin-user-doc --> <!-- end-user-doc -->
*
* @generated
*/
@Override
- public String getCreateChildText(Object owner, Object feature,
- Object child, Collection<?> selection) {
+ public String getCreateChildText(Object owner, Object feature, Object child, Collection<?> selection) {
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) });
+ boolean qualify = childFeature == DGPackage.Literals.RADIAL_GRADIENT__CENTER || childFeature == DGPackage.Literals.RADIAL_GRADIENT__FOCUS;
+ if(qualify) {
+ return getString("_UI_CreateChild_text2", new Object[]{ getTypeText(childObject), getFeatureText(childFeature), getTypeText(owner) });
}
return 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 7cd140a..f103667 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
@@ -40,12 +40,11 @@ import org.eclipse.papyrus.dd.dg.Rectangle;
* This is the item provider adapter for a {@link org.eclipse.papyrus.dd.dg.Rectangle} object.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
+ *
* @generated
*/
-public class RectangleItemProvider extends GraphicalElementItemProvider
- implements IEditingDomainItemProvider, IStructuredItemContentProvider,
- ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource,
- IItemColorProvider, IItemFontProvider {
+public class RectangleItemProvider extends GraphicalElementItemProvider implements IEditingDomainItemProvider, IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource, IItemColorProvider, IItemFontProvider {
+
/**
* This constructs an instance from a factory and a notifier. <!--
* begin-user-doc --> <!-- end-user-doc -->
@@ -64,9 +63,8 @@ public class RectangleItemProvider extends GraphicalElementItemProvider
*/
@Override
public List<IItemPropertyDescriptor> getPropertyDescriptors(Object object) {
- if (itemPropertyDescriptors == null) {
+ if(itemPropertyDescriptors == null) {
super.getPropertyDescriptors(object);
-
addCornerRadiusPropertyDescriptor(object);
}
return itemPropertyDescriptors;
@@ -79,19 +77,7 @@ public class RectangleItemProvider extends GraphicalElementItemProvider
* @generated
*/
protected void addCornerRadiusPropertyDescriptor(Object object) {
- itemPropertyDescriptors.add
- (createItemPropertyDescriptor
- (((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
- getResourceLocator(),
- getString("_UI_Rectangle_cornerRadius_feature"),
- getString("_UI_PropertyDescriptor_description", "_UI_Rectangle_cornerRadius_feature", "_UI_Rectangle_type"),
- DGPackage.Literals.RECTANGLE__CORNER_RADIUS,
- true,
- false,
- false,
- ItemPropertyDescriptor.REAL_VALUE_IMAGE,
- null,
- null));
+ itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(), getResourceLocator(), getString("_UI_Rectangle_cornerRadius_feature"), getString("_UI_PropertyDescriptor_description", "_UI_Rectangle_cornerRadius_feature", "_UI_Rectangle_type"), DGPackage.Literals.RECTANGLE__CORNER_RADIUS, true, false, false, ItemPropertyDescriptor.REAL_VALUE_IMAGE, null, null));
}
/**
@@ -99,12 +85,12 @@ public class RectangleItemProvider extends GraphicalElementItemProvider
* {@link org.eclipse.emf.edit.command.AddCommand}, {@link org.eclipse.emf.edit.command.RemoveCommand} or
* {@link org.eclipse.emf.edit.command.MoveCommand} in {@link #createCommand}.
* <!-- begin-user-doc --> <!-- end-user-doc -->
+ *
* @generated
*/
@Override
- public Collection<? extends EStructuralFeature> getChildrenFeatures(
- Object object) {
- if (childrenFeatures == null) {
+ public Collection<? extends EStructuralFeature> getChildrenFeatures(Object object) {
+ if(childrenFeatures == null) {
super.getChildrenFeatures(object);
childrenFeatures.add(DGPackage.Literals.RECTANGLE__BOUNDS);
}
@@ -113,19 +99,20 @@ public class RectangleItemProvider extends GraphicalElementItemProvider
/**
* <!-- begin-user-doc --> <!-- end-user-doc -->
+ *
* @generated
*/
@Override
protected EStructuralFeature getChildFeature(Object object, Object child) {
// Check the type of the specified child object and return the proper feature to use for
// adding (see {@link AddCommand}) it as a child.
-
return super.getChildFeature(object, child);
}
/**
* This returns Rectangle.gif.
* <!-- begin-user-doc --> <!-- end-user-doc -->
+ *
* @generated
*/
@Override
@@ -137,14 +124,13 @@ public class RectangleItemProvider extends GraphicalElementItemProvider
* This returns the label text for the adapted class.
* <!-- begin-user-doc
* --> <!-- end-user-doc -->
+ *
* @generated
*/
@Override
public String getText(Object object) {
String label = ((Rectangle)object).getId();
- return label == null || label.length() == 0 ?
- getString("_UI_Rectangle_type") :
- getString("_UI_Rectangle_type") + " " + label;
+ return label == null || label.length() == 0 ? getString("_UI_Rectangle_type") : getString("_UI_Rectangle_type") + " " + label;
}
/**
@@ -152,19 +138,19 @@ public class RectangleItemProvider extends GraphicalElementItemProvider
* children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
* <!-- begin-user-doc --> <!--
* end-user-doc -->
+ *
* @generated
*/
@Override
public void notifyChanged(Notification notification) {
updateChildren(notification);
-
- switch (notification.getFeatureID(Rectangle.class)) {
- case DGPackage.RECTANGLE__CORNER_RADIUS:
- fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), false, true));
- return;
- case DGPackage.RECTANGLE__BOUNDS:
- fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), true, false));
- return;
+ switch(notification.getFeatureID(Rectangle.class)) {
+ case DGPackage.RECTANGLE__CORNER_RADIUS:
+ fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), false, true));
+ return;
+ case DGPackage.RECTANGLE__BOUNDS:
+ fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), true, false));
+ return;
}
super.notifyChanged(notification);
}
@@ -177,14 +163,8 @@ public class RectangleItemProvider extends GraphicalElementItemProvider
* @generated
*/
@Override
- protected void collectNewChildDescriptors(
- Collection<Object> newChildDescriptors, Object object) {
+ protected void collectNewChildDescriptors(Collection<Object> newChildDescriptors, Object object) {
super.collectNewChildDescriptors(newChildDescriptors, object);
-
- newChildDescriptors.add
- (createChildParameter
- (DGPackage.Literals.RECTANGLE__BOUNDS,
- DCFactory.eINSTANCE.createBounds()));
+ newChildDescriptors.add(createChildParameter(DGPackage.Literals.RECTANGLE__BOUNDS, DCFactory.eINSTANCE.createBounds()));
}
-
}
diff --git a/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/src/org/eclipse/papyrus/dd/dg/provider/RootCanvasItemProvider.java b/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/src/org/eclipse/papyrus/dd/dg/provider/RootCanvasItemProvider.java
index 6315811..0b190be 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
@@ -39,12 +39,11 @@ import org.eclipse.papyrus.dd.dg.RootCanvas;
* This is the item provider adapter for a {@link org.eclipse.papyrus.dd.dg.RootCanvas} object.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
+ *
* @generated
*/
-public class RootCanvasItemProvider extends CanvasItemProvider implements
- IEditingDomainItemProvider, IStructuredItemContentProvider,
- ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource,
- IItemColorProvider, IItemFontProvider {
+public class RootCanvasItemProvider extends CanvasItemProvider implements IEditingDomainItemProvider, IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource, IItemColorProvider, IItemFontProvider {
+
/**
* This constructs an instance from a factory and a notifier. <!--
* begin-user-doc --> <!-- end-user-doc -->
@@ -63,9 +62,8 @@ public class RootCanvasItemProvider extends CanvasItemProvider implements
*/
@Override
public List<IItemPropertyDescriptor> getPropertyDescriptors(Object object) {
- if (itemPropertyDescriptors == null) {
+ if(itemPropertyDescriptors == null) {
super.getPropertyDescriptors(object);
-
addBackgroundColorPropertyDescriptor(object);
addExternalStyleSheetPropertyDescriptor(object);
addScriptPropertyDescriptor(object);
@@ -80,62 +78,28 @@ public class RootCanvasItemProvider extends CanvasItemProvider implements
* @generated
*/
protected void addBackgroundColorPropertyDescriptor(Object object) {
- itemPropertyDescriptors.add
- (createItemPropertyDescriptor
- (((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
- getResourceLocator(),
- getString("_UI_RootCanvas_backgroundColor_feature"),
- getString("_UI_PropertyDescriptor_description", "_UI_RootCanvas_backgroundColor_feature", "_UI_RootCanvas_type"),
- DGPackage.Literals.ROOT_CANVAS__BACKGROUND_COLOR,
- true,
- false,
- false,
- ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
- null,
- null));
+ itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(), getResourceLocator(), getString("_UI_RootCanvas_backgroundColor_feature"), getString("_UI_PropertyDescriptor_description", "_UI_RootCanvas_backgroundColor_feature", "_UI_RootCanvas_type"), DGPackage.Literals.ROOT_CANVAS__BACKGROUND_COLOR, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null));
}
/**
* This adds a property descriptor for the External Style Sheet feature.
* <!-- begin-user-doc --> <!-- end-user-doc -->
+ *
* @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));
}
/**
* This adds a property descriptor for the Script feature.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
+ *
* @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));
}
/**
@@ -143,12 +107,12 @@ public class RootCanvasItemProvider extends CanvasItemProvider implements
* {@link org.eclipse.emf.edit.command.AddCommand}, {@link org.eclipse.emf.edit.command.RemoveCommand} or
* {@link org.eclipse.emf.edit.command.MoveCommand} in {@link #createCommand}.
* <!-- begin-user-doc --> <!-- end-user-doc -->
+ *
* @generated
*/
@Override
- public Collection<? extends EStructuralFeature> getChildrenFeatures(
- Object object) {
- if (childrenFeatures == null) {
+ public Collection<? extends EStructuralFeature> getChildrenFeatures(Object object) {
+ if(childrenFeatures == null) {
super.getChildrenFeatures(object);
childrenFeatures.add(DGPackage.Literals.ROOT_CANVAS__DEFINITIONS);
}
@@ -157,13 +121,13 @@ public class RootCanvasItemProvider extends CanvasItemProvider implements
/**
* <!-- begin-user-doc --> <!-- end-user-doc -->
+ *
* @generated
*/
@Override
protected EStructuralFeature getChildFeature(Object object, Object child) {
// Check the type of the specified child object and return the proper feature to use for
// adding (see {@link AddCommand}) it as a child.
-
return super.getChildFeature(object, child);
}
@@ -182,14 +146,13 @@ public class RootCanvasItemProvider extends CanvasItemProvider implements
* This returns the label text for the adapted class.
* <!-- begin-user-doc
* --> <!-- end-user-doc -->
+ *
* @generated
*/
@Override
public String getText(Object object) {
String label = ((RootCanvas)object).getId();
- return label == null || label.length() == 0 ?
- getString("_UI_RootCanvas_type") :
- getString("_UI_RootCanvas_type") + " " + label;
+ return label == null || label.length() == 0 ? getString("_UI_RootCanvas_type") : getString("_UI_RootCanvas_type") + " " + label;
}
/**
@@ -197,20 +160,20 @@ public class RootCanvasItemProvider extends CanvasItemProvider implements
* children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
* <!-- begin-user-doc --> <!--
* end-user-doc -->
+ *
* @generated
*/
@Override
public void notifyChanged(Notification notification) {
updateChildren(notification);
-
- switch (notification.getFeatureID(RootCanvas.class)) {
- case DGPackage.ROOT_CANVAS__BACKGROUND_COLOR:
- case DGPackage.ROOT_CANVAS__SCRIPT:
- fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), false, true));
- return;
- case DGPackage.ROOT_CANVAS__DEFINITIONS:
- fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), true, false));
- return;
+ switch(notification.getFeatureID(RootCanvas.class)) {
+ case DGPackage.ROOT_CANVAS__BACKGROUND_COLOR:
+ case DGPackage.ROOT_CANVAS__SCRIPT:
+ fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), false, true));
+ return;
+ case DGPackage.ROOT_CANVAS__DEFINITIONS:
+ fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), true, false));
+ return;
}
super.notifyChanged(notification);
}
@@ -223,14 +186,8 @@ public class RootCanvasItemProvider extends CanvasItemProvider implements
* @generated
*/
@Override
- protected void collectNewChildDescriptors(
- Collection<Object> newChildDescriptors, Object object) {
+ protected void collectNewChildDescriptors(Collection<Object> newChildDescriptors, Object object) {
super.collectNewChildDescriptors(newChildDescriptors, object);
-
- newChildDescriptors.add
- (createChildParameter
- (DGPackage.Literals.ROOT_CANVAS__DEFINITIONS,
- DGFactory.eINSTANCE.createDefinitions()));
+ newChildDescriptors.add(createChildParameter(DGPackage.Literals.ROOT_CANVAS__DEFINITIONS, DGFactory.eINSTANCE.createDefinitions()));
}
-
}
diff --git a/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/src/org/eclipse/papyrus/dd/dg/provider/RotateItemProvider.java b/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/src/org/eclipse/papyrus/dd/dg/provider/RotateItemProvider.java
index db397dd..e147114 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
@@ -40,12 +40,11 @@ import org.eclipse.papyrus.dd.dg.Rotate;
* This is the item provider adapter for a {@link org.eclipse.papyrus.dd.dg.Rotate} object.
* <!-- begin-user-doc --> <!--
* end-user-doc -->
+ *
* @generated
*/
-public class RotateItemProvider extends TransformItemProvider implements
- IEditingDomainItemProvider, IStructuredItemContentProvider,
- ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource,
- IItemColorProvider, IItemFontProvider {
+public class RotateItemProvider extends TransformItemProvider implements IEditingDomainItemProvider, IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource, IItemColorProvider, IItemFontProvider {
+
/**
* This constructs an instance from a factory and a notifier. <!--
* begin-user-doc --> <!-- end-user-doc -->
@@ -64,9 +63,8 @@ public class RotateItemProvider extends TransformItemProvider implements
*/
@Override
public List<IItemPropertyDescriptor> getPropertyDescriptors(Object object) {
- if (itemPropertyDescriptors == null) {
+ if(itemPropertyDescriptors == null) {
super.getPropertyDescriptors(object);
-
addAnglePropertyDescriptor(object);
}
return itemPropertyDescriptors;
@@ -79,19 +77,7 @@ public class RotateItemProvider extends TransformItemProvider implements
* @generated
*/
protected void addAnglePropertyDescriptor(Object object) {
- itemPropertyDescriptors.add
- (createItemPropertyDescriptor
- (((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
- getResourceLocator(),
- getString("_UI_Rotate_angle_feature"),
- getString("_UI_PropertyDescriptor_description", "_UI_Rotate_angle_feature", "_UI_Rotate_type"),
- DGPackage.Literals.ROTATE__ANGLE,
- true,
- false,
- false,
- ItemPropertyDescriptor.REAL_VALUE_IMAGE,
- null,
- null));
+ itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(), getResourceLocator(), getString("_UI_Rotate_angle_feature"), getString("_UI_PropertyDescriptor_description", "_UI_Rotate_angle_feature", "_UI_Rotate_type"), DGPackage.Literals.ROTATE__ANGLE, true, false, false, ItemPropertyDescriptor.REAL_VALUE_IMAGE, null, null));
}
/**
@@ -99,12 +85,12 @@ public class RotateItemProvider extends TransformItemProvider implements
* {@link org.eclipse.emf.edit.command.AddCommand}, {@link org.eclipse.emf.edit.command.RemoveCommand} or
* {@link org.eclipse.emf.edit.command.MoveCommand} in {@link #createCommand}.
* <!-- begin-user-doc --> <!-- end-user-doc -->
+ *
* @generated
*/
@Override
- public Collection<? extends EStructuralFeature> getChildrenFeatures(
- Object object) {
- if (childrenFeatures == null) {
+ public Collection<? extends EStructuralFeature> getChildrenFeatures(Object object) {
+ if(childrenFeatures == null) {
super.getChildrenFeatures(object);
childrenFeatures.add(DGPackage.Literals.ROTATE__CENTER);
}
@@ -113,19 +99,20 @@ public class RotateItemProvider extends TransformItemProvider implements
/**
* <!-- begin-user-doc --> <!-- end-user-doc -->
+ *
* @generated
*/
@Override
protected EStructuralFeature getChildFeature(Object object, Object child) {
// Check the type of the specified child object and return the proper feature to use for
// adding (see {@link AddCommand}) it as a child.
-
return super.getChildFeature(object, child);
}
/**
* This returns Rotate.gif.
* <!-- begin-user-doc --> <!-- end-user-doc -->
+ *
* @generated
*/
@Override
@@ -137,6 +124,7 @@ public class RotateItemProvider extends TransformItemProvider implements
* This returns the label text for the adapted class.
* <!-- begin-user-doc
* --> <!-- end-user-doc -->
+ *
* @generated
*/
@Override
@@ -150,19 +138,19 @@ public class RotateItemProvider extends TransformItemProvider implements
* children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
* <!-- begin-user-doc --> <!--
* end-user-doc -->
+ *
* @generated
*/
@Override
public void notifyChanged(Notification notification) {
updateChildren(notification);
-
- switch (notification.getFeatureID(Rotate.class)) {
- case DGPackage.ROTATE__ANGLE:
- fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), false, true));
- return;
- case DGPackage.ROTATE__CENTER:
- fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), true, false));
- return;
+ switch(notification.getFeatureID(Rotate.class)) {
+ case DGPackage.ROTATE__ANGLE:
+ fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), false, true));
+ return;
+ case DGPackage.ROTATE__CENTER:
+ fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), true, false));
+ return;
}
super.notifyChanged(notification);
}
@@ -175,14 +163,8 @@ public class RotateItemProvider extends TransformItemProvider implements
* @generated
*/
@Override
- protected void collectNewChildDescriptors(
- Collection<Object> newChildDescriptors, Object object) {
+ protected void collectNewChildDescriptors(Collection<Object> newChildDescriptors, Object object) {
super.collectNewChildDescriptors(newChildDescriptors, object);
-
- newChildDescriptors.add
- (createChildParameter
- (DGPackage.Literals.ROTATE__CENTER,
- DCFactory.eINSTANCE.createPoint()));
+ newChildDescriptors.add(createChildParameter(DGPackage.Literals.ROTATE__CENTER, DCFactory.eINSTANCE.createPoint()));
}
-
}
diff --git a/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/src/org/eclipse/papyrus/dd/dg/provider/ScaleItemProvider.java b/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/src/org/eclipse/papyrus/dd/dg/provider/ScaleItemProvider.java
index 1133c16..97f0ca0 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
@@ -36,12 +36,11 @@ import org.eclipse.papyrus.dd.dg.Scale;
* This is the item provider adapter for a {@link org.eclipse.papyrus.dd.dg.Scale} object.
* <!-- begin-user-doc --> <!--
* end-user-doc -->
+ *
* @generated
*/
-public class ScaleItemProvider extends TransformItemProvider implements
- IEditingDomainItemProvider, IStructuredItemContentProvider,
- ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource,
- IItemColorProvider, IItemFontProvider {
+public class ScaleItemProvider extends TransformItemProvider implements IEditingDomainItemProvider, IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource, IItemColorProvider, IItemFontProvider {
+
/**
* This constructs an instance from a factory and a notifier. <!--
* begin-user-doc --> <!-- end-user-doc -->
@@ -60,9 +59,8 @@ public class ScaleItemProvider extends TransformItemProvider implements
*/
@Override
public List<IItemPropertyDescriptor> getPropertyDescriptors(Object object) {
- if (itemPropertyDescriptors == null) {
+ if(itemPropertyDescriptors == null) {
super.getPropertyDescriptors(object);
-
addFactorXPropertyDescriptor(object);
addFactorYPropertyDescriptor(object);
}
@@ -76,19 +74,7 @@ public class ScaleItemProvider extends TransformItemProvider implements
* @generated
*/
protected void addFactorXPropertyDescriptor(Object object) {
- itemPropertyDescriptors.add
- (createItemPropertyDescriptor
- (((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
- getResourceLocator(),
- getString("_UI_Scale_factorX_feature"),
- getString("_UI_PropertyDescriptor_description", "_UI_Scale_factorX_feature", "_UI_Scale_type"),
- DGPackage.Literals.SCALE__FACTOR_X,
- true,
- false,
- false,
- ItemPropertyDescriptor.REAL_VALUE_IMAGE,
- null,
- null));
+ itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(), getResourceLocator(), getString("_UI_Scale_factorX_feature"), getString("_UI_PropertyDescriptor_description", "_UI_Scale_factorX_feature", "_UI_Scale_type"), DGPackage.Literals.SCALE__FACTOR_X, true, false, false, ItemPropertyDescriptor.REAL_VALUE_IMAGE, null, null));
}
/**
@@ -98,24 +84,13 @@ public class ScaleItemProvider extends TransformItemProvider implements
* @generated
*/
protected void addFactorYPropertyDescriptor(Object object) {
- itemPropertyDescriptors.add
- (createItemPropertyDescriptor
- (((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
- getResourceLocator(),
- getString("_UI_Scale_factorY_feature"),
- getString("_UI_PropertyDescriptor_description", "_UI_Scale_factorY_feature", "_UI_Scale_type"),
- DGPackage.Literals.SCALE__FACTOR_Y,
- true,
- false,
- false,
- ItemPropertyDescriptor.REAL_VALUE_IMAGE,
- null,
- null));
+ itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(), getResourceLocator(), getString("_UI_Scale_factorY_feature"), getString("_UI_PropertyDescriptor_description", "_UI_Scale_factorY_feature", "_UI_Scale_type"), DGPackage.Literals.SCALE__FACTOR_Y, true, false, false, ItemPropertyDescriptor.REAL_VALUE_IMAGE, null, null));
}
/**
* This returns Scale.gif.
* <!-- begin-user-doc --> <!-- end-user-doc -->
+ *
* @generated
*/
@Override
@@ -127,6 +102,7 @@ public class ScaleItemProvider extends TransformItemProvider implements
* This returns the label text for the adapted class.
* <!-- begin-user-doc
* --> <!-- end-user-doc -->
+ *
* @generated
*/
@Override
@@ -140,17 +116,17 @@ public class ScaleItemProvider extends TransformItemProvider implements
* children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
* <!-- begin-user-doc --> <!--
* end-user-doc -->
+ *
* @generated
*/
@Override
public void notifyChanged(Notification notification) {
updateChildren(notification);
-
- switch (notification.getFeatureID(Scale.class)) {
- case DGPackage.SCALE__FACTOR_X:
- case DGPackage.SCALE__FACTOR_Y:
- fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), false, true));
- return;
+ switch(notification.getFeatureID(Scale.class)) {
+ case DGPackage.SCALE__FACTOR_X:
+ case DGPackage.SCALE__FACTOR_Y:
+ fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), false, true));
+ return;
}
super.notifyChanged(notification);
}
@@ -163,9 +139,7 @@ public class ScaleItemProvider extends TransformItemProvider implements
* @generated
*/
@Override
- protected void collectNewChildDescriptors(
- Collection<Object> newChildDescriptors, Object object) {
+ protected void collectNewChildDescriptors(Collection<Object> newChildDescriptors, Object object) {
super.collectNewChildDescriptors(newChildDescriptors, object);
}
-
}
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 968c5e9..acb70c1 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
@@ -36,12 +36,11 @@ import org.eclipse.papyrus.dd.dg.Skew;
* This is the item provider adapter for a {@link org.eclipse.papyrus.dd.dg.Skew} object.
* <!-- begin-user-doc --> <!--
* end-user-doc -->
+ *
* @generated
*/
-public class SkewItemProvider extends TransformItemProvider implements
- IEditingDomainItemProvider, IStructuredItemContentProvider,
- ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource,
- IItemColorProvider, IItemFontProvider {
+public class SkewItemProvider extends TransformItemProvider implements IEditingDomainItemProvider, IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource, IItemColorProvider, IItemFontProvider {
+
/**
* This constructs an instance from a factory and a notifier. <!--
* begin-user-doc --> <!-- end-user-doc -->
@@ -60,9 +59,8 @@ public class SkewItemProvider extends TransformItemProvider implements
*/
@Override
public List<IItemPropertyDescriptor> getPropertyDescriptors(Object object) {
- if (itemPropertyDescriptors == null) {
+ if(itemPropertyDescriptors == null) {
super.getPropertyDescriptors(object);
-
addAngleXPropertyDescriptor(object);
addAngleYPropertyDescriptor(object);
}
@@ -76,19 +74,7 @@ public class SkewItemProvider extends TransformItemProvider implements
* @generated
*/
protected void addAngleXPropertyDescriptor(Object object) {
- itemPropertyDescriptors.add
- (createItemPropertyDescriptor
- (((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
- getResourceLocator(),
- getString("_UI_Skew_angleX_feature"),
- getString("_UI_PropertyDescriptor_description", "_UI_Skew_angleX_feature", "_UI_Skew_type"),
- DGPackage.Literals.SKEW__ANGLE_X,
- true,
- false,
- false,
- ItemPropertyDescriptor.REAL_VALUE_IMAGE,
- null,
- null));
+ itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(), getResourceLocator(), getString("_UI_Skew_angleX_feature"), getString("_UI_PropertyDescriptor_description", "_UI_Skew_angleX_feature", "_UI_Skew_type"), DGPackage.Literals.SKEW__ANGLE_X, true, false, false, ItemPropertyDescriptor.REAL_VALUE_IMAGE, null, null));
}
/**
@@ -98,24 +84,13 @@ public class SkewItemProvider extends TransformItemProvider implements
* @generated
*/
protected void addAngleYPropertyDescriptor(Object object) {
- itemPropertyDescriptors.add
- (createItemPropertyDescriptor
- (((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
- getResourceLocator(),
- getString("_UI_Skew_angleY_feature"),
- getString("_UI_PropertyDescriptor_description", "_UI_Skew_angleY_feature", "_UI_Skew_type"),
- DGPackage.Literals.SKEW__ANGLE_Y,
- true,
- false,
- false,
- ItemPropertyDescriptor.REAL_VALUE_IMAGE,
- null,
- null));
+ itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(), getResourceLocator(), getString("_UI_Skew_angleY_feature"), getString("_UI_PropertyDescriptor_description", "_UI_Skew_angleY_feature", "_UI_Skew_type"), DGPackage.Literals.SKEW__ANGLE_Y, true, false, false, ItemPropertyDescriptor.REAL_VALUE_IMAGE, null, null));
}
/**
* This returns Skew.gif.
* <!-- begin-user-doc --> <!-- end-user-doc -->
+ *
* @generated
*/
@Override
@@ -127,6 +102,7 @@ public class SkewItemProvider extends TransformItemProvider implements
* This returns the label text for the adapted class.
* <!-- begin-user-doc
* --> <!-- end-user-doc -->
+ *
* @generated
*/
@Override
@@ -140,17 +116,17 @@ public class SkewItemProvider extends TransformItemProvider implements
* children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
* <!-- begin-user-doc --> <!--
* end-user-doc -->
+ *
* @generated
*/
@Override
public void notifyChanged(Notification notification) {
updateChildren(notification);
-
- switch (notification.getFeatureID(Skew.class)) {
- case DGPackage.SKEW__ANGLE_X:
- case DGPackage.SKEW__ANGLE_Y:
- fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), false, true));
- return;
+ switch(notification.getFeatureID(Skew.class)) {
+ case DGPackage.SKEW__ANGLE_X:
+ case DGPackage.SKEW__ANGLE_Y:
+ fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), false, true));
+ return;
}
super.notifyChanged(notification);
}
@@ -163,9 +139,7 @@ public class SkewItemProvider extends TransformItemProvider implements
* @generated
*/
@Override
- protected void collectNewChildDescriptors(
- Collection<Object> newChildDescriptors, Object object) {
+ protected void collectNewChildDescriptors(Collection<Object> newChildDescriptors, Object object) {
super.collectNewChildDescriptors(newChildDescriptors, object);
}
-
}
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 49212e8..39c38d7 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
@@ -44,12 +44,11 @@ import org.eclipse.papyrus.dd.edit.DDEditPlugin;
* This is the item provider adapter for a {@link org.eclipse.papyrus.dd.dg.Style} object.
* <!-- begin-user-doc --> <!--
* end-user-doc -->
+ *
* @generated
*/
-public class StyleItemProvider extends ItemProviderAdapter implements
- IEditingDomainItemProvider, IStructuredItemContentProvider,
- ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource,
- IItemColorProvider, IItemFontProvider {
+public class StyleItemProvider extends ItemProviderAdapter implements IEditingDomainItemProvider, IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource, IItemColorProvider, IItemFontProvider {
+
/**
* This constructs an instance from a factory and a notifier. <!--
* begin-user-doc --> <!-- end-user-doc -->
@@ -68,9 +67,8 @@ public class StyleItemProvider extends ItemProviderAdapter implements
*/
@Override
public List<IItemPropertyDescriptor> getPropertyDescriptors(Object object) {
- if (itemPropertyDescriptors == null) {
+ if(itemPropertyDescriptors == null) {
super.getPropertyDescriptors(object);
-
addFillPropertyDescriptor(object);
addFillOpacityPropertyDescriptor(object);
addStrokePropertyDescriptor(object);
@@ -90,22 +88,11 @@ public class StyleItemProvider extends ItemProviderAdapter implements
* This adds a property descriptor for the Fill feature.
* <!-- begin-user-doc
* --> <!-- end-user-doc -->
+ *
* @generated
*/
protected void addFillPropertyDescriptor(Object object) {
- itemPropertyDescriptors.add
- (createItemPropertyDescriptor
- (((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
- getResourceLocator(),
- getString("_UI_Style_fill_feature"),
- getString("_UI_PropertyDescriptor_description", "_UI_Style_fill_feature", "_UI_Style_type"),
- DGPackage.Literals.STYLE__FILL,
- true,
- false,
- false,
- null,
- null,
- null));
+ itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(), getResourceLocator(), getString("_UI_Style_fill_feature"), getString("_UI_PropertyDescriptor_description", "_UI_Style_fill_feature", "_UI_Style_type"), DGPackage.Literals.STYLE__FILL, true, false, false, null, null, null));
}
/**
@@ -115,19 +102,7 @@ public class StyleItemProvider extends ItemProviderAdapter implements
* @generated
*/
protected void addFillOpacityPropertyDescriptor(Object object) {
- itemPropertyDescriptors.add
- (createItemPropertyDescriptor
- (((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
- getResourceLocator(),
- getString("_UI_Style_fillOpacity_feature"),
- getString("_UI_PropertyDescriptor_description", "_UI_Style_fillOpacity_feature", "_UI_Style_type"),
- DGPackage.Literals.STYLE__FILL_OPACITY,
- true,
- false,
- false,
- ItemPropertyDescriptor.REAL_VALUE_IMAGE,
- null,
- null));
+ itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(), getResourceLocator(), getString("_UI_Style_fillOpacity_feature"), getString("_UI_PropertyDescriptor_description", "_UI_Style_fillOpacity_feature", "_UI_Style_type"), DGPackage.Literals.STYLE__FILL_OPACITY, true, false, false, ItemPropertyDescriptor.REAL_VALUE_IMAGE, null, null));
}
/**
@@ -137,19 +112,7 @@ public class StyleItemProvider extends ItemProviderAdapter implements
* @generated
*/
protected void addStrokePropertyDescriptor(Object object) {
- itemPropertyDescriptors.add
- (createItemPropertyDescriptor
- (((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
- getResourceLocator(),
- getString("_UI_Style_stroke_feature"),
- getString("_UI_PropertyDescriptor_description", "_UI_Style_stroke_feature", "_UI_Style_type"),
- DGPackage.Literals.STYLE__STROKE,
- true,
- false,
- false,
- null,
- null,
- null));
+ itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(), getResourceLocator(), getString("_UI_Style_stroke_feature"), getString("_UI_PropertyDescriptor_description", "_UI_Style_stroke_feature", "_UI_Style_type"), DGPackage.Literals.STYLE__STROKE, true, false, false, null, null, null));
}
/**
@@ -159,19 +122,7 @@ public class StyleItemProvider extends ItemProviderAdapter implements
* @generated
*/
protected void addStrokeWidthPropertyDescriptor(Object object) {
- itemPropertyDescriptors.add
- (createItemPropertyDescriptor
- (((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
- getResourceLocator(),
- getString("_UI_Style_strokeWidth_feature"),
- getString("_UI_PropertyDescriptor_description", "_UI_Style_strokeWidth_feature", "_UI_Style_type"),
- DGPackage.Literals.STYLE__STROKE_WIDTH,
- true,
- false,
- false,
- ItemPropertyDescriptor.REAL_VALUE_IMAGE,
- null,
- null));
+ itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(), getResourceLocator(), getString("_UI_Style_strokeWidth_feature"), getString("_UI_PropertyDescriptor_description", "_UI_Style_strokeWidth_feature", "_UI_Style_type"), DGPackage.Literals.STYLE__STROKE_WIDTH, true, false, false, ItemPropertyDescriptor.REAL_VALUE_IMAGE, null, null));
}
/**
@@ -181,19 +132,7 @@ public class StyleItemProvider extends ItemProviderAdapter implements
* @generated
*/
protected void addStrokeOpacityPropertyDescriptor(Object object) {
- itemPropertyDescriptors.add
- (createItemPropertyDescriptor
- (((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
- getResourceLocator(),
- getString("_UI_Style_strokeOpacity_feature"),
- getString("_UI_PropertyDescriptor_description", "_UI_Style_strokeOpacity_feature", "_UI_Style_type"),
- DGPackage.Literals.STYLE__STROKE_OPACITY,
- true,
- false,
- false,
- ItemPropertyDescriptor.REAL_VALUE_IMAGE,
- null,
- null));
+ itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(), getResourceLocator(), getString("_UI_Style_strokeOpacity_feature"), getString("_UI_PropertyDescriptor_description", "_UI_Style_strokeOpacity_feature", "_UI_Style_type"), DGPackage.Literals.STYLE__STROKE_OPACITY, true, false, false, ItemPropertyDescriptor.REAL_VALUE_IMAGE, null, null));
}
/**
@@ -203,19 +142,7 @@ public class StyleItemProvider extends ItemProviderAdapter implements
* @generated
*/
protected void addStrokeDashLengthPropertyDescriptor(Object object) {
- itemPropertyDescriptors.add
- (createItemPropertyDescriptor
- (((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
- getResourceLocator(),
- getString("_UI_Style_strokeDashLength_feature"),
- getString("_UI_PropertyDescriptor_description", "_UI_Style_strokeDashLength_feature", "_UI_Style_type"),
- DGPackage.Literals.STYLE__STROKE_DASH_LENGTH,
- true,
- false,
- false,
- ItemPropertyDescriptor.REAL_VALUE_IMAGE,
- null,
- null));
+ itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(), getResourceLocator(), getString("_UI_Style_strokeDashLength_feature"), getString("_UI_PropertyDescriptor_description", "_UI_Style_strokeDashLength_feature", "_UI_Style_type"), DGPackage.Literals.STYLE__STROKE_DASH_LENGTH, true, false, false, ItemPropertyDescriptor.REAL_VALUE_IMAGE, null, null));
}
/**
@@ -225,19 +152,7 @@ public class StyleItemProvider extends ItemProviderAdapter implements
* @generated
*/
protected void addFontSizePropertyDescriptor(Object object) {
- itemPropertyDescriptors.add
- (createItemPropertyDescriptor
- (((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
- getResourceLocator(),
- getString("_UI_Style_fontSize_feature"),
- getString("_UI_PropertyDescriptor_description", "_UI_Style_fontSize_feature", "_UI_Style_type"),
- DGPackage.Literals.STYLE__FONT_SIZE,
- true,
- false,
- false,
- ItemPropertyDescriptor.REAL_VALUE_IMAGE,
- null,
- null));
+ itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(), getResourceLocator(), getString("_UI_Style_fontSize_feature"), getString("_UI_PropertyDescriptor_description", "_UI_Style_fontSize_feature", "_UI_Style_type"), DGPackage.Literals.STYLE__FONT_SIZE, true, false, false, ItemPropertyDescriptor.REAL_VALUE_IMAGE, null, null));
}
/**
@@ -247,19 +162,7 @@ public class StyleItemProvider extends ItemProviderAdapter implements
* @generated
*/
protected void addFontNamePropertyDescriptor(Object object) {
- itemPropertyDescriptors.add
- (createItemPropertyDescriptor
- (((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
- getResourceLocator(),
- getString("_UI_Style_fontName_feature"),
- getString("_UI_PropertyDescriptor_description", "_UI_Style_fontName_feature", "_UI_Style_type"),
- DGPackage.Literals.STYLE__FONT_NAME,
- true,
- false,
- false,
- ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
- null,
- null));
+ itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(), getResourceLocator(), getString("_UI_Style_fontName_feature"), getString("_UI_PropertyDescriptor_description", "_UI_Style_fontName_feature", "_UI_Style_type"), DGPackage.Literals.STYLE__FONT_NAME, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null));
}
/**
@@ -269,19 +172,7 @@ public class StyleItemProvider extends ItemProviderAdapter implements
* @generated
*/
protected void addFontItalicPropertyDescriptor(Object object) {
- itemPropertyDescriptors.add
- (createItemPropertyDescriptor
- (((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
- getResourceLocator(),
- getString("_UI_Style_fontItalic_feature"),
- getString("_UI_PropertyDescriptor_description", "_UI_Style_fontItalic_feature", "_UI_Style_type"),
- DGPackage.Literals.STYLE__FONT_ITALIC,
- true,
- false,
- false,
- ItemPropertyDescriptor.BOOLEAN_VALUE_IMAGE,
- null,
- null));
+ itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(), getResourceLocator(), getString("_UI_Style_fontItalic_feature"), getString("_UI_PropertyDescriptor_description", "_UI_Style_fontItalic_feature", "_UI_Style_type"), DGPackage.Literals.STYLE__FONT_ITALIC, true, false, false, ItemPropertyDescriptor.BOOLEAN_VALUE_IMAGE, null, null));
}
/**
@@ -291,19 +182,7 @@ public class StyleItemProvider extends ItemProviderAdapter implements
* @generated
*/
protected void addFontBoldPropertyDescriptor(Object object) {
- itemPropertyDescriptors.add
- (createItemPropertyDescriptor
- (((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
- getResourceLocator(),
- getString("_UI_Style_fontBold_feature"),
- getString("_UI_PropertyDescriptor_description", "_UI_Style_fontBold_feature", "_UI_Style_type"),
- DGPackage.Literals.STYLE__FONT_BOLD,
- true,
- false,
- false,
- ItemPropertyDescriptor.BOOLEAN_VALUE_IMAGE,
- null,
- null));
+ itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(), getResourceLocator(), getString("_UI_Style_fontBold_feature"), getString("_UI_PropertyDescriptor_description", "_UI_Style_fontBold_feature", "_UI_Style_type"), DGPackage.Literals.STYLE__FONT_BOLD, true, false, false, ItemPropertyDescriptor.BOOLEAN_VALUE_IMAGE, null, null));
}
/**
@@ -313,19 +192,7 @@ public class StyleItemProvider extends ItemProviderAdapter implements
* @generated
*/
protected void addFontDecorationPropertyDescriptor(Object object) {
- itemPropertyDescriptors.add
- (createItemPropertyDescriptor
- (((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
- getResourceLocator(),
- getString("_UI_Style_fontDecoration_feature"),
- getString("_UI_PropertyDescriptor_description", "_UI_Style_fontDecoration_feature", "_UI_Style_type"),
- DGPackage.Literals.STYLE__FONT_DECORATION,
- true,
- false,
- false,
- ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
- null,
- null));
+ itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(), getResourceLocator(), getString("_UI_Style_fontDecoration_feature"), getString("_UI_PropertyDescriptor_description", "_UI_Style_fontDecoration_feature", "_UI_Style_type"), DGPackage.Literals.STYLE__FONT_DECORATION, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null));
}
/**
@@ -333,12 +200,12 @@ public class StyleItemProvider extends ItemProviderAdapter implements
* {@link org.eclipse.emf.edit.command.AddCommand}, {@link org.eclipse.emf.edit.command.RemoveCommand} or
* {@link org.eclipse.emf.edit.command.MoveCommand} in {@link #createCommand}.
* <!-- begin-user-doc --> <!-- end-user-doc -->
+ *
* @generated
*/
@Override
- public Collection<? extends EStructuralFeature> getChildrenFeatures(
- Object object) {
- if (childrenFeatures == null) {
+ public Collection<? extends EStructuralFeature> getChildrenFeatures(Object object) {
+ if(childrenFeatures == null) {
super.getChildrenFeatures(object);
childrenFeatures.add(DGPackage.Literals.STYLE__FILL);
childrenFeatures.add(DGPackage.Literals.STYLE__STROKE);
@@ -348,19 +215,20 @@ public class StyleItemProvider extends ItemProviderAdapter implements
/**
* <!-- begin-user-doc --> <!-- end-user-doc -->
+ *
* @generated
*/
@Override
protected EStructuralFeature getChildFeature(Object object, Object child) {
// Check the type of the specified child object and return the proper feature to use for
// adding (see {@link AddCommand}) it as a child.
-
return super.getChildFeature(object, child);
}
/**
* This returns Style.gif.
* <!-- begin-user-doc --> <!-- end-user-doc -->
+ *
* @generated
*/
@Override
@@ -372,14 +240,13 @@ public class StyleItemProvider extends ItemProviderAdapter implements
* This returns the label text for the adapted class.
* <!-- begin-user-doc
* --> <!-- end-user-doc -->
+ *
* @generated
*/
@Override
public String getText(Object object) {
String label = ((Style)object).getFontName();
- return label == null || label.length() == 0 ?
- getString("_UI_Style_type") :
- getString("_UI_Style_type") + " " + label;
+ return label == null || label.length() == 0 ? getString("_UI_Style_type") : getString("_UI_Style_type") + " " + label;
}
/**
@@ -387,28 +254,28 @@ public class StyleItemProvider extends ItemProviderAdapter implements
* children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
* <!-- begin-user-doc --> <!--
* end-user-doc -->
+ *
* @generated
*/
@Override
public void notifyChanged(Notification notification) {
updateChildren(notification);
-
- switch (notification.getFeatureID(Style.class)) {
- case DGPackage.STYLE__FILL_OPACITY:
- case DGPackage.STYLE__STROKE_WIDTH:
- case DGPackage.STYLE__STROKE_OPACITY:
- case DGPackage.STYLE__STROKE_DASH_LENGTH:
- case DGPackage.STYLE__FONT_SIZE:
- case DGPackage.STYLE__FONT_NAME:
- case DGPackage.STYLE__FONT_ITALIC:
- case DGPackage.STYLE__FONT_BOLD:
- case DGPackage.STYLE__FONT_DECORATION:
- fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), false, true));
- return;
- case DGPackage.STYLE__FILL:
- case DGPackage.STYLE__STROKE:
- fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), true, false));
- return;
+ switch(notification.getFeatureID(Style.class)) {
+ case DGPackage.STYLE__FILL_OPACITY:
+ case DGPackage.STYLE__STROKE_WIDTH:
+ case DGPackage.STYLE__STROKE_OPACITY:
+ case DGPackage.STYLE__STROKE_DASH_LENGTH:
+ case DGPackage.STYLE__FONT_SIZE:
+ case DGPackage.STYLE__FONT_NAME:
+ case DGPackage.STYLE__FONT_ITALIC:
+ case DGPackage.STYLE__FONT_BOLD:
+ case DGPackage.STYLE__FONT_DECORATION:
+ fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), false, true));
+ return;
+ case DGPackage.STYLE__FILL:
+ case DGPackage.STYLE__STROKE:
+ fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), true, false));
+ return;
}
super.notifyChanged(notification);
}
@@ -421,42 +288,25 @@ public class StyleItemProvider extends ItemProviderAdapter implements
* @generated
*/
@Override
- protected void collectNewChildDescriptors(
- Collection<Object> newChildDescriptors, Object object) {
+ protected void collectNewChildDescriptors(Collection<Object> newChildDescriptors, Object object) {
super.collectNewChildDescriptors(newChildDescriptors, object);
-
- newChildDescriptors.add
- (createChildParameter
- (DGPackage.Literals.STYLE__FILL,
- DGFactory.eINSTANCE.createPaint()));
-
- newChildDescriptors.add
- (createChildParameter
- (DGPackage.Literals.STYLE__STROKE,
- DGFactory.eINSTANCE.createPaint()));
+ newChildDescriptors.add(createChildParameter(DGPackage.Literals.STYLE__FILL, DGFactory.eINSTANCE.createPaint()));
+ newChildDescriptors.add(createChildParameter(DGPackage.Literals.STYLE__STROKE, DGFactory.eINSTANCE.createPaint()));
}
/**
- * This returns the label text for
- * {@link org.eclipse.emf.edit.command.CreateChildCommand}. <!--
+ * This returns the label text for {@link org.eclipse.emf.edit.command.CreateChildCommand}. <!--
* begin-user-doc --> <!-- end-user-doc -->
*
* @generated
*/
@Override
- public String getCreateChildText(Object owner, Object feature,
- Object child, Collection<?> selection) {
+ public String getCreateChildText(Object owner, Object feature, Object child, Collection<?> selection) {
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) });
+ boolean qualify = childFeature == DGPackage.Literals.STYLE__FILL || childFeature == DGPackage.Literals.STYLE__STROKE;
+ if(qualify) {
+ return getString("_UI_CreateChild_text2", new Object[]{ getTypeText(childObject), getFeatureText(childFeature), getTypeText(owner) });
}
return super.getCreateChildText(owner, feature, child, selection);
}
@@ -471,5 +321,4 @@ public class StyleItemProvider extends ItemProviderAdapter implements
public ResourceLocator getResourceLocator() {
return DDEditPlugin.INSTANCE;
}
-
}
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 5cd45d1..3f78bb2 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
@@ -42,12 +42,11 @@ import org.eclipse.papyrus.dd.edit.DDEditPlugin;
* This is the item provider adapter for a {@link org.eclipse.papyrus.dd.dg.StyleRule} object.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
+ *
* @generated
*/
-public class StyleRuleItemProvider extends ItemProviderAdapter implements
- IEditingDomainItemProvider, IStructuredItemContentProvider,
- ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource,
- IItemColorProvider, IItemFontProvider {
+public class StyleRuleItemProvider extends ItemProviderAdapter implements IEditingDomainItemProvider, IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource, IItemColorProvider, IItemFontProvider {
+
/**
* This constructs an instance from a factory and a notifier. <!--
* begin-user-doc --> <!-- end-user-doc -->
@@ -66,9 +65,8 @@ public class StyleRuleItemProvider extends ItemProviderAdapter implements
*/
@Override
public List<IItemPropertyDescriptor> getPropertyDescriptors(Object object) {
- if (itemPropertyDescriptors == null) {
+ if(itemPropertyDescriptors == null) {
super.getPropertyDescriptors(object);
-
}
return itemPropertyDescriptors;
}
@@ -78,12 +76,12 @@ public class StyleRuleItemProvider extends ItemProviderAdapter implements
* {@link org.eclipse.emf.edit.command.AddCommand}, {@link org.eclipse.emf.edit.command.RemoveCommand} or
* {@link org.eclipse.emf.edit.command.MoveCommand} in {@link #createCommand}.
* <!-- begin-user-doc --> <!-- end-user-doc -->
+ *
* @generated
*/
@Override
- public Collection<? extends EStructuralFeature> getChildrenFeatures(
- Object object) {
- if (childrenFeatures == null) {
+ public Collection<? extends EStructuralFeature> getChildrenFeatures(Object object) {
+ if(childrenFeatures == null) {
super.getChildrenFeatures(object);
childrenFeatures.add(DGPackage.Literals.STYLE_RULE__SELECTOR);
childrenFeatures.add(DGPackage.Literals.STYLE_RULE__STYLE);
@@ -93,19 +91,20 @@ public class StyleRuleItemProvider extends ItemProviderAdapter implements
/**
* <!-- begin-user-doc --> <!-- end-user-doc -->
+ *
* @generated
*/
@Override
protected EStructuralFeature getChildFeature(Object object, Object child) {
// Check the type of the specified child object and return the proper feature to use for
// adding (see {@link AddCommand}) it as a child.
-
return super.getChildFeature(object, child);
}
/**
* This returns StyleRule.gif.
* <!-- begin-user-doc --> <!-- end-user-doc -->
+ *
* @generated
*/
@Override
@@ -117,6 +116,7 @@ public class StyleRuleItemProvider extends ItemProviderAdapter implements
* This returns the label text for the adapted class.
* <!-- begin-user-doc
* --> <!-- end-user-doc -->
+ *
* @generated
*/
@Override
@@ -129,17 +129,17 @@ public class StyleRuleItemProvider extends ItemProviderAdapter implements
* children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
* <!-- begin-user-doc --> <!--
* end-user-doc -->
+ *
* @generated
*/
@Override
public void notifyChanged(Notification notification) {
updateChildren(notification);
-
- switch (notification.getFeatureID(StyleRule.class)) {
- case DGPackage.STYLE_RULE__SELECTOR:
- case DGPackage.STYLE_RULE__STYLE:
- fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), true, false));
- return;
+ switch(notification.getFeatureID(StyleRule.class)) {
+ case DGPackage.STYLE_RULE__SELECTOR:
+ case DGPackage.STYLE_RULE__STYLE:
+ fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), true, false));
+ return;
}
super.notifyChanged(notification);
}
@@ -152,19 +152,10 @@ public class StyleRuleItemProvider extends ItemProviderAdapter implements
* @generated
*/
@Override
- protected void collectNewChildDescriptors(
- Collection<Object> newChildDescriptors, Object object) {
+ protected void collectNewChildDescriptors(Collection<Object> newChildDescriptors, Object object) {
super.collectNewChildDescriptors(newChildDescriptors, object);
-
- newChildDescriptors.add
- (createChildParameter
- (DGPackage.Literals.STYLE_RULE__SELECTOR,
- DGFactory.eINSTANCE.createStyleSelector()));
-
- newChildDescriptors.add
- (createChildParameter
- (DGPackage.Literals.STYLE_RULE__STYLE,
- DGFactory.eINSTANCE.createStyle()));
+ newChildDescriptors.add(createChildParameter(DGPackage.Literals.STYLE_RULE__SELECTOR, DGFactory.eINSTANCE.createStyleSelector()));
+ newChildDescriptors.add(createChildParameter(DGPackage.Literals.STYLE_RULE__STYLE, DGFactory.eINSTANCE.createStyle()));
}
/**
@@ -177,5 +168,4 @@ public class StyleRuleItemProvider extends ItemProviderAdapter implements
public ResourceLocator getResourceLocator() {
return DDEditPlugin.INSTANCE;
}
-
}
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 d0adecd..a18897a 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
@@ -42,12 +42,11 @@ import org.eclipse.papyrus.dd.edit.DDEditPlugin;
* This is the item provider adapter for a {@link org.eclipse.papyrus.dd.dg.StyleSelector} object.
* <!-- begin-user-doc
* --> <!-- end-user-doc -->
+ *
* @generated
*/
-public class StyleSelectorItemProvider extends ItemProviderAdapter implements
- IEditingDomainItemProvider, IStructuredItemContentProvider,
- ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource,
- IItemColorProvider, IItemFontProvider {
+public class StyleSelectorItemProvider extends ItemProviderAdapter implements IEditingDomainItemProvider, IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource, IItemColorProvider, IItemFontProvider {
+
/**
* This constructs an instance from a factory and a notifier. <!--
* begin-user-doc --> <!-- end-user-doc -->
@@ -66,9 +65,8 @@ public class StyleSelectorItemProvider extends ItemProviderAdapter implements
*/
@Override
public List<IItemPropertyDescriptor> getPropertyDescriptors(Object object) {
- if (itemPropertyDescriptors == null) {
+ if(itemPropertyDescriptors == null) {
super.getPropertyDescriptors(object);
-
addKindPropertyDescriptor(object);
addClassPropertyDescriptor(object);
}
@@ -79,22 +77,11 @@ public class StyleSelectorItemProvider extends ItemProviderAdapter implements
* This adds a property descriptor for the Kind feature.
* <!-- begin-user-doc
* --> <!-- end-user-doc -->
+ *
* @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));
}
/**
@@ -104,19 +91,7 @@ public class StyleSelectorItemProvider extends ItemProviderAdapter implements
* @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));
}
/**
@@ -134,15 +109,14 @@ public class StyleSelectorItemProvider extends ItemProviderAdapter implements
* This returns the label text for the adapted class.
* <!-- begin-user-doc
* --> <!-- end-user-doc -->
+ *
* @generated
*/
@Override
public String getText(Object object) {
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;
+ return label == null || label.length() == 0 ? getString("_UI_StyleSelector_type") : getString("_UI_StyleSelector_type") + " " + label;
}
/**
@@ -150,17 +124,17 @@ public class StyleSelectorItemProvider extends ItemProviderAdapter implements
* children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
* <!-- begin-user-doc --> <!--
* end-user-doc -->
+ *
* @generated
*/
@Override
public void notifyChanged(Notification notification) {
updateChildren(notification);
-
- switch (notification.getFeatureID(StyleSelector.class)) {
- case DGPackage.STYLE_SELECTOR__KIND:
- case DGPackage.STYLE_SELECTOR__CLASS:
- fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), false, true));
- return;
+ switch(notification.getFeatureID(StyleSelector.class)) {
+ case DGPackage.STYLE_SELECTOR__KIND:
+ case DGPackage.STYLE_SELECTOR__CLASS:
+ fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), false, true));
+ return;
}
super.notifyChanged(notification);
}
@@ -173,8 +147,7 @@ public class StyleSelectorItemProvider extends ItemProviderAdapter implements
* @generated
*/
@Override
- protected void collectNewChildDescriptors(
- Collection<Object> newChildDescriptors, Object object) {
+ protected void collectNewChildDescriptors(Collection<Object> newChildDescriptors, Object object) {
super.collectNewChildDescriptors(newChildDescriptors, object);
}
@@ -188,5 +161,4 @@ public class StyleSelectorItemProvider extends ItemProviderAdapter implements
public ResourceLocator getResourceLocator() {
return DDEditPlugin.INSTANCE;
}
-
}
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 de184c6..3023895 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
@@ -42,12 +42,11 @@ import org.eclipse.papyrus.dd.edit.DDEditPlugin;
* This is the item provider adapter for a {@link org.eclipse.papyrus.dd.dg.StyleSheet} object.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
+ *
* @generated
*/
-public class StyleSheetItemProvider extends ItemProviderAdapter implements
- IEditingDomainItemProvider, IStructuredItemContentProvider,
- ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource,
- IItemColorProvider, IItemFontProvider {
+public class StyleSheetItemProvider extends ItemProviderAdapter implements IEditingDomainItemProvider, IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource, IItemColorProvider, IItemFontProvider {
+
/**
* This constructs an instance from a factory and a notifier. <!--
* begin-user-doc --> <!-- end-user-doc -->
@@ -66,9 +65,8 @@ public class StyleSheetItemProvider extends ItemProviderAdapter implements
*/
@Override
public List<IItemPropertyDescriptor> getPropertyDescriptors(Object object) {
- if (itemPropertyDescriptors == null) {
+ if(itemPropertyDescriptors == null) {
super.getPropertyDescriptors(object);
-
}
return itemPropertyDescriptors;
}
@@ -78,12 +76,12 @@ public class StyleSheetItemProvider extends ItemProviderAdapter implements
* {@link org.eclipse.emf.edit.command.AddCommand}, {@link org.eclipse.emf.edit.command.RemoveCommand} or
* {@link org.eclipse.emf.edit.command.MoveCommand} in {@link #createCommand}.
* <!-- begin-user-doc --> <!-- end-user-doc -->
+ *
* @generated
*/
@Override
- public Collection<? extends EStructuralFeature> getChildrenFeatures(
- Object object) {
- if (childrenFeatures == null) {
+ public Collection<? extends EStructuralFeature> getChildrenFeatures(Object object) {
+ if(childrenFeatures == null) {
super.getChildrenFeatures(object);
childrenFeatures.add(DGPackage.Literals.STYLE_SHEET__RULE);
}
@@ -92,13 +90,13 @@ public class StyleSheetItemProvider extends ItemProviderAdapter implements
/**
* <!-- begin-user-doc --> <!-- end-user-doc -->
+ *
* @generated
*/
@Override
protected EStructuralFeature getChildFeature(Object object, Object child) {
// Check the type of the specified child object and return the proper feature to use for
// adding (see {@link AddCommand}) it as a child.
-
return super.getChildFeature(object, child);
}
@@ -117,6 +115,7 @@ public class StyleSheetItemProvider extends ItemProviderAdapter implements
* This returns the label text for the adapted class.
* <!-- begin-user-doc
* --> <!-- end-user-doc -->
+ *
* @generated
*/
@Override
@@ -129,16 +128,16 @@ public class StyleSheetItemProvider extends ItemProviderAdapter implements
* children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
* <!-- begin-user-doc --> <!--
* end-user-doc -->
+ *
* @generated
*/
@Override
public void notifyChanged(Notification notification) {
updateChildren(notification);
-
- switch (notification.getFeatureID(StyleSheet.class)) {
- case DGPackage.STYLE_SHEET__RULE:
- fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), true, false));
- return;
+ switch(notification.getFeatureID(StyleSheet.class)) {
+ case DGPackage.STYLE_SHEET__RULE:
+ fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), true, false));
+ return;
}
super.notifyChanged(notification);
}
@@ -151,14 +150,9 @@ public class StyleSheetItemProvider extends ItemProviderAdapter implements
* @generated
*/
@Override
- protected void collectNewChildDescriptors(
- Collection<Object> newChildDescriptors, Object object) {
+ protected void collectNewChildDescriptors(Collection<Object> newChildDescriptors, Object object) {
super.collectNewChildDescriptors(newChildDescriptors, object);
-
- newChildDescriptors.add
- (createChildParameter
- (DGPackage.Literals.STYLE_SHEET__RULE,
- DGFactory.eINSTANCE.createStyleRule()));
+ newChildDescriptors.add(createChildParameter(DGPackage.Literals.STYLE_SHEET__RULE, DGFactory.eINSTANCE.createStyleRule()));
}
/**
@@ -171,5 +165,4 @@ public class StyleSheetItemProvider extends ItemProviderAdapter implements
public ResourceLocator getResourceLocator() {
return DDEditPlugin.INSTANCE;
}
-
}
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 54beedc..e859a77 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
@@ -40,12 +40,11 @@ import org.eclipse.papyrus.dd.dg.Text;
* This is the item provider adapter for a {@link org.eclipse.papyrus.dd.dg.Text} object.
* <!-- begin-user-doc --> <!--
* end-user-doc -->
+ *
* @generated
*/
-public class TextItemProvider extends GraphicalElementItemProvider implements
- IEditingDomainItemProvider, IStructuredItemContentProvider,
- ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource,
- IItemColorProvider, IItemFontProvider {
+public class TextItemProvider extends GraphicalElementItemProvider implements IEditingDomainItemProvider, IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource, IItemColorProvider, IItemFontProvider {
+
/**
* This constructs an instance from a factory and a notifier. <!--
* begin-user-doc --> <!-- end-user-doc -->
@@ -64,9 +63,8 @@ public class TextItemProvider extends GraphicalElementItemProvider implements
*/
@Override
public List<IItemPropertyDescriptor> getPropertyDescriptors(Object object) {
- if (itemPropertyDescriptors == null) {
+ if(itemPropertyDescriptors == null) {
super.getPropertyDescriptors(object);
-
addDataPropertyDescriptor(object);
addAnchorPropertyDescriptor(object);
}
@@ -77,44 +75,22 @@ public class TextItemProvider extends GraphicalElementItemProvider implements
* This adds a property descriptor for the Data feature.
* <!-- begin-user-doc
* --> <!-- end-user-doc -->
+ *
* @generated
*/
protected void addDataPropertyDescriptor(Object object) {
- itemPropertyDescriptors.add
- (createItemPropertyDescriptor
- (((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
- getResourceLocator(),
- getString("_UI_Text_data_feature"),
- getString("_UI_PropertyDescriptor_description", "_UI_Text_data_feature", "_UI_Text_type"),
- DGPackage.Literals.TEXT__DATA,
- true,
- false,
- false,
- ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
- null,
- null));
+ itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(), getResourceLocator(), getString("_UI_Text_data_feature"), getString("_UI_PropertyDescriptor_description", "_UI_Text_data_feature", "_UI_Text_type"), DGPackage.Literals.TEXT__DATA, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null));
}
/**
* This adds a property descriptor for the Anchor feature.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
+ *
* @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));
}
/**
@@ -122,12 +98,12 @@ public class TextItemProvider extends GraphicalElementItemProvider implements
* {@link org.eclipse.emf.edit.command.AddCommand}, {@link org.eclipse.emf.edit.command.RemoveCommand} or
* {@link org.eclipse.emf.edit.command.MoveCommand} in {@link #createCommand}.
* <!-- begin-user-doc --> <!-- end-user-doc -->
+ *
* @generated
*/
@Override
- public Collection<? extends EStructuralFeature> getChildrenFeatures(
- Object object) {
- if (childrenFeatures == null) {
+ public Collection<? extends EStructuralFeature> getChildrenFeatures(Object object) {
+ if(childrenFeatures == null) {
super.getChildrenFeatures(object);
childrenFeatures.add(DGPackage.Literals.TEXT__POSITION);
}
@@ -136,19 +112,20 @@ public class TextItemProvider extends GraphicalElementItemProvider implements
/**
* <!-- begin-user-doc --> <!-- end-user-doc -->
+ *
* @generated
*/
@Override
protected EStructuralFeature getChildFeature(Object object, Object child) {
// Check the type of the specified child object and return the proper feature to use for
// adding (see {@link AddCommand}) it as a child.
-
return super.getChildFeature(object, child);
}
/**
* This returns Text.gif.
* <!-- begin-user-doc --> <!-- end-user-doc -->
+ *
* @generated
*/
@Override
@@ -160,14 +137,13 @@ public class TextItemProvider extends GraphicalElementItemProvider implements
* This returns the label text for the adapted class.
* <!-- begin-user-doc
* --> <!-- end-user-doc -->
+ *
* @generated
*/
@Override
public String getText(Object object) {
String label = ((Text)object).getId();
- return label == null || label.length() == 0 ?
- getString("_UI_Text_type") :
- getString("_UI_Text_type") + " " + label;
+ return label == null || label.length() == 0 ? getString("_UI_Text_type") : getString("_UI_Text_type") + " " + label;
}
/**
@@ -175,20 +151,20 @@ public class TextItemProvider extends GraphicalElementItemProvider implements
* children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
* <!-- begin-user-doc --> <!--
* end-user-doc -->
+ *
* @generated
*/
@Override
public void notifyChanged(Notification notification) {
updateChildren(notification);
-
- switch (notification.getFeatureID(Text.class)) {
- case DGPackage.TEXT__DATA:
- case DGPackage.TEXT__ANCHOR:
- fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), false, true));
- return;
- case DGPackage.TEXT__POSITION:
- fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), true, false));
- return;
+ 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:
+ fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), true, false));
+ return;
}
super.notifyChanged(notification);
}
@@ -201,14 +177,8 @@ public class TextItemProvider extends GraphicalElementItemProvider implements
* @generated
*/
@Override
- protected void collectNewChildDescriptors(
- Collection<Object> newChildDescriptors, Object object) {
+ 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__POSITION, DCFactory.eINSTANCE.createPoint()));
}
-
}
diff --git a/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/src/org/eclipse/papyrus/dd/dg/provider/TransformItemProvider.java b/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/src/org/eclipse/papyrus/dd/dg/provider/TransformItemProvider.java
index 7fba8fc..dcd5f49 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
@@ -35,12 +35,11 @@ import org.eclipse.papyrus.dd.edit.DDEditPlugin;
* This is the item provider adapter for a {@link org.eclipse.papyrus.dd.dg.Transform} object.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
+ *
* @generated
*/
-public class TransformItemProvider extends ItemProviderAdapter implements
- IEditingDomainItemProvider, IStructuredItemContentProvider,
- ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource,
- IItemColorProvider, IItemFontProvider {
+public class TransformItemProvider extends ItemProviderAdapter implements IEditingDomainItemProvider, IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource, IItemColorProvider, IItemFontProvider {
+
/**
* This constructs an instance from a factory and a notifier. <!--
* begin-user-doc --> <!-- end-user-doc -->
@@ -59,9 +58,8 @@ public class TransformItemProvider extends ItemProviderAdapter implements
*/
@Override
public List<IItemPropertyDescriptor> getPropertyDescriptors(Object object) {
- if (itemPropertyDescriptors == null) {
+ if(itemPropertyDescriptors == null) {
super.getPropertyDescriptors(object);
-
}
return itemPropertyDescriptors;
}
@@ -70,6 +68,7 @@ public class TransformItemProvider extends ItemProviderAdapter implements
* This returns the label text for the adapted class.
* <!-- begin-user-doc
* --> <!-- end-user-doc -->
+ *
* @generated
*/
@Override
@@ -82,6 +81,7 @@ public class TransformItemProvider extends ItemProviderAdapter implements
* children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
* <!-- begin-user-doc --> <!--
* end-user-doc -->
+ *
* @generated
*/
@Override
@@ -98,8 +98,7 @@ public class TransformItemProvider extends ItemProviderAdapter implements
* @generated
*/
@Override
- protected void collectNewChildDescriptors(
- Collection<Object> newChildDescriptors, Object object) {
+ protected void collectNewChildDescriptors(Collection<Object> newChildDescriptors, Object object) {
super.collectNewChildDescriptors(newChildDescriptors, object);
}
@@ -113,5 +112,4 @@ public class TransformItemProvider extends ItemProviderAdapter implements
public ResourceLocator getResourceLocator() {
return DDEditPlugin.INSTANCE;
}
-
}
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 f1b500a..f7bd404 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
@@ -36,12 +36,11 @@ import org.eclipse.papyrus.dd.dg.Translate;
* This is the item provider adapter for a {@link org.eclipse.papyrus.dd.dg.Translate} object.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
+ *
* @generated
*/
-public class TranslateItemProvider extends TransformItemProvider implements
- IEditingDomainItemProvider, IStructuredItemContentProvider,
- ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource,
- IItemColorProvider, IItemFontProvider {
+public class TranslateItemProvider extends TransformItemProvider implements IEditingDomainItemProvider, IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource, IItemColorProvider, IItemFontProvider {
+
/**
* This constructs an instance from a factory and a notifier. <!--
* begin-user-doc --> <!-- end-user-doc -->
@@ -60,9 +59,8 @@ public class TranslateItemProvider extends TransformItemProvider implements
*/
@Override
public List<IItemPropertyDescriptor> getPropertyDescriptors(Object object) {
- if (itemPropertyDescriptors == null) {
+ if(itemPropertyDescriptors == null) {
super.getPropertyDescriptors(object);
-
addDeltaXPropertyDescriptor(object);
addDeltaYPropertyDescriptor(object);
}
@@ -76,19 +74,7 @@ public class TranslateItemProvider extends TransformItemProvider implements
* @generated
*/
protected void addDeltaXPropertyDescriptor(Object object) {
- itemPropertyDescriptors.add
- (createItemPropertyDescriptor
- (((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
- getResourceLocator(),
- getString("_UI_Translate_deltaX_feature"),
- getString("_UI_PropertyDescriptor_description", "_UI_Translate_deltaX_feature", "_UI_Translate_type"),
- DGPackage.Literals.TRANSLATE__DELTA_X,
- true,
- false,
- false,
- ItemPropertyDescriptor.REAL_VALUE_IMAGE,
- null,
- null));
+ itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(), getResourceLocator(), getString("_UI_Translate_deltaX_feature"), getString("_UI_PropertyDescriptor_description", "_UI_Translate_deltaX_feature", "_UI_Translate_type"), DGPackage.Literals.TRANSLATE__DELTA_X, true, false, false, ItemPropertyDescriptor.REAL_VALUE_IMAGE, null, null));
}
/**
@@ -98,24 +84,13 @@ public class TranslateItemProvider extends TransformItemProvider implements
* @generated
*/
protected void addDeltaYPropertyDescriptor(Object object) {
- itemPropertyDescriptors.add
- (createItemPropertyDescriptor
- (((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
- getResourceLocator(),
- getString("_UI_Translate_deltaY_feature"),
- getString("_UI_PropertyDescriptor_description", "_UI_Translate_deltaY_feature", "_UI_Translate_type"),
- DGPackage.Literals.TRANSLATE__DELTA_Y,
- true,
- false,
- false,
- ItemPropertyDescriptor.REAL_VALUE_IMAGE,
- null,
- null));
+ itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(), getResourceLocator(), getString("_UI_Translate_deltaY_feature"), getString("_UI_PropertyDescriptor_description", "_UI_Translate_deltaY_feature", "_UI_Translate_type"), DGPackage.Literals.TRANSLATE__DELTA_Y, true, false, false, ItemPropertyDescriptor.REAL_VALUE_IMAGE, null, null));
}
/**
* This returns Translate.gif.
* <!-- begin-user-doc --> <!-- end-user-doc -->
+ *
* @generated
*/
@Override
@@ -127,6 +102,7 @@ public class TranslateItemProvider extends TransformItemProvider implements
* This returns the label text for the adapted class.
* <!-- begin-user-doc
* --> <!-- end-user-doc -->
+ *
* @generated
*/
@Override
@@ -140,17 +116,17 @@ public class TranslateItemProvider extends TransformItemProvider implements
* children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
* <!-- begin-user-doc --> <!--
* end-user-doc -->
+ *
* @generated
*/
@Override
public void notifyChanged(Notification notification) {
updateChildren(notification);
-
- switch (notification.getFeatureID(Translate.class)) {
- case DGPackage.TRANSLATE__DELTA_X:
- case DGPackage.TRANSLATE__DELTA_Y:
- fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), false, true));
- return;
+ switch(notification.getFeatureID(Translate.class)) {
+ case DGPackage.TRANSLATE__DELTA_X:
+ case DGPackage.TRANSLATE__DELTA_Y:
+ fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), false, true));
+ return;
}
super.notifyChanged(notification);
}
@@ -163,9 +139,7 @@ public class TranslateItemProvider extends TransformItemProvider implements
* @generated
*/
@Override
- protected void collectNewChildDescriptors(
- Collection<Object> newChildDescriptors, Object object) {
+ protected void collectNewChildDescriptors(Collection<Object> newChildDescriptors, Object object) {
super.collectNewChildDescriptors(newChildDescriptors, object);
}
-
}
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 9a6c2c9..24a2eea 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
@@ -38,12 +38,11 @@ import org.eclipse.papyrus.dd.dg.Use;
/**
* This is the item provider adapter for a {@link org.eclipse.papyrus.dd.dg.Use} object.
* <!-- begin-user-doc --> <!-- end-user-doc -->
+ *
* @generated
*/
-public class UseItemProvider extends GraphicalElementItemProvider implements
- IEditingDomainItemProvider, IStructuredItemContentProvider,
- ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource,
- IItemColorProvider, IItemFontProvider {
+public class UseItemProvider extends GraphicalElementItemProvider implements IEditingDomainItemProvider, IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource, IItemColorProvider, IItemFontProvider {
+
/**
* This constructs an instance from a factory and a notifier. <!--
* begin-user-doc --> <!-- end-user-doc -->
@@ -62,9 +61,8 @@ public class UseItemProvider extends GraphicalElementItemProvider implements
*/
@Override
public List<IItemPropertyDescriptor> getPropertyDescriptors(Object object) {
- if (itemPropertyDescriptors == null) {
+ if(itemPropertyDescriptors == null) {
super.getPropertyDescriptors(object);
-
addReferencedElementPropertyDescriptor(object);
}
return itemPropertyDescriptors;
@@ -77,19 +75,7 @@ public class UseItemProvider extends GraphicalElementItemProvider implements
* @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));
}
/**
@@ -97,12 +83,12 @@ public class UseItemProvider extends GraphicalElementItemProvider implements
* {@link org.eclipse.emf.edit.command.AddCommand}, {@link org.eclipse.emf.edit.command.RemoveCommand} or
* {@link org.eclipse.emf.edit.command.MoveCommand} in {@link #createCommand}.
* <!-- begin-user-doc --> <!-- end-user-doc -->
+ *
* @generated
*/
@Override
- public Collection<? extends EStructuralFeature> getChildrenFeatures(
- Object object) {
- if (childrenFeatures == null) {
+ public Collection<? extends EStructuralFeature> getChildrenFeatures(Object object) {
+ if(childrenFeatures == null) {
super.getChildrenFeatures(object);
childrenFeatures.add(DGPackage.Literals.USE__BOUNDS);
}
@@ -111,19 +97,20 @@ public class UseItemProvider extends GraphicalElementItemProvider implements
/**
* <!-- begin-user-doc --> <!-- end-user-doc -->
+ *
* @generated
*/
@Override
protected EStructuralFeature getChildFeature(Object object, Object child) {
// Check the type of the specified child object and return the proper feature to use for
// adding (see {@link AddCommand}) it as a child.
-
return super.getChildFeature(object, child);
}
/**
* This returns Use.gif.
* <!-- begin-user-doc --> <!-- end-user-doc -->
+ *
* @generated
*/
@Override
@@ -135,14 +122,13 @@ public class UseItemProvider extends GraphicalElementItemProvider implements
* This returns the label text for the adapted class.
* <!-- begin-user-doc
* --> <!-- end-user-doc -->
+ *
* @generated
*/
@Override
public String getText(Object object) {
String label = ((Use)object).getId();
- return label == null || label.length() == 0 ?
- getString("_UI_Use_type") :
- getString("_UI_Use_type") + " " + label;
+ return label == null || label.length() == 0 ? getString("_UI_Use_type") : getString("_UI_Use_type") + " " + label;
}
/**
@@ -150,16 +136,16 @@ public class UseItemProvider extends GraphicalElementItemProvider implements
* children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
* <!-- begin-user-doc --> <!--
* end-user-doc -->
+ *
* @generated
*/
@Override
public void notifyChanged(Notification notification) {
updateChildren(notification);
-
- switch (notification.getFeatureID(Use.class)) {
- case DGPackage.USE__BOUNDS:
- fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), true, false));
- return;
+ switch(notification.getFeatureID(Use.class)) {
+ case DGPackage.USE__BOUNDS:
+ fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), true, false));
+ return;
}
super.notifyChanged(notification);
}
@@ -172,14 +158,8 @@ public class UseItemProvider extends GraphicalElementItemProvider implements
* @generated
*/
@Override
- protected void collectNewChildDescriptors(
- Collection<Object> newChildDescriptors, Object object) {
+ protected void collectNewChildDescriptors(Collection<Object> newChildDescriptors, Object object) {
super.collectNewChildDescriptors(newChildDescriptors, object);
-
- newChildDescriptors.add
- (createChildParameter
- (DGPackage.Literals.USE__BOUNDS,
- DCFactory.eINSTANCE.createBounds()));
+ newChildDescriptors.add(createChildParameter(DGPackage.Literals.USE__BOUNDS, DCFactory.eINSTANCE.createBounds()));
}
-
}
diff --git a/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/src/org/eclipse/papyrus/dd/di/provider/DIItemProviderAdapterFactory.java b/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/src/org/eclipse/papyrus/dd/di/provider/DIItemProviderAdapterFactory.java
index d7635c3..e9ed9f3 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
@@ -41,21 +41,21 @@ import org.eclipse.papyrus.dd.di.util.DIAdapterFactory;
* Note that most of the adapters are shared among multiple instances.
* <!-- begin-user-doc --> <!--
* end-user-doc -->
+ *
* @generated
*/
-public class DIItemProviderAdapterFactory extends DIAdapterFactory implements
- ComposeableAdapterFactory, IChangeNotifier, IDisposable {
+public class DIItemProviderAdapterFactory extends DIAdapterFactory implements ComposeableAdapterFactory, IChangeNotifier, IDisposable {
/**
* This keeps track of the root adapter factory that delegates to this adapter factory.
* <!-- begin-user-doc --> <!-- end-user-doc -->
+ *
* @generated
*/
protected ComposedAdapterFactory parentAdapterFactory;
/**
- * This is used to implement
- * {@link org.eclipse.emf.edit.provider.IChangeNotifier}. <!--
+ * This is used to implement {@link org.eclipse.emf.edit.provider.IChangeNotifier}. <!--
* begin-user-doc --> <!-- end-user-doc -->
*
* @generated
@@ -66,6 +66,7 @@ public class DIItemProviderAdapterFactory extends DIAdapterFactory implements
* This keeps track of all the supported types checked by {@link #isFactoryForType isFactoryForType}.
* <!-- begin-user-doc --> <!--
* end-user-doc -->
+ *
* @generated
*/
protected Collection<Object> supportedTypes = new ArrayList<Object>();
@@ -102,13 +103,13 @@ public class DIItemProviderAdapterFactory extends DIAdapterFactory implements
*
* @generated
*/
- public void setParentAdapterFactory(
- ComposedAdapterFactory parentAdapterFactory) {
+ public void setParentAdapterFactory(ComposedAdapterFactory parentAdapterFactory) {
this.parentAdapterFactory = parentAdapterFactory;
}
/**
* <!-- begin-user-doc --> <!-- end-user-doc -->
+ *
* @generated
*/
@Override
@@ -119,6 +120,7 @@ public class DIItemProviderAdapterFactory extends DIAdapterFactory implements
/**
* This implementation substitutes the factory itself as the key for the adapter.
* <!-- begin-user-doc --> <!-- end-user-doc -->
+ *
* @generated
*/
@Override
@@ -128,23 +130,24 @@ public class DIItemProviderAdapterFactory extends DIAdapterFactory implements
/**
* <!-- begin-user-doc --> <!-- end-user-doc -->
+ *
* @generated
*/
@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;
}
}
-
return null;
}
/**
* This adds a listener.
* <!-- begin-user-doc --> <!-- end-user-doc -->
+ *
* @generated
*/
public void addListener(INotifyChangedListener notifyChangedListener) {
@@ -154,6 +157,7 @@ public class DIItemProviderAdapterFactory extends DIAdapterFactory implements
/**
* This removes a listener.
* <!-- begin-user-doc --> <!-- end-user-doc -->
+ *
* @generated
*/
public void removeListener(INotifyChangedListener notifyChangedListener) {
@@ -161,16 +165,14 @@ public class DIItemProviderAdapterFactory extends DIAdapterFactory implements
}
/**
- * This delegates to {@link #changeNotifier} and to
- * {@link #parentAdapterFactory}. <!-- begin-user-doc --> <!-- end-user-doc
+ * This delegates to {@link #changeNotifier} and to {@link #parentAdapterFactory}. <!-- begin-user-doc --> <!-- end-user-doc
* -->
*
* @generated
*/
public void fireNotifyChanged(Notification notification) {
changeNotifier.fireNotifyChanged(notification);
-
- if (parentAdapterFactory != null) {
+ if(parentAdapterFactory != null) {
parentAdapterFactory.fireNotifyChanged(notification);
}
}
@@ -183,5 +185,4 @@ public class DIItemProviderAdapterFactory extends DIAdapterFactory implements
*/
public void dispose() {
}
-
}
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 5f9279a..48626d4 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
@@ -31,10 +31,10 @@ import org.eclipse.papyrus.dd.edit.DDEditPlugin;
* This is the item provider adapter for a {@link org.eclipse.papyrus.dd.di.DiagramElement} object.
* <!-- begin-user-doc
* --> <!-- end-user-doc -->
+ *
* @generated
*/
-public class DiagramElementItemProvider extends ItemProviderAdapter implements
- IEditingDomainItemProvider, IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource, IItemColorProvider, IItemFontProvider {
+public class DiagramElementItemProvider extends ItemProviderAdapter implements IEditingDomainItemProvider, IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource, IItemColorProvider, IItemFontProvider {
/**
* This constructs an instance from a factory and a notifier. <!--
@@ -54,9 +54,8 @@ public class DiagramElementItemProvider extends ItemProviderAdapter implements
*/
@Override
public List<IItemPropertyDescriptor> getPropertyDescriptors(Object object) {
- if (itemPropertyDescriptors == null) {
+ if(itemPropertyDescriptors == null) {
super.getPropertyDescriptors(object);
-
}
return itemPropertyDescriptors;
}
@@ -65,6 +64,7 @@ public class DiagramElementItemProvider extends ItemProviderAdapter implements
* This returns the label text for the adapted class.
* <!-- begin-user-doc
* --> <!-- end-user-doc -->
+ *
* @generated
*/
@Override
@@ -77,6 +77,7 @@ public class DiagramElementItemProvider extends ItemProviderAdapter implements
* children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
* <!-- begin-user-doc --> <!--
* end-user-doc -->
+ *
* @generated
*/
@Override
@@ -93,8 +94,7 @@ public class DiagramElementItemProvider extends ItemProviderAdapter implements
* @generated
*/
@Override
- protected void collectNewChildDescriptors(
- Collection<Object> newChildDescriptors, Object object) {
+ protected void collectNewChildDescriptors(Collection<Object> newChildDescriptors, Object object) {
super.collectNewChildDescriptors(newChildDescriptors, object);
}
@@ -108,5 +108,4 @@ public class DiagramElementItemProvider extends ItemProviderAdapter implements
public ResourceLocator getResourceLocator() {
return DDEditPlugin.INSTANCE;
}
-
}
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 79270f1..ed5a7fc 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
@@ -36,10 +36,10 @@ import org.eclipse.papyrus.dd.di.Diagram;
* This is the item provider adapter for a {@link org.eclipse.papyrus.dd.di.Diagram} object.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
+ *
* @generated
*/
-public class DiagramItemProvider extends ShapeItemProvider implements
- IEditingDomainItemProvider, IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource, IItemColorProvider, IItemFontProvider {
+public class DiagramItemProvider extends ShapeItemProvider implements IEditingDomainItemProvider, IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource, IItemColorProvider, IItemFontProvider {
/**
* This constructs an instance from a factory and a notifier. <!--
@@ -59,9 +59,8 @@ public class DiagramItemProvider extends ShapeItemProvider implements
*/
@Override
public List<IItemPropertyDescriptor> getPropertyDescriptors(Object object) {
- if (itemPropertyDescriptors == null) {
+ if(itemPropertyDescriptors == null) {
super.getPropertyDescriptors(object);
-
addNamePropertyDescriptor(object);
addDocumentationPropertyDescriptor(object);
addResolutionPropertyDescriptor(object);
@@ -73,22 +72,11 @@ public class DiagramItemProvider extends ShapeItemProvider implements
* This adds a property descriptor for the Name feature.
* <!-- begin-user-doc
* --> <!-- end-user-doc -->
+ *
* @generated
*/
protected void addNamePropertyDescriptor(Object object) {
- itemPropertyDescriptors.add
- (createItemPropertyDescriptor
- (((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
- getResourceLocator(),
- getString("_UI_Diagram_name_feature"),
- getString("_UI_PropertyDescriptor_description", "_UI_Diagram_name_feature", "_UI_Diagram_type"),
- DIPackage.Literals.DIAGRAM__NAME,
- true,
- false,
- false,
- ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
- null,
- null));
+ itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(), getResourceLocator(), getString("_UI_Diagram_name_feature"), getString("_UI_PropertyDescriptor_description", "_UI_Diagram_name_feature", "_UI_Diagram_type"), DIPackage.Literals.DIAGRAM__NAME, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null));
}
/**
@@ -98,19 +86,7 @@ public class DiagramItemProvider extends ShapeItemProvider implements
* @generated
*/
protected void addDocumentationPropertyDescriptor(Object object) {
- itemPropertyDescriptors.add
- (createItemPropertyDescriptor
- (((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
- getResourceLocator(),
- getString("_UI_Diagram_documentation_feature"),
- getString("_UI_PropertyDescriptor_description", "_UI_Diagram_documentation_feature", "_UI_Diagram_type"),
- DIPackage.Literals.DIAGRAM__DOCUMENTATION,
- true,
- false,
- false,
- ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
- null,
- null));
+ itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(), getResourceLocator(), getString("_UI_Diagram_documentation_feature"), getString("_UI_PropertyDescriptor_description", "_UI_Diagram_documentation_feature", "_UI_Diagram_type"), DIPackage.Literals.DIAGRAM__DOCUMENTATION, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null));
}
/**
@@ -120,33 +96,20 @@ public class DiagramItemProvider extends ShapeItemProvider implements
* @generated
*/
protected void addResolutionPropertyDescriptor(Object object) {
- itemPropertyDescriptors.add
- (createItemPropertyDescriptor
- (((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
- getResourceLocator(),
- getString("_UI_Diagram_resolution_feature"),
- getString("_UI_PropertyDescriptor_description", "_UI_Diagram_resolution_feature", "_UI_Diagram_type"),
- DIPackage.Literals.DIAGRAM__RESOLUTION,
- true,
- false,
- false,
- ItemPropertyDescriptor.REAL_VALUE_IMAGE,
- null,
- null));
+ itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(), getResourceLocator(), getString("_UI_Diagram_resolution_feature"), getString("_UI_PropertyDescriptor_description", "_UI_Diagram_resolution_feature", "_UI_Diagram_type"), DIPackage.Literals.DIAGRAM__RESOLUTION, true, false, false, ItemPropertyDescriptor.REAL_VALUE_IMAGE, null, null));
}
/**
* This returns the label text for the adapted class.
* <!-- begin-user-doc
* --> <!-- end-user-doc -->
+ *
* @generated
*/
@Override
public String getText(Object object) {
String label = ((Diagram)object).getName();
- return label == null || label.length() == 0 ?
- getString("_UI_Diagram_type") :
- getString("_UI_Diagram_type") + " " + label;
+ return label == null || label.length() == 0 ? getString("_UI_Diagram_type") : getString("_UI_Diagram_type") + " " + label;
}
/**
@@ -154,18 +117,18 @@ public class DiagramItemProvider extends ShapeItemProvider implements
* children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
* <!-- begin-user-doc --> <!--
* end-user-doc -->
+ *
* @generated
*/
@Override
public void notifyChanged(Notification notification) {
updateChildren(notification);
-
- switch (notification.getFeatureID(Diagram.class)) {
- case DIPackage.DIAGRAM__NAME:
- case DIPackage.DIAGRAM__DOCUMENTATION:
- case DIPackage.DIAGRAM__RESOLUTION:
- fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), false, true));
- return;
+ switch(notification.getFeatureID(Diagram.class)) {
+ case DIPackage.DIAGRAM__NAME:
+ case DIPackage.DIAGRAM__DOCUMENTATION:
+ case DIPackage.DIAGRAM__RESOLUTION:
+ fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), false, true));
+ return;
}
super.notifyChanged(notification);
}
@@ -178,9 +141,7 @@ public class DiagramItemProvider extends ShapeItemProvider implements
* @generated
*/
@Override
- protected void collectNewChildDescriptors(
- Collection<Object> newChildDescriptors, Object object) {
+ protected void collectNewChildDescriptors(Collection<Object> newChildDescriptors, Object object) {
super.collectNewChildDescriptors(newChildDescriptors, object);
}
-
}
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 fdb2b78..9ad5b42 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
@@ -33,10 +33,10 @@ import org.eclipse.papyrus.dd.di.Edge;
* This is the item provider adapter for a {@link org.eclipse.papyrus.dd.di.Edge} object.
* <!-- begin-user-doc --> <!--
* end-user-doc -->
+ *
* @generated
*/
-public class EdgeItemProvider extends DiagramElementItemProvider implements
- IEditingDomainItemProvider, IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource, IItemColorProvider, IItemFontProvider {
+public class EdgeItemProvider extends DiagramElementItemProvider implements IEditingDomainItemProvider, IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource, IItemColorProvider, IItemFontProvider {
/**
* This constructs an instance from a factory and a notifier. <!--
@@ -56,9 +56,8 @@ public class EdgeItemProvider extends DiagramElementItemProvider implements
*/
@Override
public List<IItemPropertyDescriptor> getPropertyDescriptors(Object object) {
- if (itemPropertyDescriptors == null) {
+ if(itemPropertyDescriptors == null) {
super.getPropertyDescriptors(object);
-
}
return itemPropertyDescriptors;
}
@@ -68,12 +67,12 @@ public class EdgeItemProvider extends DiagramElementItemProvider implements
* {@link org.eclipse.emf.edit.command.AddCommand}, {@link org.eclipse.emf.edit.command.RemoveCommand} or
* {@link org.eclipse.emf.edit.command.MoveCommand} in {@link #createCommand}.
* <!-- begin-user-doc --> <!-- end-user-doc -->
+ *
* @generated
*/
@Override
- public Collection<? extends EStructuralFeature> getChildrenFeatures(
- Object object) {
- if (childrenFeatures == null) {
+ public Collection<? extends EStructuralFeature> getChildrenFeatures(Object object) {
+ if(childrenFeatures == null) {
super.getChildrenFeatures(object);
childrenFeatures.add(DIPackage.Literals.EDGE__WAYPOINT);
}
@@ -82,13 +81,13 @@ public class EdgeItemProvider extends DiagramElementItemProvider implements
/**
* <!-- begin-user-doc --> <!-- end-user-doc -->
+ *
* @generated
*/
@Override
protected EStructuralFeature getChildFeature(Object object, Object child) {
// Check the type of the specified child object and return the proper feature to use for
// adding (see {@link AddCommand}) it as a child.
-
return super.getChildFeature(object, child);
}
@@ -96,6 +95,7 @@ public class EdgeItemProvider extends DiagramElementItemProvider implements
* This returns the label text for the adapted class.
* <!-- begin-user-doc
* --> <!-- end-user-doc -->
+ *
* @generated
*/
@Override
@@ -108,16 +108,16 @@ public class EdgeItemProvider extends DiagramElementItemProvider implements
* children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
* <!-- begin-user-doc --> <!--
* end-user-doc -->
+ *
* @generated
*/
@Override
public void notifyChanged(Notification notification) {
updateChildren(notification);
-
- switch (notification.getFeatureID(Edge.class)) {
- case DIPackage.EDGE__WAYPOINT:
- fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), true, false));
- return;
+ switch(notification.getFeatureID(Edge.class)) {
+ case DIPackage.EDGE__WAYPOINT:
+ fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), true, false));
+ return;
}
super.notifyChanged(notification);
}
@@ -130,14 +130,8 @@ public class EdgeItemProvider extends DiagramElementItemProvider implements
* @generated
*/
@Override
- protected void collectNewChildDescriptors(
- Collection<Object> newChildDescriptors, Object object) {
+ protected void collectNewChildDescriptors(Collection<Object> newChildDescriptors, Object object) {
super.collectNewChildDescriptors(newChildDescriptors, object);
-
- newChildDescriptors.add
- (createChildParameter
- (DIPackage.Literals.EDGE__WAYPOINT,
- DCFactory.eINSTANCE.createPoint()));
+ newChildDescriptors.add(createChildParameter(DIPackage.Literals.EDGE__WAYPOINT, DCFactory.eINSTANCE.createPoint()));
}
-
}
diff --git a/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/src/org/eclipse/papyrus/dd/di/provider/ShapeItemProvider.java b/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/src/org/eclipse/papyrus/dd/di/provider/ShapeItemProvider.java
index 9f02b47..d0c4290 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
@@ -38,10 +38,10 @@ import org.eclipse.papyrus.dd.di.Shape;
* This is the item provider adapter for a {@link org.eclipse.papyrus.dd.di.Shape} object.
* <!-- begin-user-doc --> <!--
* end-user-doc -->
+ *
* @generated
*/
-public class ShapeItemProvider extends DiagramElementItemProvider implements
- IEditingDomainItemProvider, IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource, IItemColorProvider, IItemFontProvider {
+public class ShapeItemProvider extends DiagramElementItemProvider implements IEditingDomainItemProvider, IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource, IItemColorProvider, IItemFontProvider {
/**
* This constructs an instance from a factory and a notifier. <!--
@@ -61,9 +61,8 @@ public class ShapeItemProvider extends DiagramElementItemProvider implements
*/
@Override
public List<IItemPropertyDescriptor> getPropertyDescriptors(Object object) {
- if (itemPropertyDescriptors == null) {
+ if(itemPropertyDescriptors == null) {
super.getPropertyDescriptors(object);
-
}
return itemPropertyDescriptors;
}
@@ -73,12 +72,12 @@ public class ShapeItemProvider extends DiagramElementItemProvider implements
* {@link org.eclipse.emf.edit.command.AddCommand}, {@link org.eclipse.emf.edit.command.RemoveCommand} or
* {@link org.eclipse.emf.edit.command.MoveCommand} in {@link #createCommand}.
* <!-- begin-user-doc --> <!-- end-user-doc -->
+ *
* @generated
*/
@Override
- public Collection<? extends EStructuralFeature> getChildrenFeatures(
- Object object) {
- if (childrenFeatures == null) {
+ public Collection<? extends EStructuralFeature> getChildrenFeatures(Object object) {
+ if(childrenFeatures == null) {
super.getChildrenFeatures(object);
childrenFeatures.add(DIPackage.Literals.SHAPE__BOUNDS);
}
@@ -87,13 +86,13 @@ public class ShapeItemProvider extends DiagramElementItemProvider implements
/**
* <!-- begin-user-doc --> <!-- end-user-doc -->
+ *
* @generated
*/
@Override
protected EStructuralFeature getChildFeature(Object object, Object child) {
// Check the type of the specified child object and return the proper feature to use for
// adding (see {@link AddCommand}) it as a child.
-
return super.getChildFeature(object, child);
}
@@ -101,6 +100,7 @@ public class ShapeItemProvider extends DiagramElementItemProvider implements
* This returns the label text for the adapted class.
* <!-- begin-user-doc
* --> <!-- end-user-doc -->
+ *
* @generated
*/
@Override
@@ -113,16 +113,16 @@ public class ShapeItemProvider extends DiagramElementItemProvider implements
* children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
* <!-- begin-user-doc --> <!--
* end-user-doc -->
+ *
* @generated
*/
@Override
public void notifyChanged(Notification notification) {
updateChildren(notification);
-
- switch (notification.getFeatureID(Shape.class)) {
- case DIPackage.SHAPE__BOUNDS:
- fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), true, false));
- return;
+ switch(notification.getFeatureID(Shape.class)) {
+ case DIPackage.SHAPE__BOUNDS:
+ fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), true, false));
+ return;
}
super.notifyChanged(notification);
}
@@ -135,14 +135,8 @@ public class ShapeItemProvider extends DiagramElementItemProvider implements
* @generated
*/
@Override
- protected void collectNewChildDescriptors(
- Collection<Object> newChildDescriptors, Object object) {
+ protected void collectNewChildDescriptors(Collection<Object> newChildDescriptors, Object object) {
super.collectNewChildDescriptors(newChildDescriptors, object);
-
- newChildDescriptors.add
- (createChildParameter
- (DIPackage.Literals.SHAPE__BOUNDS,
- DCFactory.eINSTANCE.createBounds()));
+ newChildDescriptors.add(createChildParameter(DIPackage.Literals.SHAPE__BOUNDS, DCFactory.eINSTANCE.createBounds()));
}
-
}
diff --git a/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/src/org/eclipse/papyrus/dd/di/provider/StyleItemProvider.java b/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/src/org/eclipse/papyrus/dd/di/provider/StyleItemProvider.java
index 3c0430a..50a10a4 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
@@ -35,10 +35,10 @@ import org.eclipse.papyrus.dd.edit.DDEditPlugin;
* This is the item provider adapter for a {@link org.eclipse.papyrus.dd.di.Style} object.
* <!-- begin-user-doc --> <!--
* end-user-doc -->
+ *
* @generated
*/
-public class StyleItemProvider extends ItemProviderAdapter implements
- IEditingDomainItemProvider, IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource, IItemColorProvider, IItemFontProvider {
+public class StyleItemProvider extends ItemProviderAdapter implements IEditingDomainItemProvider, IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource, IItemColorProvider, IItemFontProvider {
/**
* This constructs an instance from a factory and a notifier. <!--
@@ -58,9 +58,8 @@ public class StyleItemProvider extends ItemProviderAdapter implements
*/
@Override
public List<IItemPropertyDescriptor> getPropertyDescriptors(Object object) {
- if (itemPropertyDescriptors == null) {
+ if(itemPropertyDescriptors == null) {
super.getPropertyDescriptors(object);
-
}
return itemPropertyDescriptors;
}
@@ -69,6 +68,7 @@ public class StyleItemProvider extends ItemProviderAdapter implements
* This returns the label text for the adapted class.
* <!-- begin-user-doc
* --> <!-- end-user-doc -->
+ *
* @generated
*/
@Override
@@ -81,6 +81,7 @@ public class StyleItemProvider extends ItemProviderAdapter implements
* children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
* <!-- begin-user-doc --> <!--
* end-user-doc -->
+ *
* @generated
*/
@Override
@@ -97,8 +98,7 @@ public class StyleItemProvider extends ItemProviderAdapter implements
* @generated
*/
@Override
- protected void collectNewChildDescriptors(
- Collection<Object> newChildDescriptors, Object object) {
+ protected void collectNewChildDescriptors(Collection<Object> newChildDescriptors, Object object) {
super.collectNewChildDescriptors(newChildDescriptors, object);
}
@@ -112,5 +112,4 @@ public class StyleItemProvider extends ItemProviderAdapter implements
public ResourceLocator getResourceLocator() {
return DDEditPlugin.INSTANCE;
}
-
}
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 33bc648..0a3c015 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
@@ -20,6 +20,7 @@ import org.eclipse.emf.ecore.provider.EcoreEditPlugin;
* This is the central singleton for the DG edit plugin.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
+ *
* @generated
*/
public final class DDEditPlugin extends EMFPlugin {
@@ -46,13 +47,14 @@ public final class DDEditPlugin extends EMFPlugin {
* @generated NOT
*/
public DDEditPlugin() {
- super(new ResourceLocator[] { EcoreEditPlugin.INSTANCE, });
+ super(new ResourceLocator[]{ EcoreEditPlugin.INSTANCE, });
}
/**
* Returns the singleton instance of the Eclipse plugin.
* <!-- begin-user-doc
* --> <!-- end-user-doc -->
+ *
* @return the singleton instance.
* @generated
*/
@@ -65,6 +67,7 @@ public final class DDEditPlugin extends EMFPlugin {
* Returns the singleton instance of the Eclipse plugin.
* <!-- begin-user-doc
* --> <!-- end-user-doc -->
+ *
* @return the singleton instance.
* @generated
*/
@@ -83,15 +86,14 @@ public final class DDEditPlugin extends EMFPlugin {
/**
* Creates an instance.
* <!-- begin-user-doc --> <!-- end-user-doc -->
+ *
* @generated
*/
public Implementation() {
super();
-
// Remember the static instance.
//
plugin = this;
}
}
-
}
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 be3f5cc..5fd5d05 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
@@ -307,7 +307,7 @@ public class DGToSVGConverter extends DGSwitch<Object> implements SVGSyntax {
svg.setAttribute(SVG_HEIGHT_ATTRIBUTE,
convertDoubleToString(bounds.getHeight()));
}
-
+
return super.caseCanvas(object);
}
@@ -533,9 +533,10 @@ public class DGToSVGConverter extends DGSwitch<Object> implements SVGSyntax {
}
element.setAttribute(SVG_TRANSFORM_ATTRIBUTE, transforms);
}
-
+
if (object.getLayoutData() != null)
- element.setAttribute(SVG_LAYOUT_DATA_ATTRIBUTE, object.getLayoutData());
+ element.setAttribute(SVG_LAYOUT_DATA_ATTRIBUTE,
+ object.getLayoutData());
}
return super.caseGraphicalElement(object);
@@ -550,7 +551,7 @@ public class DGToSVGConverter extends DGSwitch<Object> implements SVGSyntax {
svgDocument.createElementNS(SVG_NAMESPACE_URI, SVG_G_TAG));
getParentElement(object).appendChild(g);
}
-
+
if (object.getLayout() != null)
g.setAttribute(SVG_LAYOUT_ATTRIBUTE, object.getLayout());
@@ -975,7 +976,7 @@ public class DGToSVGConverter extends DGSwitch<Object> implements SVGSyntax {
svg.setAttribute(XMLNS_PREFIX, SVG_NAMESPACE_URI);
svg.setAttribute(XMLNS_PREFIX + ":" + XLINK_PREFIX, XLINK_NAMESPACE_URI);
svg.setAttribute(SVG_ONLOAD_ATTRIBUTE, "validate(evt.target)");
-
+
if (object.eIsSet(DGPackage.Literals.ROOT_CANVAS__BACKGROUND_COLOR)) {
String background = convertColorToString(object
.getBackgroundColor());
@@ -990,18 +991,20 @@ public class DGToSVGConverter extends DGSwitch<Object> implements SVGSyntax {
target, data);
svgDocument.insertBefore(pi, svgDocument.getDocumentElement());
}
-
+
for (String s : object.getScripts()) {
try {
URL url = FileLocator.toFileURL(new URL(s));
- Element script = svgDocument.createElementNS(SVG_NAMESPACE_URI, SVG_SCRIPT_TAG);
- script.setAttributeNS(XLINK_NAMESPACE_URI, XLINK_HREF_QNAME, url.toString());
+ 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);
}
}
-
+
if (object.getDefinitions() != null) {
doSwitch(object.getDefinitions());
}
@@ -1262,7 +1265,7 @@ public class DGToSVGConverter extends DGSwitch<Object> implements SVGSyntax {
text.setAttribute(SVG_Y_ATTRIBUTE,
convertDoubleToString(position.getY()));
}
-
+
if (object.getAnchor() != null) {
TextAnchor ta = object.getAnchor();
String value = null;
diff --git a/extraplugins/diagram-definition/org.eclipse.papyrus.dd.editor/src/org/eclipse/papyrus/dd/editor/DDEditorPage.java b/extraplugins/diagram-definition/org.eclipse.papyrus.dd.editor/src/org/eclipse/papyrus/dd/editor/DDEditorPage.java
index 4b35d84..5b3bb9b 100644
--- a/extraplugins/diagram-definition/org.eclipse.papyrus.dd.editor/src/org/eclipse/papyrus/dd/editor/DDEditorPage.java
+++ b/extraplugins/diagram-definition/org.eclipse.papyrus.dd.editor/src/org/eclipse/papyrus/dd/editor/DDEditorPage.java
@@ -128,24 +128,27 @@ public abstract class DDEditorPage extends FormPage {
/**
* Adds actions to the page's toolbar
*
- * @param manager The page's toolbar manager
+ * @param manager
+ * The page's toolbar manager
*/
public void setupActions(IToolBarManager manager) {
manager.add(new Separator("Page"));
manager.add(new Separator("Common"));
Action action;
-
+
action = new Action("Help") {
public void run() {
- PlatformUI.getWorkbench().getHelpSystem().displayHelp(getPageHelpId());
+ PlatformUI.getWorkbench().getHelpSystem()
+ .displayHelp(getPageHelpId());
}
};
action.setToolTipText("Show help");
- action.setImageDescriptor(DDEditorPlugin.getImageDescriptor(DDEditorPlugin.IMAGE_HELP));
+ action.setImageDescriptor(DDEditorPlugin
+ .getImageDescriptor(DDEditorPlugin.IMAGE_HELP));
manager.appendToGroup("Common", action);
}
-
+
/**
* Get the help id associated with this page
*
@@ -154,5 +157,5 @@ public abstract class DDEditorPage extends FormPage {
protected String getPageHelpId() {
return "";
}
-
+
}
diff --git a/extraplugins/diagram-definition/org.eclipse.papyrus.dd.editor/src/org/eclipse/papyrus/dd/editor/DDEditorPlugin.java b/extraplugins/diagram-definition/org.eclipse.papyrus.dd.editor/src/org/eclipse/papyrus/dd/editor/DDEditorPlugin.java
index a2d3eda..16cdcbc 100644
--- a/extraplugins/diagram-definition/org.eclipse.papyrus.dd.editor/src/org/eclipse/papyrus/dd/editor/DDEditorPlugin.java
+++ b/extraplugins/diagram-definition/org.eclipse.papyrus.dd.editor/src/org/eclipse/papyrus/dd/editor/DDEditorPlugin.java
@@ -25,7 +25,7 @@ import org.eclipse.papyrus.dd.edit.DDEditPlugin;
public final class DDEditorPlugin extends EMFPlugin {
public static final String IMAGE_HELP = "Help";
-
+
/**
* Keep track of the singleton.
*/
@@ -81,9 +81,11 @@ public final class DDEditorPlugin extends EMFPlugin {
@Override
protected void initializeImageRegistry(ImageRegistry reg) {
super.initializeImageRegistry(reg);
- reg.put(IMAGE_HELP, ImageDescriptor.createFromURL(getBundle().getEntry("icons/help.gif")));
+ reg.put(IMAGE_HELP,
+ ImageDescriptor.createFromURL(getBundle().getEntry(
+ "icons/help.gif")));
}
-
+
}
public static ImageDescriptor getImageDescriptor(String id) {
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 f42de36..56b6907 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
@@ -5,3 +5,283 @@ 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
index ced03a5..b5f980c 100644
--- 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
@@ -1,3 +1,3 @@
eclipse.preferences.version=1
-org.eclipse.jdt.ui.javadoc=false
-org.eclipse.jdt.ui.text.custom_code_templates=<?xml version\="1.0" encoding\="UTF-8" standalone\="no"?><templates><template autoinsert\="true" context\="gettercomment_context" deleted\="false" description\="Comment for getter method" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.gettercomment" name\="gettercomment">/**\n * @return the ${bare_field_name}\n */</template><template autoinsert\="true" context\="settercomment_context" deleted\="false" description\="Comment for setter method" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.settercomment" name\="settercomment">/**\n * @param ${param} the ${bare_field_name} to set\n */</template><template autoinsert\="true" context\="constructorcomment_context" deleted\="false" description\="Comment for created constructors" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.constructorcomment" name\="constructorcomment">/**\n * ${tags}\n */</template><template autoinsert\="true" context\="filecomment_context" deleted\="false" description\="Comment for created Java files" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.filecomment" name\="filecomment">/**\n * \n */</template><template autoinsert\="true" context\="typecomment_context" deleted\="false" description\="Comment for created types" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.typecomment" name\="typecomment">/**\n * @author ${user}\n *\n * ${tags}\n */</template><template autoinsert\="true" context\="fieldcomment_context" deleted\="false" description\="Comment for fields" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.fieldcomment" name\="fieldcomment">/**\n * \n */</template><template autoinsert\="true" context\="methodcomment_context" deleted\="false" description\="Comment for non-overriding methods" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.methodcomment" name\="methodcomment">/**\n * ${tags}\n */</template><template autoinsert\="true" context\="overridecomment_context" deleted\="false" description\="Comment for overriding methods" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.overridecomment" name\="overridecomment">/* (non-Javadoc)\n * ${see_to_overridden}\n */</template><template autoinsert\="true" context\="delegatecomment_context" deleted\="false" description\="Comment for delegate methods" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.delegatecomment" name\="delegatecomment">/**\n * ${tags}\n * ${see_to_target}\n */</template><template autoinsert\="true" context\="newtype_context" deleted\="false" description\="Newly created files" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.newtype" name\="newtype">${filecomment}\n${package_declaration}\n\n${typecomment}\n${type_declaration}</template><template autoinsert\="true" context\="classbody_context" deleted\="false" description\="Code in new class type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.classbody" name\="classbody">\n</template><template autoinsert\="true" context\="interfacebody_context" deleted\="false" description\="Code in new interface type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.interfacebody" name\="interfacebody">\n</template><template autoinsert\="true" context\="enumbody_context" deleted\="false" description\="Code in new enum type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.enumbody" name\="enumbody">\n</template><template autoinsert\="true" context\="annotationbody_context" deleted\="false" description\="Code in new annotation type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.annotationbody" name\="annotationbody">\n</template><template autoinsert\="true" context\="catchblock_context" deleted\="false" description\="Code in new catch blocks" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.catchblock" name\="catchblock">// ${todo} Auto-generated catch block\n${exception_var}.printStackTrace();</template><template autoinsert\="true" context\="methodbody_context" deleted\="false" description\="Code in created method stubs" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.methodbody" name\="methodbody">// ${todo} Auto-generated method stub\n${body_statement}</template><template autoinsert\="true" context\="constructorbody_context" deleted\="false" description\="Code in created constructor stubs" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.constructorbody" name\="constructorbody">${body_statement}\n// ${todo} Auto-generated constructor stub</template><template autoinsert\="true" context\="getterbody_context" deleted\="false" description\="Code in created getters" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.getterbody" name\="getterbody">return ${field};</template><template autoinsert\="true" context\="setterbody_context" deleted\="false" description\="Code in created setters" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.setterbody" name\="setterbody">${field} \= ${param};</template></templates>
+formatter_profile=_Zero blank Papyrus Formatter Profile CDM
+formatter_settings_version=12
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 a298048..313912f 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
@@ -18,23 +18,22 @@ import org.eclipse.emf.common.util.DiagnosticChain;
import org.eclipse.emf.ecore.EObject;
/**
- * <!-- begin-user-doc --> A representation of the model object '
- * <em><b>Bounds</b></em>'. <!-- end-user-doc -->
- *
+ * <!-- begin-user-doc --> A representation of the model object ' <em><b>Bounds</b></em>'. <!-- end-user-doc -->
+ *
* <!-- begin-model-doc -->
* Bounds specifies a rectangular area in some x-y coordinate system that is defined by a location (x and y) and a size (width and height).
* <!-- end-model-doc -->
- *
+ *
* <p>
* The following features are supported:
* <ul>
- * <li>{@link org.eclipse.papyrus.dd.dc.Bounds#getX <em>X</em>}</li>
- * <li>{@link org.eclipse.papyrus.dd.dc.Bounds#getY <em>Y</em>}</li>
- * <li>{@link org.eclipse.papyrus.dd.dc.Bounds#getWidth <em>Width</em>}</li>
- * <li>{@link org.eclipse.papyrus.dd.dc.Bounds#getHeight <em>Height</em>}</li>
+ * <li>{@link org.eclipse.papyrus.dd.dc.Bounds#getX <em>X</em>}</li>
+ * <li>{@link org.eclipse.papyrus.dd.dc.Bounds#getY <em>Y</em>}</li>
+ * <li>{@link org.eclipse.papyrus.dd.dc.Bounds#getWidth <em>Width</em>}</li>
+ * <li>{@link org.eclipse.papyrus.dd.dc.Bounds#getHeight <em>Height</em>}</li>
* </ul>
* </p>
- *
+ *
* @see org.eclipse.papyrus.dd.dc.DCPackage#getBounds()
* @model
* @generated
@@ -59,7 +58,9 @@ public interface Bounds extends EObject {
/**
* Sets the value of the '{@link org.eclipse.papyrus.dd.dc.Bounds#getX <em>X</em>}' attribute.
* <!-- begin-user-doc --> <!-- end-user-doc -->
- * @param value the new value of the '<em>X</em>' attribute.
+ *
+ * @param value
+ * the new value of the '<em>X</em>' attribute.
* @see #isSetX()
* @see #unsetX()
* @see #getX()
@@ -70,6 +71,7 @@ public interface Bounds extends EObject {
/**
* Unsets the value of the '{@link org.eclipse.papyrus.dd.dc.Bounds#getX <em>X</em>}' attribute.
* <!-- begin-user-doc --> <!-- end-user-doc -->
+ *
* @see #isSetX()
* @see #getX()
* @see #setX(double)
@@ -80,6 +82,7 @@ public interface Bounds extends EObject {
/**
* Returns whether the value of the '{@link org.eclipse.papyrus.dd.dc.Bounds#getX <em>X</em>}' attribute is set.
* <!-- begin-user-doc --> <!-- end-user-doc -->
+ *
* @return whether the value of the '<em>X</em>' attribute is set.
* @see #unsetX()
* @see #getX()
@@ -106,7 +109,9 @@ public interface Bounds extends EObject {
/**
* Sets the value of the '{@link org.eclipse.papyrus.dd.dc.Bounds#getY <em>Y</em>}' attribute.
* <!-- begin-user-doc --> <!-- end-user-doc -->
- * @param value the new value of the '<em>Y</em>' attribute.
+ *
+ * @param value
+ * the new value of the '<em>Y</em>' attribute.
* @see #isSetY()
* @see #unsetY()
* @see #getY()
@@ -117,6 +122,7 @@ public interface Bounds extends EObject {
/**
* Unsets the value of the '{@link org.eclipse.papyrus.dd.dc.Bounds#getY <em>Y</em>}' attribute.
* <!-- begin-user-doc --> <!-- end-user-doc -->
+ *
* @see #isSetY()
* @see #getY()
* @see #setY(double)
@@ -127,6 +133,7 @@ public interface Bounds extends EObject {
/**
* Returns whether the value of the '{@link org.eclipse.papyrus.dd.dc.Bounds#getY <em>Y</em>}' attribute is set.
* <!-- begin-user-doc --> <!-- end-user-doc -->
+ *
* @return whether the value of the '<em>Y</em>' attribute is set.
* @see #unsetY()
* @see #getY()
@@ -153,7 +160,9 @@ public interface Bounds extends EObject {
/**
* Sets the value of the '{@link org.eclipse.papyrus.dd.dc.Bounds#getWidth <em>Width</em>}' attribute.
* <!-- begin-user-doc --> <!-- end-user-doc -->
- * @param value the new value of the '<em>Width</em>' attribute.
+ *
+ * @param value
+ * the new value of the '<em>Width</em>' attribute.
* @see #isSetWidth()
* @see #unsetWidth()
* @see #getWidth()
@@ -164,6 +173,7 @@ public interface Bounds extends EObject {
/**
* Unsets the value of the '{@link org.eclipse.papyrus.dd.dc.Bounds#getWidth <em>Width</em>}' attribute.
* <!-- begin-user-doc --> <!-- end-user-doc -->
+ *
* @see #isSetWidth()
* @see #getWidth()
* @see #setWidth(double)
@@ -174,6 +184,7 @@ public interface Bounds extends EObject {
/**
* Returns whether the value of the '{@link org.eclipse.papyrus.dd.dc.Bounds#getWidth <em>Width</em>}' attribute is set.
* <!-- begin-user-doc --> <!-- end-user-doc -->
+ *
* @return whether the value of the '<em>Width</em>' attribute is set.
* @see #unsetWidth()
* @see #getWidth()
@@ -203,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
*/
@@ -212,6 +223,7 @@ public interface Bounds extends EObject {
/**
* Unsets the value of the '{@link org.eclipse.papyrus.dd.dc.Bounds#getHeight <em>Height</em>}' attribute.
* <!-- begin-user-doc --> <!-- end-user-doc -->
+ *
* @see #isSetHeight()
* @see #getHeight()
* @see #setHeight(double)
@@ -222,6 +234,7 @@ public interface Bounds extends EObject {
/**
* Returns whether the value of the '{@link org.eclipse.papyrus.dd.dc.Bounds#getHeight <em>Height</em>}' attribute is set.
* <!-- begin-user-doc --> <!-- end-user-doc -->
+ *
* @return whether the value of the '<em>Height</em>' attribute is set.
* @see #unsetHeight()
* @see #getHeight()
@@ -235,31 +248,28 @@ 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
- * -->
- * @model
+ * The cache of context-specific information. <!-- end-model-doc
+ * -->
+ * @model
* annotation="http://www.eclipse.org/emf/2002/Ecore/OCL body='width >= 0'"
* @generated
*/
- boolean nonNegativeWidth(DiagnosticChain diagnostics,
- Map<Object, Object> context);
+ boolean nonNegativeWidth(DiagnosticChain diagnostics, Map<Object, Object> context);
/**
* <!-- begin-user-doc --> <!-- end-user-doc --> <!-- begin-model-doc -->
* 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
- * -->
- * @model
+ * The cache of context-specific information. <!-- end-model-doc
+ * -->
+ * @model
* annotation="http://www.eclipse.org/emf/2002/Ecore/OCL body='height >=0'"
* @generated
*/
- boolean nonNegativeHeight(DiagnosticChain diagnostics,
- Map<Object, Object> context);
-
+ boolean nonNegativeHeight(DiagnosticChain diagnostics, Map<Object, Object> context);
} // Bounds
diff --git a/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dc/DCFactory.java b/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dc/DCFactory.java
index b364e15..26e3361 100644
--- a/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dc/DCFactory.java
+++ b/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dc/DCFactory.java
@@ -16,6 +16,7 @@ import org.eclipse.emf.ecore.EFactory;
/**
* <!-- begin-user-doc --> The <b>Factory</b> for the model. It provides a
* create method for each non-abstract class of the model. <!-- end-user-doc -->
+ *
* @see org.eclipse.papyrus.dd.dc.DCPackage
* @generated
*/
@@ -25,6 +26,7 @@ public interface DCFactory extends EFactory {
* The singleton instance of the factory.
* <!-- begin-user-doc --> <!--
* end-user-doc -->
+ *
* @generated
*/
DCFactory eINSTANCE = org.eclipse.papyrus.dd.dc.impl.DCFactoryImpl.init();
@@ -33,6 +35,7 @@ public interface DCFactory extends EFactory {
* Returns a new object of class '<em>Point</em>'.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
+ *
* @return a new object of class '<em>Point</em>'.
* @generated
*/
@@ -42,6 +45,7 @@ public interface DCFactory extends EFactory {
* Returns a new object of class '<em>Dimension</em>'.
* <!-- begin-user-doc
* --> <!-- end-user-doc -->
+ *
* @return a new object of class '<em>Dimension</em>'.
* @generated
*/
@@ -51,6 +55,7 @@ public interface DCFactory extends EFactory {
* Returns a new object of class '<em>Bounds</em>'.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
+ *
* @return a new object of class '<em>Bounds</em>'.
* @generated
*/
@@ -60,9 +65,9 @@ public interface DCFactory extends EFactory {
* Returns the package supported by this factory.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
+ *
* @return the package supported by this factory.
* @generated
*/
DCPackage getDCPackage();
-
} // DCFactory
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 f15cee6..d62517d 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
@@ -42,6 +42,7 @@ public interface DCPackage extends EPackage {
/**
* The package name.
* <!-- begin-user-doc --> <!-- end-user-doc -->
+ *
* @generated
*/
String eNAME = "dc";
@@ -49,6 +50,7 @@ public interface DCPackage extends EPackage {
/**
* The package namespace URI.
* <!-- begin-user-doc --> <!-- end-user-doc -->
+ *
* @generated
*/
String eNS_URI = "http://www.omg.org/spec/DD/20110901/DC";
@@ -56,6 +58,7 @@ public interface DCPackage extends EPackage {
/**
* The package namespace name.
* <!-- begin-user-doc --> <!-- end-user-doc -->
+ *
* @generated
*/
String eNS_PREFIX = "dc";
@@ -64,6 +67,7 @@ public interface DCPackage extends EPackage {
* The singleton instance of the package.
* <!-- begin-user-doc --> <!--
* end-user-doc -->
+ *
* @generated
*/
DCPackage eINSTANCE = org.eclipse.papyrus.dd.dc.impl.DCPackageImpl.init();
@@ -71,6 +75,7 @@ public interface DCPackage extends EPackage {
/**
* The meta object id for the '{@link org.eclipse.papyrus.dd.dc.impl.PointImpl <em>Point</em>}' class.
* <!-- begin-user-doc --> <!-- end-user-doc -->
+ *
* @see org.eclipse.papyrus.dd.dc.impl.PointImpl
* @see org.eclipse.papyrus.dd.dc.impl.DCPackageImpl#getPoint()
* @generated
@@ -81,6 +86,7 @@ public interface DCPackage extends EPackage {
* The feature id for the '<em><b>X</b></em>' attribute.
* <!-- begin-user-doc
* --> <!-- end-user-doc -->
+ *
* @generated
* @ordered
*/
@@ -90,6 +96,7 @@ public interface DCPackage extends EPackage {
* The feature id for the '<em><b>Y</b></em>' attribute.
* <!-- begin-user-doc
* --> <!-- end-user-doc -->
+ *
* @generated
* @ordered
*/
@@ -116,6 +123,7 @@ public interface DCPackage extends EPackage {
/**
* The meta object id for the '{@link org.eclipse.papyrus.dd.dc.impl.DimensionImpl <em>Dimension</em>}' class.
* <!-- begin-user-doc --> <!-- end-user-doc -->
+ *
* @see org.eclipse.papyrus.dd.dc.impl.DimensionImpl
* @see org.eclipse.papyrus.dd.dc.impl.DCPackageImpl#getDimension()
* @generated
@@ -179,6 +187,7 @@ public interface DCPackage extends EPackage {
/**
* The meta object id for the '{@link org.eclipse.papyrus.dd.dc.impl.BoundsImpl <em>Bounds</em>}' class.
* <!-- begin-user-doc --> <!-- end-user-doc -->
+ *
* @see org.eclipse.papyrus.dd.dc.impl.BoundsImpl
* @see org.eclipse.papyrus.dd.dc.impl.DCPackageImpl#getBounds()
* @generated
@@ -189,6 +198,7 @@ public interface DCPackage extends EPackage {
* The feature id for the '<em><b>X</b></em>' attribute.
* <!-- begin-user-doc
* --> <!-- end-user-doc -->
+ *
* @generated
* @ordered
*/
@@ -198,6 +208,7 @@ public interface DCPackage extends EPackage {
* The feature id for the '<em><b>Y</b></em>' attribute.
* <!-- begin-user-doc
* --> <!-- end-user-doc -->
+ *
* @generated
* @ordered
*/
@@ -290,6 +301,7 @@ public interface DCPackage extends EPackage {
* The meta object id for the '<em>Real</em>' data type.
* <!-- begin-user-doc
* --> <!-- end-user-doc -->
+ *
* @see org.eclipse.papyrus.dd.dc.impl.DCPackageImpl#getReal()
* @generated
*/
@@ -316,8 +328,7 @@ public interface DCPackage extends EPackage {
int COLOR = 8;
/**
- * Returns the meta object for class '
- * {@link org.eclipse.papyrus.dd.dc.Point <em>Point</em>}'. <!--
+ * Returns the meta object for class ' {@link org.eclipse.papyrus.dd.dc.Point <em>Point</em>}'. <!--
* begin-user-doc --> <!-- end-user-doc -->
*
* @return the meta object for class '<em>Point</em>'.
@@ -327,8 +338,7 @@ public interface DCPackage extends EPackage {
EClass getPoint();
/**
- * Returns the meta object for the attribute '
- * {@link org.eclipse.papyrus.dd.dc.Point#getX <em>X</em>}'. <!--
+ * Returns the meta object for the attribute ' {@link org.eclipse.papyrus.dd.dc.Point#getX <em>X</em>}'. <!--
* begin-user-doc --> <!-- end-user-doc -->
*
* @return the meta object for the attribute '<em>X</em>'.
@@ -339,8 +349,7 @@ public interface DCPackage extends EPackage {
EAttribute getPoint_X();
/**
- * Returns the meta object for the attribute '
- * {@link org.eclipse.papyrus.dd.dc.Point#getY <em>Y</em>}'. <!--
+ * Returns the meta object for the attribute ' {@link org.eclipse.papyrus.dd.dc.Point#getY <em>Y</em>}'. <!--
* begin-user-doc --> <!-- end-user-doc -->
*
* @return the meta object for the attribute '<em>Y</em>'.
@@ -351,8 +360,7 @@ public interface DCPackage extends EPackage {
EAttribute getPoint_Y();
/**
- * Returns the meta object for class '
- * {@link org.eclipse.papyrus.dd.dc.Dimension <em>Dimension</em>}'. <!--
+ * Returns the meta object for class ' {@link org.eclipse.papyrus.dd.dc.Dimension <em>Dimension</em>}'. <!--
* begin-user-doc --> <!-- end-user-doc -->
*
* @return the meta object for class '<em>Dimension</em>'.
@@ -364,6 +372,7 @@ public interface DCPackage extends EPackage {
/**
* Returns the meta object for the attribute '{@link org.eclipse.papyrus.dd.dc.Dimension#getWidth <em>Width</em>}'.
* <!-- begin-user-doc --> <!-- end-user-doc -->
+ *
* @return the meta object for the attribute '<em>Width</em>'.
* @see org.eclipse.papyrus.dd.dc.Dimension#getWidth()
* @see #getDimension()
@@ -374,6 +383,7 @@ public interface DCPackage extends EPackage {
/**
* Returns the meta object for the attribute '{@link org.eclipse.papyrus.dd.dc.Dimension#getHeight <em>Height</em>}'.
* <!-- begin-user-doc --> <!-- end-user-doc -->
+ *
* @return the meta object for the attribute '<em>Height</em>'.
* @see org.eclipse.papyrus.dd.dc.Dimension#getHeight()
* @see #getDimension()
@@ -382,9 +392,12 @@ 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) <em>Non Negative Width</em>}' operation.
+ * 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 -->
+ *
* @return the meta object for the '<em>Non Negative Width</em>' operation.
* @see org.eclipse.papyrus.dd.dc.Dimension#nonNegativeWidth(org.eclipse.emf.common.util.DiagnosticChain, java.util.Map)
* @generated
@@ -392,9 +405,12 @@ 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) <em>Non Negative Height</em>}' operation.
+ * Returns the meta object for the '
+ * {@link org.eclipse.papyrus.dd.dc.Dimension#nonNegativeHeight(org.eclipse.emf.common.util.DiagnosticChain, java.util.Map)
+ * <em>Non Negative Height</em>}' operation.
* <!-- begin-user-doc --> <!--
* end-user-doc -->
+ *
* @return the meta object for the '<em>Non Negative Height</em>' operation.
* @see org.eclipse.papyrus.dd.dc.Dimension#nonNegativeHeight(org.eclipse.emf.common.util.DiagnosticChain, java.util.Map)
* @generated
@@ -402,8 +418,7 @@ public interface DCPackage extends EPackage {
EOperation getDimension__NonNegativeHeight__DiagnosticChain_Map();
/**
- * Returns the meta object for class '
- * {@link org.eclipse.papyrus.dd.dc.Bounds <em>Bounds</em>}'. <!--
+ * Returns the meta object for class ' {@link org.eclipse.papyrus.dd.dc.Bounds <em>Bounds</em>}'. <!--
* begin-user-doc --> <!-- end-user-doc -->
*
* @return the meta object for class '<em>Bounds</em>'.
@@ -413,8 +428,7 @@ public interface DCPackage extends EPackage {
EClass getBounds();
/**
- * Returns the meta object for the attribute '
- * {@link org.eclipse.papyrus.dd.dc.Bounds#getX <em>X</em>}'. <!--
+ * Returns the meta object for the attribute ' {@link org.eclipse.papyrus.dd.dc.Bounds#getX <em>X</em>}'. <!--
* begin-user-doc --> <!-- end-user-doc -->
*
* @return the meta object for the attribute '<em>X</em>'.
@@ -425,8 +439,7 @@ public interface DCPackage extends EPackage {
EAttribute getBounds_X();
/**
- * Returns the meta object for the attribute '
- * {@link org.eclipse.papyrus.dd.dc.Bounds#getY <em>Y</em>}'. <!--
+ * Returns the meta object for the attribute ' {@link org.eclipse.papyrus.dd.dc.Bounds#getY <em>Y</em>}'. <!--
* begin-user-doc --> <!-- end-user-doc -->
*
* @return the meta object for the attribute '<em>Y</em>'.
@@ -437,8 +450,7 @@ public interface DCPackage extends EPackage {
EAttribute getBounds_Y();
/**
- * Returns the meta object for the attribute '
- * {@link org.eclipse.papyrus.dd.dc.Bounds#getWidth <em>Width</em>}'. <!--
+ * Returns the meta object for the attribute ' {@link org.eclipse.papyrus.dd.dc.Bounds#getWidth <em>Width</em>}'. <!--
* begin-user-doc --> <!-- end-user-doc -->
*
* @return the meta object for the attribute '<em>Width</em>'.
@@ -449,8 +461,7 @@ public interface DCPackage extends EPackage {
EAttribute getBounds_Width();
/**
- * Returns the meta object for the attribute '
- * {@link org.eclipse.papyrus.dd.dc.Bounds#getHeight <em>Height</em>}'. <!--
+ * Returns the meta object for the attribute ' {@link org.eclipse.papyrus.dd.dc.Bounds#getHeight <em>Height</em>}'. <!--
* begin-user-doc --> <!-- end-user-doc -->
*
* @return the meta object for the attribute '<em>Height</em>'.
@@ -461,9 +472,12 @@ 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) <em>Non Negative Width</em>}' operation.
+ * 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 -->
+ *
* @return the meta object for the '<em>Non Negative Width</em>' operation.
* @see org.eclipse.papyrus.dd.dc.Bounds#nonNegativeWidth(org.eclipse.emf.common.util.DiagnosticChain, java.util.Map)
* @generated
@@ -471,9 +485,12 @@ 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) <em>Non Negative Height</em>}' operation.
+ * Returns the meta object for the '
+ * {@link org.eclipse.papyrus.dd.dc.Bounds#nonNegativeHeight(org.eclipse.emf.common.util.DiagnosticChain, java.util.Map)
+ * <em>Non Negative Height</em>}' operation.
* <!-- begin-user-doc --> <!--
* end-user-doc -->
+ *
* @return the meta object for the '<em>Non Negative Height</em>' operation.
* @see org.eclipse.papyrus.dd.dc.Bounds#nonNegativeHeight(org.eclipse.emf.common.util.DiagnosticChain, java.util.Map)
* @generated
@@ -481,8 +498,7 @@ public interface DCPackage extends EPackage {
EOperation getBounds__NonNegativeHeight__DiagnosticChain_Map();
/**
- * Returns the meta object for enum '
- * {@link org.eclipse.papyrus.dd.dc.KnownColor <em>Known Color</em>}'. <!--
+ * Returns the meta object for enum ' {@link org.eclipse.papyrus.dd.dc.KnownColor <em>Known Color</em>}'. <!--
* begin-user-doc --> <!-- end-user-doc -->
*
* @return the meta object for enum '<em>Known Color</em>'.
@@ -524,6 +540,7 @@ public interface DCPackage extends EPackage {
/**
* Returns the meta object for data type '{@link java.lang.String <em>String</em>}'.
* <!-- begin-user-doc --> <!-- end-user-doc -->
+ *
* @return the meta object for data type '<em>String</em>'.
* @see java.lang.String
* @model instanceClass="java.lang.String"
@@ -534,6 +551,7 @@ public interface DCPackage extends EPackage {
/**
* Returns the meta object for data type '{@link java.awt.Color <em>Color</em>}'.
* <!-- begin-user-doc --> <!-- end-user-doc -->
+ *
* @return the meta object for data type '<em>Color</em>'.
* @see java.awt.Color
* @model instanceClass="java.awt.Color"
@@ -561,6 +579,7 @@ public interface DCPackage extends EPackage {
* <li>and each data type</li>
* </ul>
* <!-- end-user-doc -->
+ *
* @generated
*/
interface Literals {
@@ -568,6 +587,7 @@ public interface DCPackage extends EPackage {
/**
* The meta object literal for the '{@link org.eclipse.papyrus.dd.dc.impl.PointImpl <em>Point</em>}' class.
* <!-- begin-user-doc --> <!-- end-user-doc -->
+ *
* @see org.eclipse.papyrus.dd.dc.impl.PointImpl
* @see org.eclipse.papyrus.dd.dc.impl.DCPackageImpl#getPoint()
* @generated
@@ -577,6 +597,7 @@ public interface DCPackage extends EPackage {
/**
* The meta object literal for the '<em><b>X</b></em>' attribute feature.
* <!-- begin-user-doc --> <!-- end-user-doc -->
+ *
* @generated
*/
EAttribute POINT__X = eINSTANCE.getPoint_X();
@@ -584,13 +605,13 @@ public interface DCPackage extends EPackage {
/**
* The meta object literal for the '<em><b>Y</b></em>' attribute feature.
* <!-- begin-user-doc --> <!-- end-user-doc -->
+ *
* @generated
*/
EAttribute POINT__Y = eINSTANCE.getPoint_Y();
/**
- * The meta object literal for the '
- * {@link org.eclipse.papyrus.dd.dc.impl.DimensionImpl
+ * The meta object literal for the ' {@link org.eclipse.papyrus.dd.dc.impl.DimensionImpl
* <em>Dimension</em>}' class. <!-- begin-user-doc --> <!-- end-user-doc
* -->
*
@@ -603,6 +624,7 @@ public interface DCPackage extends EPackage {
/**
* The meta object literal for the '<em><b>Width</b></em>' attribute feature.
* <!-- begin-user-doc --> <!-- end-user-doc -->
+ *
* @generated
*/
EAttribute DIMENSION__WIDTH = eINSTANCE.getDimension_Width();
@@ -610,6 +632,7 @@ public interface DCPackage extends EPackage {
/**
* The meta object literal for the '<em><b>Height</b></em>' attribute feature.
* <!-- begin-user-doc --> <!-- end-user-doc -->
+ *
* @generated
*/
EAttribute DIMENSION__HEIGHT = eINSTANCE.getDimension_Height();
@@ -617,6 +640,7 @@ public interface DCPackage extends EPackage {
/**
* The meta object literal for the '<em><b>Non Negative Width</b></em>' operation.
* <!-- begin-user-doc --> <!-- end-user-doc -->
+ *
* @generated
*/
EOperation DIMENSION___NON_NEGATIVE_WIDTH__DIAGNOSTICCHAIN_MAP = eINSTANCE.getDimension__NonNegativeWidth__DiagnosticChain_Map();
@@ -624,6 +648,7 @@ public interface DCPackage extends EPackage {
/**
* The meta object literal for the '<em><b>Non Negative Height</b></em>' operation.
* <!-- begin-user-doc --> <!-- end-user-doc -->
+ *
* @generated
*/
EOperation DIMENSION___NON_NEGATIVE_HEIGHT__DIAGNOSTICCHAIN_MAP = eINSTANCE.getDimension__NonNegativeHeight__DiagnosticChain_Map();
@@ -631,6 +656,7 @@ public interface DCPackage extends EPackage {
/**
* The meta object literal for the '{@link org.eclipse.papyrus.dd.dc.impl.BoundsImpl <em>Bounds</em>}' class.
* <!-- begin-user-doc --> <!-- end-user-doc -->
+ *
* @see org.eclipse.papyrus.dd.dc.impl.BoundsImpl
* @see org.eclipse.papyrus.dd.dc.impl.DCPackageImpl#getBounds()
* @generated
@@ -640,6 +666,7 @@ public interface DCPackage extends EPackage {
/**
* The meta object literal for the '<em><b>X</b></em>' attribute feature.
* <!-- begin-user-doc --> <!-- end-user-doc -->
+ *
* @generated
*/
EAttribute BOUNDS__X = eINSTANCE.getBounds_X();
@@ -647,6 +674,7 @@ public interface DCPackage extends EPackage {
/**
* The meta object literal for the '<em><b>Y</b></em>' attribute feature.
* <!-- begin-user-doc --> <!-- end-user-doc -->
+ *
* @generated
*/
EAttribute BOUNDS__Y = eINSTANCE.getBounds_Y();
@@ -654,6 +682,7 @@ public interface DCPackage extends EPackage {
/**
* The meta object literal for the '<em><b>Width</b></em>' attribute feature.
* <!-- begin-user-doc --> <!-- end-user-doc -->
+ *
* @generated
*/
EAttribute BOUNDS__WIDTH = eINSTANCE.getBounds_Width();
@@ -661,6 +690,7 @@ public interface DCPackage extends EPackage {
/**
* The meta object literal for the '<em><b>Height</b></em>' attribute feature.
* <!-- begin-user-doc --> <!-- end-user-doc -->
+ *
* @generated
*/
EAttribute BOUNDS__HEIGHT = eINSTANCE.getBounds_Height();
@@ -668,6 +698,7 @@ public interface DCPackage extends EPackage {
/**
* The meta object literal for the '<em><b>Non Negative Width</b></em>' operation.
* <!-- begin-user-doc --> <!-- end-user-doc -->
+ *
* @generated
*/
EOperation BOUNDS___NON_NEGATIVE_WIDTH__DIAGNOSTICCHAIN_MAP = eINSTANCE.getBounds__NonNegativeWidth__DiagnosticChain_Map();
@@ -675,6 +706,7 @@ public interface DCPackage extends EPackage {
/**
* The meta object literal for the '<em><b>Non Negative Height</b></em>' operation.
* <!-- begin-user-doc --> <!-- end-user-doc -->
+ *
* @generated
*/
EOperation BOUNDS___NON_NEGATIVE_HEIGHT__DIAGNOSTICCHAIN_MAP = eINSTANCE.getBounds__NonNegativeHeight__DiagnosticChain_Map();
@@ -682,6 +714,7 @@ public interface DCPackage extends EPackage {
/**
* The meta object literal for the '{@link org.eclipse.papyrus.dd.dc.KnownColor <em>Known Color</em>}' enum.
* <!-- begin-user-doc --> <!-- end-user-doc -->
+ *
* @see org.eclipse.papyrus.dd.dc.KnownColor
* @see org.eclipse.papyrus.dd.dc.impl.DCPackageImpl#getKnownColor()
* @generated
@@ -734,7 +767,5 @@ public interface DCPackage extends EPackage {
* @generated
*/
EDataType COLOR = eINSTANCE.getColor();
-
}
-
} // DCPackage
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 72a9012..8c9fbc4 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
@@ -18,21 +18,20 @@ import org.eclipse.emf.common.util.DiagnosticChain;
import org.eclipse.emf.ecore.EObject;
/**
- * <!-- begin-user-doc --> A representation of the model object '
- * <em><b>Dimension</b></em>'. <!-- end-user-doc -->
- *
+ * <!-- begin-user-doc --> A representation of the model object ' <em><b>Dimension</b></em>'. <!-- end-user-doc -->
+ *
* <!-- begin-model-doc -->
* Dimension specifies two lengths (width and height) along the x and y axes in some x-y coordinate system.
* <!-- end-model-doc -->
- *
+ *
* <p>
* The following features are supported:
* <ul>
- * <li>{@link org.eclipse.papyrus.dd.dc.Dimension#getWidth <em>Width</em>}</li>
- * <li>{@link org.eclipse.papyrus.dd.dc.Dimension#getHeight <em>Height</em>}</li>
+ * <li>{@link org.eclipse.papyrus.dd.dc.Dimension#getWidth <em>Width</em>}</li>
+ * <li>{@link org.eclipse.papyrus.dd.dc.Dimension#getHeight <em>Height</em>}</li>
* </ul>
* </p>
- *
+ *
* @see org.eclipse.papyrus.dd.dc.DCPackage#getDimension()
* @model
* @generated
@@ -57,7 +56,9 @@ public interface Dimension extends EObject {
/**
* Sets the value of the '{@link org.eclipse.papyrus.dd.dc.Dimension#getWidth <em>Width</em>}' attribute.
* <!-- begin-user-doc --> <!-- end-user-doc -->
- * @param value the new value of the '<em>Width</em>' attribute.
+ *
+ * @param value
+ * the new value of the '<em>Width</em>' attribute.
* @see #isSetWidth()
* @see #unsetWidth()
* @see #getWidth()
@@ -68,6 +69,7 @@ public interface Dimension extends EObject {
/**
* Unsets the value of the '{@link org.eclipse.papyrus.dd.dc.Dimension#getWidth <em>Width</em>}' attribute.
* <!-- begin-user-doc --> <!-- end-user-doc -->
+ *
* @see #isSetWidth()
* @see #getWidth()
* @see #setWidth(double)
@@ -78,6 +80,7 @@ public interface Dimension extends EObject {
/**
* Returns whether the value of the '{@link org.eclipse.papyrus.dd.dc.Dimension#getWidth <em>Width</em>}' attribute is set.
* <!-- begin-user-doc --> <!-- end-user-doc -->
+ *
* @return whether the value of the '<em>Width</em>' attribute is set.
* @see #unsetWidth()
* @see #getWidth()
@@ -104,7 +107,9 @@ public interface Dimension extends EObject {
/**
* Sets the value of the '{@link org.eclipse.papyrus.dd.dc.Dimension#getHeight <em>Height</em>}' attribute.
* <!-- begin-user-doc --> <!-- end-user-doc -->
- * @param value the new value of the '<em>Height</em>' attribute.
+ *
+ * @param value
+ * the new value of the '<em>Height</em>' attribute.
* @see #isSetHeight()
* @see #unsetHeight()
* @see #getHeight()
@@ -115,6 +120,7 @@ public interface Dimension extends EObject {
/**
* Unsets the value of the '{@link org.eclipse.papyrus.dd.dc.Dimension#getHeight <em>Height</em>}' attribute.
* <!-- begin-user-doc --> <!-- end-user-doc -->
+ *
* @see #isSetHeight()
* @see #getHeight()
* @see #setHeight(double)
@@ -125,6 +131,7 @@ public interface Dimension extends EObject {
/**
* Returns whether the value of the '{@link org.eclipse.papyrus.dd.dc.Dimension#getHeight <em>Height</em>}' attribute is set.
* <!-- begin-user-doc --> <!-- end-user-doc -->
+ *
* @return whether the value of the '<em>Height</em>' attribute is set.
* @see #unsetHeight()
* @see #getHeight()
@@ -138,31 +145,28 @@ 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
- * -->
- * @model
+ * The cache of context-specific information. <!-- end-model-doc
+ * -->
+ * @model
* annotation="http://www.eclipse.org/emf/2002/Ecore/OCL body='width >=0'"
* @generated
*/
- boolean nonNegativeWidth(DiagnosticChain diagnostics,
- Map<Object, Object> context);
+ boolean nonNegativeWidth(DiagnosticChain diagnostics, Map<Object, Object> context);
/**
* <!-- begin-user-doc --> <!-- end-user-doc --> <!-- begin-model-doc -->
* 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
- * -->
- * @model
+ * The cache of context-specific information. <!-- end-model-doc
+ * -->
+ * @model
* annotation="http://www.eclipse.org/emf/2002/Ecore/OCL body='height >=0'"
* @generated
*/
- boolean nonNegativeHeight(DiagnosticChain diagnostics,
- Map<Object, Object> context);
-
+ boolean nonNegativeHeight(DiagnosticChain diagnostics, Map<Object, Object> context);
} // Dimension
diff --git a/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dc/KnownColor.java b/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dc/KnownColor.java
index b08e6b7..242470a 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
@@ -18,8 +18,8 @@ import java.util.List;
import org.eclipse.emf.common.util.Enumerator;
/**
- * <!-- begin-user-doc --> A representation of the literals of the enumeration '
- * <em><b>Known Color</b></em>', and utility methods for working with them. <!--
+ * <!-- begin-user-doc --> A representation of the literals of the enumeration ' <em><b>Known Color</b></em>', and utility methods for working with
+ * them. <!--
* end-user-doc --> <!-- begin-model-doc --> KnownColor is an enumeration of 17
* known colors. <!-- end-model-doc -->
*
@@ -32,166 +32,167 @@ public enum KnownColor implements Enumerator {
* The '<em><b>Maroon</b></em>' literal object.
* <!-- begin-user-doc --> <!--
* end-user-doc -->
+ *
* @see #MAROON_VALUE
* @generated
* @ordered
*/
MAROON(0, "maroon", "#800000"),
-
/**
* The '<em><b>Red</b></em>' literal object.
* <!-- begin-user-doc --> <!--
* end-user-doc -->
+ *
* @see #RED_VALUE
* @generated
* @ordered
*/
RED(1, "red", "#FF0000"),
-
/**
* The '<em><b>Orange</b></em>' literal object.
* <!-- begin-user-doc --> <!--
* end-user-doc -->
+ *
* @see #ORANGE_VALUE
* @generated
* @ordered
*/
ORANGE(2, "orange", "#FFA500"),
-
/**
* The '<em><b>Yellow</b></em>' literal object.
* <!-- begin-user-doc --> <!--
* end-user-doc -->
+ *
* @see #YELLOW_VALUE
* @generated
* @ordered
*/
YELLOW(3, "yellow", "#FFFF00"),
-
/**
* The '<em><b>Olive</b></em>' literal object.
* <!-- begin-user-doc --> <!--
* end-user-doc -->
+ *
* @see #OLIVE_VALUE
* @generated
* @ordered
*/
OLIVE(4, "olive", "#808000"),
-
/**
* The '<em><b>Purple</b></em>' literal object.
* <!-- begin-user-doc --> <!--
* end-user-doc -->
+ *
* @see #PURPLE_VALUE
* @generated
* @ordered
*/
PURPLE(5, "purple", "#800080"),
-
/**
* The '<em><b>Fuchsia</b></em>' literal object.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
+ *
* @see #FUCHSIA_VALUE
* @generated
* @ordered
*/
FUCHSIA(6, "fuchsia", "#FF00FF"),
-
/**
* The '<em><b>White</b></em>' literal object.
* <!-- begin-user-doc --> <!--
* end-user-doc -->
+ *
* @see #WHITE_VALUE
* @generated
* @ordered
*/
WHITE(7, "white", "#FFFFFF"),
-
/**
* The '<em><b>Lime</b></em>' literal object.
* <!-- begin-user-doc --> <!--
* end-user-doc -->
+ *
* @see #LIME_VALUE
* @generated
* @ordered
*/
LIME(8, "lime", "#00FF00"),
-
/**
* The '<em><b>Green</b></em>' literal object.
* <!-- begin-user-doc --> <!--
* end-user-doc -->
+ *
* @see #GREEN_VALUE
* @generated
* @ordered
*/
GREEN(9, "green", "#008000"),
-
/**
* The '<em><b>Navy</b></em>' literal object.
* <!-- begin-user-doc --> <!--
* end-user-doc -->
+ *
* @see #NAVY_VALUE
* @generated
* @ordered
*/
NAVY(10, "navy", "#000080"),
-
/**
* The '<em><b>Blue</b></em>' literal object.
* <!-- begin-user-doc --> <!--
* end-user-doc -->
+ *
* @see #BLUE_VALUE
* @generated
* @ordered
*/
BLUE(11, "blue", "#0000FF"),
-
/**
* The '<em><b>Aqua</b></em>' literal object.
* <!-- begin-user-doc --> <!--
* end-user-doc -->
+ *
* @see #AQUA_VALUE
* @generated
* @ordered
*/
AQUA(12, "aqua", "#00FFFF"),
-
/**
* The '<em><b>Teal</b></em>' literal object.
* <!-- begin-user-doc --> <!--
* end-user-doc -->
+ *
* @see #TEAL_VALUE
* @generated
* @ordered
*/
TEAL(13, "teal", "#008080"),
-
/**
* The '<em><b>Black</b></em>' literal object.
* <!-- begin-user-doc --> <!--
* end-user-doc -->
+ *
* @see #BLACK_VALUE
* @generated
* @ordered
*/
BLACK(14, "black", "#000000"),
-
/**
* The '<em><b>Silver</b></em>' literal object.
* <!-- begin-user-doc --> <!--
* end-user-doc -->
+ *
* @see #SILVER_VALUE
* @generated
* @ordered
*/
SILVER(15, "silver", "#C0C0C0"),
-
/**
* The '<em><b>Gray</b></em>' literal object.
* <!-- begin-user-doc --> <!--
* end-user-doc -->
+ *
* @see #GRAY_VALUE
* @generated
* @ordered
@@ -408,29 +409,12 @@ 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.
* <!-- begin-user-doc --> <!-- end-user-doc -->
+ *
* @generated
*/
public static final List<KnownColor> VALUES = Collections.unmodifiableList(Arrays.asList(VALUES_ARRAY));
@@ -438,12 +422,13 @@ public enum KnownColor implements Enumerator {
/**
* Returns the '<em><b>Known Color</b></em>' literal with the specified literal value.
* <!-- begin-user-doc --> <!-- end-user-doc -->
+ *
* @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;
}
}
@@ -453,12 +438,13 @@ public enum KnownColor implements Enumerator {
/**
* Returns the '<em><b>Known Color</b></em>' literal with the specified name.
* <!-- begin-user-doc --> <!-- end-user-doc -->
+ *
* @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;
}
}
@@ -468,45 +454,66 @@ public enum KnownColor implements Enumerator {
/**
* Returns the '<em><b>Known Color</b></em>' literal with the specified integer value.
* <!-- begin-user-doc --> <!-- end-user-doc -->
+ *
* @generated
*/
public static KnownColor get(int value) {
- switch (value) {
- case MAROON_VALUE: return MAROON;
- case RED_VALUE: return RED;
- case ORANGE_VALUE: return ORANGE;
- case YELLOW_VALUE: return YELLOW;
- case OLIVE_VALUE: return OLIVE;
- case PURPLE_VALUE: return PURPLE;
- case FUCHSIA_VALUE: return FUCHSIA;
- case WHITE_VALUE: return WHITE;
- case LIME_VALUE: return LIME;
- case GREEN_VALUE: return GREEN;
- case NAVY_VALUE: return NAVY;
- case BLUE_VALUE: return BLUE;
- case AQUA_VALUE: return AQUA;
- case TEAL_VALUE: return TEAL;
- case BLACK_VALUE: return BLACK;
- case SILVER_VALUE: return SILVER;
- case GRAY_VALUE: return GRAY;
+ switch(value) {
+ case MAROON_VALUE:
+ return MAROON;
+ case RED_VALUE:
+ return RED;
+ case ORANGE_VALUE:
+ return ORANGE;
+ case YELLOW_VALUE:
+ return YELLOW;
+ case OLIVE_VALUE:
+ return OLIVE;
+ case PURPLE_VALUE:
+ return PURPLE;
+ case FUCHSIA_VALUE:
+ return FUCHSIA;
+ case WHITE_VALUE:
+ return WHITE;
+ case LIME_VALUE:
+ return LIME;
+ case GREEN_VALUE:
+ return GREEN;
+ case NAVY_VALUE:
+ return NAVY;
+ case BLUE_VALUE:
+ return BLUE;
+ case AQUA_VALUE:
+ return AQUA;
+ case TEAL_VALUE:
+ return TEAL;
+ case BLACK_VALUE:
+ return BLACK;
+ case SILVER_VALUE:
+ return SILVER;
+ case GRAY_VALUE:
+ return GRAY;
}
return null;
}
/**
* <!-- begin-user-doc --> <!-- end-user-doc -->
+ *
* @generated
*/
private final int value;
/**
* <!-- begin-user-doc --> <!-- end-user-doc -->
+ *
* @generated
*/
private final String name;
/**
* <!-- begin-user-doc --> <!-- end-user-doc -->
+ *
* @generated
*/
private final String literal;
@@ -515,6 +522,7 @@ public enum KnownColor implements Enumerator {
* Only this class can construct instances.
* <!-- begin-user-doc --> <!--
* end-user-doc -->
+ *
* @generated
*/
private KnownColor(int value, String name, String literal) {
@@ -525,36 +533,39 @@ public enum KnownColor implements Enumerator {
/**
* <!-- begin-user-doc --> <!-- end-user-doc -->
+ *
* @generated
*/
public int getValue() {
- return value;
+ return value;
}
/**
* <!-- begin-user-doc --> <!-- end-user-doc -->
+ *
* @generated
*/
public String getName() {
- return name;
+ return name;
}
/**
* <!-- begin-user-doc --> <!-- end-user-doc -->
+ *
* @generated
*/
public String getLiteral() {
- return literal;
+ return literal;
}
/**
* Returns the literal value of the enumerator, which is its string representation.
* <!-- begin-user-doc --> <!-- end-user-doc -->
+ *
* @generated
*/
@Override
public String toString() {
return literal;
}
-
} // KnownColor
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 1f14eee..8b5162a 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
@@ -14,21 +14,20 @@ package org.eclipse.papyrus.dd.dc;
import org.eclipse.emf.ecore.EObject;
/**
- * <!-- begin-user-doc --> A representation of the model object '
- * <em><b>Point</b></em>'. <!-- end-user-doc -->
- *
+ * <!-- begin-user-doc --> A representation of the model object ' <em><b>Point</b></em>'. <!-- end-user-doc -->
+ *
* <!-- begin-model-doc -->
* A Point specifies an location in some x-y coordinate system.
* <!-- end-model-doc -->
- *
+ *
* <p>
* The following features are supported:
* <ul>
- * <li>{@link org.eclipse.papyrus.dd.dc.Point#getX <em>X</em>}</li>
- * <li>{@link org.eclipse.papyrus.dd.dc.Point#getY <em>Y</em>}</li>
+ * <li>{@link org.eclipse.papyrus.dd.dc.Point#getX <em>X</em>}</li>
+ * <li>{@link org.eclipse.papyrus.dd.dc.Point#getY <em>Y</em>}</li>
* </ul>
* </p>
- *
+ *
* @see org.eclipse.papyrus.dd.dc.DCPackage#getPoint()
* @model
* @generated
@@ -53,7 +52,9 @@ public interface Point extends EObject {
/**
* Sets the value of the '{@link org.eclipse.papyrus.dd.dc.Point#getX <em>X</em>}' attribute.
* <!-- begin-user-doc --> <!-- end-user-doc -->
- * @param value the new value of the '<em>X</em>' attribute.
+ *
+ * @param value
+ * the new value of the '<em>X</em>' attribute.
* @see #isSetX()
* @see #unsetX()
* @see #getX()
@@ -64,6 +65,7 @@ public interface Point extends EObject {
/**
* Unsets the value of the '{@link org.eclipse.papyrus.dd.dc.Point#getX <em>X</em>}' attribute.
* <!-- begin-user-doc --> <!-- end-user-doc -->
+ *
* @see #isSetX()
* @see #getX()
* @see #setX(double)
@@ -74,6 +76,7 @@ public interface Point extends EObject {
/**
* Returns whether the value of the '{@link org.eclipse.papyrus.dd.dc.Point#getX <em>X</em>}' attribute is set.
* <!-- begin-user-doc --> <!-- end-user-doc -->
+ *
* @return whether the value of the '<em>X</em>' attribute is set.
* @see #unsetX()
* @see #getX()
@@ -100,7 +103,9 @@ public interface Point extends EObject {
/**
* Sets the value of the '{@link org.eclipse.papyrus.dd.dc.Point#getY <em>Y</em>}' attribute.
* <!-- begin-user-doc --> <!-- end-user-doc -->
- * @param value the new value of the '<em>Y</em>' attribute.
+ *
+ * @param value
+ * the new value of the '<em>Y</em>' attribute.
* @see #isSetY()
* @see #unsetY()
* @see #getY()
@@ -111,6 +116,7 @@ public interface Point extends EObject {
/**
* Unsets the value of the '{@link org.eclipse.papyrus.dd.dc.Point#getY <em>Y</em>}' attribute.
* <!-- begin-user-doc --> <!-- end-user-doc -->
+ *
* @see #isSetY()
* @see #getY()
* @see #setY(double)
@@ -121,6 +127,7 @@ public interface Point extends EObject {
/**
* Returns whether the value of the '{@link org.eclipse.papyrus.dd.dc.Point#getY <em>Y</em>}' attribute is set.
* <!-- begin-user-doc --> <!-- end-user-doc -->
+ *
* @return whether the value of the '<em>Y</em>' attribute is set.
* @see #unsetY()
* @see #getY()
@@ -128,5 +135,4 @@ public interface Point extends EObject {
* @generated
*/
boolean isSetY();
-
} // Point
diff --git a/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dc/impl/BoundsImpl.java b/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dc/impl/BoundsImpl.java
index e782b93..4fd90b7 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
@@ -32,18 +32,17 @@ import org.eclipse.papyrus.dd.dc.DCPackage;
import org.eclipse.papyrus.dd.dc.util.DCValidator;
/**
- * <!-- begin-user-doc --> An implementation of the model object '
- * <em><b>Bounds</b></em>'. <!-- end-user-doc -->
+ * <!-- begin-user-doc --> An implementation of the model object ' <em><b>Bounds</b></em>'. <!-- end-user-doc -->
* <p>
* The following features are implemented:
* <ul>
- * <li>{@link org.eclipse.papyrus.dd.dc.impl.BoundsImpl#getX <em>X</em>}</li>
- * <li>{@link org.eclipse.papyrus.dd.dc.impl.BoundsImpl#getY <em>Y</em>}</li>
- * <li>{@link org.eclipse.papyrus.dd.dc.impl.BoundsImpl#getWidth <em>Width</em>}</li>
- * <li>{@link org.eclipse.papyrus.dd.dc.impl.BoundsImpl#getHeight <em>Height</em>}</li>
+ * <li>{@link org.eclipse.papyrus.dd.dc.impl.BoundsImpl#getX <em>X</em>}</li>
+ * <li>{@link org.eclipse.papyrus.dd.dc.impl.BoundsImpl#getY <em>Y</em>}</li>
+ * <li>{@link org.eclipse.papyrus.dd.dc.impl.BoundsImpl#getWidth <em>Width</em>}</li>
+ * <li>{@link org.eclipse.papyrus.dd.dc.impl.BoundsImpl#getHeight <em>Height</em>}</li>
* </ul>
* </p>
- *
+ *
* @generated
*/
public class BoundsImpl extends MinimalEObjectImpl.Container implements Bounds {
@@ -72,6 +71,7 @@ public class BoundsImpl extends MinimalEObjectImpl.Container implements Bounds {
* This is true if the X attribute has been set.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
+ *
* @generated
* @ordered
*/
@@ -101,6 +101,7 @@ public class BoundsImpl extends MinimalEObjectImpl.Container implements Bounds {
* This is true if the Y attribute has been set.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
+ *
* @generated
* @ordered
*/
@@ -109,6 +110,7 @@ public class BoundsImpl extends MinimalEObjectImpl.Container implements Bounds {
/**
* The default value of the '{@link #getWidth() <em>Width</em>}' attribute.
* <!-- begin-user-doc --> <!-- end-user-doc -->
+ *
* @see #getWidth()
* @generated
* @ordered
@@ -118,6 +120,7 @@ public class BoundsImpl extends MinimalEObjectImpl.Container implements Bounds {
/**
* The cached value of the '{@link #getWidth() <em>Width</em>}' attribute.
* <!-- begin-user-doc --> <!-- end-user-doc -->
+ *
* @see #getWidth()
* @generated
* @ordered
@@ -128,6 +131,7 @@ public class BoundsImpl extends MinimalEObjectImpl.Container implements Bounds {
* This is true if the Width attribute has been set.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
+ *
* @generated
* @ordered
*/
@@ -136,6 +140,7 @@ public class BoundsImpl extends MinimalEObjectImpl.Container implements Bounds {
/**
* The default value of the '{@link #getHeight() <em>Height</em>}' attribute.
* <!-- begin-user-doc --> <!-- end-user-doc -->
+ *
* @see #getHeight()
* @generated
* @ordered
@@ -145,6 +150,7 @@ public class BoundsImpl extends MinimalEObjectImpl.Container implements Bounds {
/**
* The cached value of the '{@link #getHeight() <em>Height</em>}' attribute.
* <!-- begin-user-doc --> <!-- end-user-doc -->
+ *
* @see #getHeight()
* @generated
* @ordered
@@ -155,6 +161,7 @@ public class BoundsImpl extends MinimalEObjectImpl.Container implements Bounds {
* This is true if the Height attribute has been set.
* <!-- begin-user-doc
* --> <!-- end-user-doc -->
+ *
* @generated
* @ordered
*/
@@ -162,6 +169,7 @@ public class BoundsImpl extends MinimalEObjectImpl.Container implements Bounds {
/**
* <!-- begin-user-doc --> <!-- end-user-doc -->
+ *
* @generated
*/
protected BoundsImpl() {
@@ -170,6 +178,7 @@ public class BoundsImpl extends MinimalEObjectImpl.Container implements Bounds {
/**
* <!-- begin-user-doc --> <!-- end-user-doc -->
+ *
* @generated
*/
@Override
@@ -179,6 +188,7 @@ public class BoundsImpl extends MinimalEObjectImpl.Container implements Bounds {
/**
* <!-- begin-user-doc --> <!-- end-user-doc -->
+ *
* @generated
*/
public double getX() {
@@ -187,6 +197,7 @@ public class BoundsImpl extends MinimalEObjectImpl.Container implements Bounds {
/**
* <!-- begin-user-doc --> <!-- end-user-doc -->
+ *
* @generated
*/
public void setX(double newX) {
@@ -194,12 +205,13 @@ 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));
}
/**
* <!-- begin-user-doc --> <!-- end-user-doc -->
+ *
* @generated
*/
public void unsetX() {
@@ -207,12 +219,13 @@ 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));
}
/**
* <!-- begin-user-doc --> <!-- end-user-doc -->
+ *
* @generated
*/
public boolean isSetX() {
@@ -221,6 +234,7 @@ public class BoundsImpl extends MinimalEObjectImpl.Container implements Bounds {
/**
* <!-- begin-user-doc --> <!-- end-user-doc -->
+ *
* @generated
*/
public double getY() {
@@ -229,6 +243,7 @@ public class BoundsImpl extends MinimalEObjectImpl.Container implements Bounds {
/**
* <!-- begin-user-doc --> <!-- end-user-doc -->
+ *
* @generated
*/
public void setY(double newY) {
@@ -236,12 +251,13 @@ 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));
}
/**
* <!-- begin-user-doc --> <!-- end-user-doc -->
+ *
* @generated
*/
public void unsetY() {
@@ -249,12 +265,13 @@ 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));
}
/**
* <!-- begin-user-doc --> <!-- end-user-doc -->
+ *
* @generated
*/
public boolean isSetY() {
@@ -263,6 +280,7 @@ public class BoundsImpl extends MinimalEObjectImpl.Container implements Bounds {
/**
* <!-- begin-user-doc --> <!-- end-user-doc -->
+ *
* @generated
*/
public double getWidth() {
@@ -271,6 +289,7 @@ public class BoundsImpl extends MinimalEObjectImpl.Container implements Bounds {
/**
* <!-- begin-user-doc --> <!-- end-user-doc -->
+ *
* @generated
*/
public void setWidth(double newWidth) {
@@ -278,12 +297,13 @@ 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));
}
/**
* <!-- begin-user-doc --> <!-- end-user-doc -->
+ *
* @generated
*/
public void unsetWidth() {
@@ -291,12 +311,13 @@ 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));
}
/**
* <!-- begin-user-doc --> <!-- end-user-doc -->
+ *
* @generated
*/
public boolean isSetWidth() {
@@ -305,6 +326,7 @@ public class BoundsImpl extends MinimalEObjectImpl.Container implements Bounds {
/**
* <!-- begin-user-doc --> <!-- end-user-doc -->
+ *
* @generated
*/
public double getHeight() {
@@ -313,6 +335,7 @@ public class BoundsImpl extends MinimalEObjectImpl.Container implements Bounds {
/**
* <!-- begin-user-doc --> <!-- end-user-doc -->
+ *
* @generated
*/
public void setHeight(double newHeight) {
@@ -320,12 +343,13 @@ 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));
}
/**
* <!-- begin-user-doc --> <!-- end-user-doc -->
+ *
* @generated
*/
public void unsetHeight() {
@@ -333,12 +357,13 @@ 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));
}
/**
* <!-- begin-user-doc --> <!-- end-user-doc -->
+ *
* @generated
*/
public boolean isSetHeight() {
@@ -346,9 +371,11 @@ public class BoundsImpl extends MinimalEObjectImpl.Container implements Bounds {
}
/**
- * The cached validation expression for the '{@link #nonNegativeWidth(org.eclipse.emf.common.util.DiagnosticChain, java.util.Map) <em>Non Negative Width</em>}' invariant operation.
+ * The cached validation expression for the '{@link #nonNegativeWidth(org.eclipse.emf.common.util.DiagnosticChain, java.util.Map)
+ * <em>Non Negative Width</em>}' invariant operation.
* <!-- begin-user-doc
* --> <!-- end-user-doc -->
+ *
* @see #nonNegativeWidth(org.eclipse.emf.common.util.DiagnosticChain, java.util.Map)
* @generated
* @ordered
@@ -357,28 +384,19 @@ public class BoundsImpl extends MinimalEObjectImpl.Container implements Bounds {
/**
* <!-- begin-user-doc --> <!-- end-user-doc -->
+ *
* @generated
*/
- 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);
+ 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);
}
/**
- * The cached validation expression for the '{@link #nonNegativeHeight(org.eclipse.emf.common.util.DiagnosticChain, java.util.Map) <em>Non Negative Height</em>}' invariant operation.
+ * The cached validation expression for the '{@link #nonNegativeHeight(org.eclipse.emf.common.util.DiagnosticChain, java.util.Map)
+ * <em>Non Negative Height</em>}' invariant operation.
* <!-- begin-user-doc
* --> <!-- end-user-doc -->
+ *
* @see #nonNegativeHeight(org.eclipse.emf.common.util.DiagnosticChain, java.util.Map)
* @generated
* @ordered
@@ -387,144 +405,149 @@ public class BoundsImpl extends MinimalEObjectImpl.Container implements Bounds {
/**
* <!-- begin-user-doc --> <!-- end-user-doc -->
+ *
* @generated
*/
- public boolean nonNegativeHeight(DiagnosticChain diagnostics,
- Map<Object, Object> context) {
- return
- DCValidator.validate
- (DCPackage.Literals.BOUNDS,
- this,
- diagnostics,
- context,
- "http://www.eclipse.org/emf/2002/Ecore/OCL",
- DCPackage.Literals.BOUNDS___NON_NEGATIVE_HEIGHT__DIAGNOSTICCHAIN_MAP,
- NON_NEGATIVE_HEIGHT_DIAGNOSTIC_CHAIN_MAP__EEXPRESSION,
- Diagnostic.ERROR,
- DCValidator.DIAGNOSTIC_SOURCE,
- DCValidator.BOUNDS__NON_NEGATIVE_HEIGHT);
+ 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);
}
/**
* <!-- begin-user-doc --> <!-- end-user-doc -->
+ *
* @generated
*/
@Override
public Object eGet(int featureID, boolean resolve, boolean coreType) {
- switch (featureID) {
- case DCPackage.BOUNDS__X:
- return getX();
- case DCPackage.BOUNDS__Y:
- return getY();
- case DCPackage.BOUNDS__WIDTH:
- return getWidth();
- case DCPackage.BOUNDS__HEIGHT:
- return getHeight();
+ switch(featureID) {
+ case DCPackage.BOUNDS__X:
+ return getX();
+ case DCPackage.BOUNDS__Y:
+ return getY();
+ case DCPackage.BOUNDS__WIDTH:
+ return getWidth();
+ case DCPackage.BOUNDS__HEIGHT:
+ return getHeight();
}
return super.eGet(featureID, resolve, coreType);
}
/**
* <!-- begin-user-doc --> <!-- end-user-doc -->
+ *
* @generated
*/
@Override
public void eSet(int featureID, Object newValue) {
- switch (featureID) {
- case DCPackage.BOUNDS__X:
- setX((Double)newValue);
- return;
- case DCPackage.BOUNDS__Y:
- setY((Double)newValue);
- return;
- case DCPackage.BOUNDS__WIDTH:
- setWidth((Double)newValue);
- return;
- case DCPackage.BOUNDS__HEIGHT:
- setHeight((Double)newValue);
- return;
+ switch(featureID) {
+ case DCPackage.BOUNDS__X:
+ setX((Double)newValue);
+ return;
+ case DCPackage.BOUNDS__Y:
+ setY((Double)newValue);
+ return;
+ case DCPackage.BOUNDS__WIDTH:
+ setWidth((Double)newValue);
+ return;
+ case DCPackage.BOUNDS__HEIGHT:
+ setHeight((Double)newValue);
+ return;
}
super.eSet(featureID, newValue);
}
/**
* <!-- begin-user-doc --> <!-- end-user-doc -->
+ *
* @generated
*/
@Override
public void eUnset(int featureID) {
- switch (featureID) {
- case DCPackage.BOUNDS__X:
- unsetX();
- return;
- case DCPackage.BOUNDS__Y:
- unsetY();
- return;
- case DCPackage.BOUNDS__WIDTH:
- unsetWidth();
- return;
- case DCPackage.BOUNDS__HEIGHT:
- unsetHeight();
- return;
+ switch(featureID) {
+ case DCPackage.BOUNDS__X:
+ unsetX();
+ return;
+ case DCPackage.BOUNDS__Y:
+ unsetY();
+ return;
+ case DCPackage.BOUNDS__WIDTH:
+ unsetWidth();
+ return;
+ case DCPackage.BOUNDS__HEIGHT:
+ unsetHeight();
+ return;
}
super.eUnset(featureID);
}
/**
* <!-- begin-user-doc --> <!-- end-user-doc -->
+ *
* @generated
*/
@Override
public boolean eIsSet(int featureID) {
- switch (featureID) {
- case DCPackage.BOUNDS__X:
- return isSetX();
- case DCPackage.BOUNDS__Y:
- return isSetY();
- case DCPackage.BOUNDS__WIDTH:
- return isSetWidth();
- case DCPackage.BOUNDS__HEIGHT:
- return isSetHeight();
+ switch(featureID) {
+ case DCPackage.BOUNDS__X:
+ return isSetX();
+ case DCPackage.BOUNDS__Y:
+ return isSetY();
+ case DCPackage.BOUNDS__WIDTH:
+ return isSetWidth();
+ case DCPackage.BOUNDS__HEIGHT:
+ return isSetHeight();
}
return super.eIsSet(featureID);
}
/**
* <!-- begin-user-doc --> <!-- end-user-doc -->
+ *
* @generated
*/
@Override
@SuppressWarnings("unchecked")
- public Object eInvoke(int operationID, EList<?> arguments)
- throws InvocationTargetException {
- switch (operationID) {
- case DCPackage.BOUNDS___NON_NEGATIVE_WIDTH__DIAGNOSTICCHAIN_MAP:
- return nonNegativeWidth((DiagnosticChain)arguments.get(0), (Map<Object, Object>)arguments.get(1));
- case DCPackage.BOUNDS___NON_NEGATIVE_HEIGHT__DIAGNOSTICCHAIN_MAP:
- return nonNegativeHeight((DiagnosticChain)arguments.get(0), (Map<Object, Object>)arguments.get(1));
+ public Object eInvoke(int operationID, EList<?> arguments) throws InvocationTargetException {
+ switch(operationID) {
+ case DCPackage.BOUNDS___NON_NEGATIVE_WIDTH__DIAGNOSTICCHAIN_MAP:
+ return nonNegativeWidth((DiagnosticChain)arguments.get(0), (Map<Object, Object>)arguments.get(1));
+ case DCPackage.BOUNDS___NON_NEGATIVE_HEIGHT__DIAGNOSTICCHAIN_MAP:
+ return nonNegativeHeight((DiagnosticChain)arguments.get(0), (Map<Object, Object>)arguments.get(1));
}
return super.eInvoke(operationID, arguments);
}
/**
* <!-- begin-user-doc --> <!-- end-user-doc -->
+ *
* @generated
*/
@Override
public String toString() {
- if (eIsProxy()) return super.toString();
-
+ if(eIsProxy())
+ return super.toString();
StringBuffer result = new StringBuffer(super.toString());
result.append(" (x: ");
- if (xESet) result.append(x); else result.append("<unset>");
+ if(xESet)
+ result.append(x);
+ else
+ result.append("<unset>");
result.append(", y: ");
- if (yESet) result.append(y); else result.append("<unset>");
+ if(yESet)
+ result.append(y);
+ else
+ result.append("<unset>");
result.append(", width: ");
- if (widthESet) result.append(width); else result.append("<unset>");
+ if(widthESet)
+ result.append(width);
+ else
+ result.append("<unset>");
result.append(", height: ");
- if (heightESet) result.append(height); else result.append("<unset>");
+ if(heightESet)
+ result.append(height);
+ else
+ result.append("<unset>");
result.append(')');
return result.toString();
}
-
} // BoundsImpl
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 f956501..06ced0e 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
@@ -27,6 +27,7 @@ import org.eclipse.papyrus.dd.dc.*;
/**
* <!-- begin-user-doc --> An implementation of the model <b>Factory</b>. <!--
* end-user-doc -->
+ *
* @generated
*/
public class DCFactoryImpl extends EFactoryImpl implements DCFactory {
@@ -35,16 +36,16 @@ public class DCFactoryImpl extends EFactoryImpl implements DCFactory {
* Creates the default factory implementation.
* <!-- begin-user-doc --> <!--
* end-user-doc -->
+ *
* @generated
*/
public static DCFactory init() {
try {
DCFactory theDCFactory = (DCFactory)EPackage.Registry.INSTANCE.getEFactory(DCPackage.eNS_URI);
- if (theDCFactory != null) {
+ if(theDCFactory != null) {
return theDCFactory;
}
- }
- catch (Exception exception) {
+ } catch (Exception exception) {
EcorePlugin.INSTANCE.log(exception);
}
return new DCFactoryImpl();
@@ -54,6 +55,7 @@ public class DCFactoryImpl extends EFactoryImpl implements DCFactory {
* Creates an instance of the factory.
* <!-- begin-user-doc --> <!--
* end-user-doc -->
+ *
* @generated
*/
public DCFactoryImpl() {
@@ -62,69 +64,76 @@ public class DCFactoryImpl extends EFactoryImpl implements DCFactory {
/**
* <!-- begin-user-doc --> <!-- end-user-doc -->
+ *
* @generated
*/
@Override
public EObject create(EClass eClass) {
- switch (eClass.getClassifierID()) {
- case DCPackage.POINT: return createPoint();
- case DCPackage.DIMENSION: return createDimension();
- case DCPackage.BOUNDS: return createBounds();
- default:
- throw new IllegalArgumentException("The class '" + eClass.getName() + "' is not a valid classifier");
+ switch(eClass.getClassifierID()) {
+ case DCPackage.POINT:
+ return createPoint();
+ case DCPackage.DIMENSION:
+ return createDimension();
+ case DCPackage.BOUNDS:
+ return createBounds();
+ default:
+ throw new IllegalArgumentException("The class '" + eClass.getName() + "' is not a valid classifier");
}
}
/**
* <!-- begin-user-doc --> <!-- end-user-doc -->
+ *
* @generated
*/
@Override
public Object createFromString(EDataType eDataType, String initialValue) {
- switch (eDataType.getClassifierID()) {
- case DCPackage.KNOWN_COLOR:
- return createKnownColorFromString(eDataType, initialValue);
- case DCPackage.BOOLEAN:
- return createBooleanFromString(eDataType, initialValue);
- case DCPackage.INTEGER:
- return createIntegerFromString(eDataType, initialValue);
- case DCPackage.REAL:
- return createRealFromString(eDataType, initialValue);
- case DCPackage.STRING:
- return createStringFromString(eDataType, initialValue);
- case DCPackage.COLOR:
- return createColorFromString(eDataType, initialValue);
- default:
- throw new IllegalArgumentException("The datatype '" + eDataType.getName() + "' is not a valid classifier");
+ switch(eDataType.getClassifierID()) {
+ case DCPackage.KNOWN_COLOR:
+ return createKnownColorFromString(eDataType, initialValue);
+ case DCPackage.BOOLEAN:
+ return createBooleanFromString(eDataType, initialValue);
+ case DCPackage.INTEGER:
+ return createIntegerFromString(eDataType, initialValue);
+ case DCPackage.REAL:
+ return createRealFromString(eDataType, initialValue);
+ case DCPackage.STRING:
+ return createStringFromString(eDataType, initialValue);
+ case DCPackage.COLOR:
+ return createColorFromString(eDataType, initialValue);
+ default:
+ throw new IllegalArgumentException("The datatype '" + eDataType.getName() + "' is not a valid classifier");
}
}
/**
* <!-- begin-user-doc --> <!-- end-user-doc -->
+ *
* @generated
*/
@Override
public String convertToString(EDataType eDataType, Object instanceValue) {
- switch (eDataType.getClassifierID()) {
- case DCPackage.KNOWN_COLOR:
- return convertKnownColorToString(eDataType, instanceValue);
- case DCPackage.BOOLEAN:
- return convertBooleanToString(eDataType, instanceValue);
- case DCPackage.INTEGER:
- return convertIntegerToString(eDataType, instanceValue);
- case DCPackage.REAL:
- return convertRealToString(eDataType, instanceValue);
- case DCPackage.STRING:
- return convertStringToString(eDataType, instanceValue);
- case DCPackage.COLOR:
- return convertColorToString(eDataType, instanceValue);
- default:
- throw new IllegalArgumentException("The datatype '" + eDataType.getName() + "' is not a valid classifier");
+ switch(eDataType.getClassifierID()) {
+ case DCPackage.KNOWN_COLOR:
+ return convertKnownColorToString(eDataType, instanceValue);
+ case DCPackage.BOOLEAN:
+ return convertBooleanToString(eDataType, instanceValue);
+ case DCPackage.INTEGER:
+ return convertIntegerToString(eDataType, instanceValue);
+ case DCPackage.REAL:
+ return convertRealToString(eDataType, instanceValue);
+ case DCPackage.STRING:
+ return convertStringToString(eDataType, instanceValue);
+ case DCPackage.COLOR:
+ return convertColorToString(eDataType, instanceValue);
+ default:
+ throw new IllegalArgumentException("The datatype '" + eDataType.getName() + "' is not a valid classifier");
}
}
/**
* <!-- begin-user-doc --> <!-- end-user-doc -->
+ *
* @generated
*/
public Point createPoint() {
@@ -134,6 +143,7 @@ public class DCFactoryImpl extends EFactoryImpl implements DCFactory {
/**
* <!-- begin-user-doc --> <!-- end-user-doc -->
+ *
* @generated
*/
public Dimension createDimension() {
@@ -143,6 +153,7 @@ public class DCFactoryImpl extends EFactoryImpl implements DCFactory {
/**
* <!-- begin-user-doc --> <!-- end-user-doc -->
+ *
* @generated
*/
public Bounds createBounds() {
@@ -152,62 +163,64 @@ public class DCFactoryImpl extends EFactoryImpl implements DCFactory {
/**
* <!-- begin-user-doc --> <!-- end-user-doc -->
+ *
* @generated
*/
- public KnownColor createKnownColorFromString(EDataType eDataType,
- String initialValue) {
+ public KnownColor createKnownColorFromString(EDataType eDataType, String initialValue) {
KnownColor result = KnownColor.get(initialValue);
- if (result == null) throw new IllegalArgumentException("The value '" + initialValue + "' is not a valid enumerator of '" + eDataType.getName() + "'");
+ if(result == null)
+ throw new IllegalArgumentException("The value '" + initialValue + "' is not a valid enumerator of '" + eDataType.getName() + "'");
return result;
}
/**
* <!-- begin-user-doc --> <!-- end-user-doc -->
+ *
* @generated
*/
- public String convertKnownColorToString(EDataType eDataType,
- Object instanceValue) {
+ public String convertKnownColorToString(EDataType eDataType, Object instanceValue) {
return instanceValue == null ? null : instanceValue.toString();
}
/**
* <!-- begin-user-doc --> <!-- end-user-doc -->
+ *
* @generated
*/
- public Boolean createBooleanFromString(EDataType eDataType,
- String initialValue) {
+ public Boolean createBooleanFromString(EDataType eDataType, String initialValue) {
return (Boolean)super.createFromString(eDataType, initialValue);
}
/**
* <!-- begin-user-doc --> <!-- end-user-doc -->
+ *
* @generated
*/
- public String convertBooleanToString(EDataType eDataType,
- Object instanceValue) {
+ public String convertBooleanToString(EDataType eDataType, Object instanceValue) {
return super.convertToString(eDataType, instanceValue);
}
/**
* <!-- begin-user-doc --> <!-- end-user-doc -->
+ *
* @generated
*/
- public Integer createIntegerFromString(EDataType eDataType,
- String initialValue) {
+ public Integer createIntegerFromString(EDataType eDataType, String initialValue) {
return (Integer)super.createFromString(eDataType, initialValue);
}
/**
* <!-- begin-user-doc --> <!-- end-user-doc -->
+ *
* @generated
*/
- public String convertIntegerToString(EDataType eDataType,
- Object instanceValue) {
+ public String convertIntegerToString(EDataType eDataType, Object instanceValue) {
return super.convertToString(eDataType, instanceValue);
}
/**
* <!-- begin-user-doc --> <!-- end-user-doc -->
+ *
* @generated
*/
public Double createRealFromString(EDataType eDataType, String initialValue) {
@@ -216,6 +229,7 @@ public class DCFactoryImpl extends EFactoryImpl implements DCFactory {
/**
* <!-- begin-user-doc --> <!-- end-user-doc -->
+ *
* @generated
*/
public String convertRealToString(EDataType eDataType, Object instanceValue) {
@@ -224,19 +238,19 @@ public class DCFactoryImpl extends EFactoryImpl implements DCFactory {
/**
* <!-- begin-user-doc --> <!-- end-user-doc -->
+ *
* @generated
*/
- public String createStringFromString(EDataType eDataType,
- String initialValue) {
+ public String createStringFromString(EDataType eDataType, String initialValue) {
return (String)super.createFromString(eDataType, initialValue);
}
/**
* <!-- begin-user-doc --> <!-- end-user-doc -->
+ *
* @generated
*/
- public String convertStringToString(EDataType eDataType,
- Object instanceValue) {
+ public String convertStringToString(EDataType eDataType, Object instanceValue) {
return super.convertToString(eDataType, instanceValue);
}
@@ -246,7 +260,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);
}
@@ -257,15 +271,15 @@ 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;
- return String.format("#%02X%02X%02X", c.getRed(), c.getGreen(),
- c.getBlue());
+ Color c = (Color)instanceValue;
+ return String.format("#%02X%02X%02X", c.getRed(), c.getGreen(), c.getBlue());
}
/**
* <!-- begin-user-doc --> <!-- end-user-doc -->
+ *
* @generated
*/
public DCPackage getDCPackage() {
@@ -274,6 +288,7 @@ public class DCFactoryImpl extends EFactoryImpl implements DCFactory {
/**
* <!-- begin-user-doc --> <!-- end-user-doc -->
+ *
* @deprecated
* @generated
*/
@@ -281,5 +296,4 @@ public class DCFactoryImpl extends EFactoryImpl implements DCFactory {
public static DCPackage getPackage() {
return DCPackage.eINSTANCE;
}
-
} // DCFactoryImpl
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 43cc688..66dd0fd 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
@@ -32,73 +32,80 @@ import org.eclipse.papyrus.dd.dc.util.DCValidator;
/**
* <!-- begin-user-doc --> An implementation of the model <b>Package</b>. <!--
* end-user-doc -->
+ *
* @generated
*/
public class DCPackageImpl extends EPackageImpl implements DCPackage {
/**
* <!-- begin-user-doc --> <!-- end-user-doc -->
+ *
* @generated
*/
private EClass pointEClass = null;
/**
* <!-- begin-user-doc --> <!-- end-user-doc -->
+ *
* @generated
*/
private EClass dimensionEClass = null;
/**
* <!-- begin-user-doc --> <!-- end-user-doc -->
+ *
* @generated
*/
private EClass boundsEClass = null;
/**
* <!-- begin-user-doc --> <!-- end-user-doc -->
+ *
* @generated
*/
private EEnum knownColorEEnum = null;
/**
* <!-- begin-user-doc --> <!-- end-user-doc -->
+ *
* @generated
*/
private EDataType booleanEDataType = null;
/**
* <!-- begin-user-doc --> <!-- end-user-doc -->
+ *
* @generated
*/
private EDataType integerEDataType = null;
/**
* <!-- begin-user-doc --> <!-- end-user-doc -->
+ *
* @generated
*/
private EDataType realEDataType = null;
/**
* <!-- begin-user-doc --> <!-- end-user-doc -->
+ *
* @generated
*/
private EDataType stringEDataType = null;
/**
* <!-- begin-user-doc --> <!-- end-user-doc -->
+ *
* @generated
*/
private EDataType colorEDataType = null;
/**
- * Creates an instance of the model <b>Package</b>, registered with
- * {@link org.eclipse.emf.ecore.EPackage.Registry EPackage.Registry} by the
+ * 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
@@ -111,6 +118,7 @@ public class DCPackageImpl extends EPackageImpl implements DCPackage {
/**
* <!-- begin-user-doc --> <!-- end-user-doc -->
+ *
* @generated
*/
private static boolean isInited = false;
@@ -120,10 +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()
@@ -131,32 +137,24 @@ 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());
-
isInited = true;
-
// Create package meta-data objects
theDCPackage.createPackageContents();
-
// Initialize created meta-data
theDCPackage.initializePackageContents();
-
// Register package validator
- EValidator.Registry.INSTANCE.put
- (theDCPackage,
- new EValidator.Descriptor() {
- public EValidator getEValidator() {
- return DCValidator.INSTANCE;
- }
- });
+ EValidator.Registry.INSTANCE.put(theDCPackage, new EValidator.Descriptor() {
+ public EValidator getEValidator() {
+ return DCValidator.INSTANCE;
+ }
+ });
// Mark meta-data to indicate it can't be changed
theDCPackage.freeze();
-
-
// Update the registry and return the package
EPackage.Registry.INSTANCE.put(DCPackage.eNS_URI, theDCPackage);
return theDCPackage;
@@ -164,6 +162,7 @@ public class DCPackageImpl extends EPackageImpl implements DCPackage {
/**
* <!-- begin-user-doc --> <!-- end-user-doc -->
+ *
* @generated
*/
public EClass getPoint() {
@@ -172,6 +171,7 @@ public class DCPackageImpl extends EPackageImpl implements DCPackage {
/**
* <!-- begin-user-doc --> <!-- end-user-doc -->
+ *
* @generated
*/
public EAttribute getPoint_X() {
@@ -180,6 +180,7 @@ public class DCPackageImpl extends EPackageImpl implements DCPackage {
/**
* <!-- begin-user-doc --> <!-- end-user-doc -->
+ *
* @generated
*/
public EAttribute getPoint_Y() {
@@ -188,6 +189,7 @@ public class DCPackageImpl extends EPackageImpl implements DCPackage {
/**
* <!-- begin-user-doc --> <!-- end-user-doc -->
+ *
* @generated
*/
public EClass getDimension() {
@@ -196,6 +198,7 @@ public class DCPackageImpl extends EPackageImpl implements DCPackage {
/**
* <!-- begin-user-doc --> <!-- end-user-doc -->
+ *
* @generated
*/
public EAttribute getDimension_Width() {
@@ -204,6 +207,7 @@ public class DCPackageImpl extends EPackageImpl implements DCPackage {
/**
* <!-- begin-user-doc --> <!-- end-user-doc -->
+ *
* @generated
*/
public EAttribute getDimension_Height() {
@@ -212,6 +216,7 @@ public class DCPackageImpl extends EPackageImpl implements DCPackage {
/**
* <!-- begin-user-doc --> <!-- end-user-doc -->
+ *
* @generated
*/
public EOperation getDimension__NonNegativeWidth__DiagnosticChain_Map() {
@@ -220,6 +225,7 @@ public class DCPackageImpl extends EPackageImpl implements DCPackage {
/**
* <!-- begin-user-doc --> <!-- end-user-doc -->
+ *
* @generated
*/
public EOperation getDimension__NonNegativeHeight__DiagnosticChain_Map() {
@@ -228,6 +234,7 @@ public class DCPackageImpl extends EPackageImpl implements DCPackage {
/**
* <!-- begin-user-doc --> <!-- end-user-doc -->
+ *
* @generated
*/
public EClass getBounds() {
@@ -236,6 +243,7 @@ public class DCPackageImpl extends EPackageImpl implements DCPackage {
/**
* <!-- begin-user-doc --> <!-- end-user-doc -->
+ *
* @generated
*/
public EAttribute getBounds_X() {
@@ -244,6 +252,7 @@ public class DCPackageImpl extends EPackageImpl implements DCPackage {
/**
* <!-- begin-user-doc --> <!-- end-user-doc -->
+ *
* @generated
*/
public EAttribute getBounds_Y() {
@@ -252,6 +261,7 @@ public class DCPackageImpl extends EPackageImpl implements DCPackage {
/**
* <!-- begin-user-doc --> <!-- end-user-doc -->
+ *
* @generated
*/
public EAttribute getBounds_Width() {
@@ -260,6 +270,7 @@ public class DCPackageImpl extends EPackageImpl implements DCPackage {
/**
* <!-- begin-user-doc --> <!-- end-user-doc -->
+ *
* @generated
*/
public EAttribute getBounds_Height() {
@@ -268,6 +279,7 @@ public class DCPackageImpl extends EPackageImpl implements DCPackage {
/**
* <!-- begin-user-doc --> <!-- end-user-doc -->
+ *
* @generated
*/
public EOperation getBounds__NonNegativeWidth__DiagnosticChain_Map() {
@@ -276,6 +288,7 @@ public class DCPackageImpl extends EPackageImpl implements DCPackage {
/**
* <!-- begin-user-doc --> <!-- end-user-doc -->
+ *
* @generated
*/
public EOperation getBounds__NonNegativeHeight__DiagnosticChain_Map() {
@@ -284,6 +297,7 @@ public class DCPackageImpl extends EPackageImpl implements DCPackage {
/**
* <!-- begin-user-doc --> <!-- end-user-doc -->
+ *
* @generated
*/
public EEnum getKnownColor() {
@@ -292,6 +306,7 @@ public class DCPackageImpl extends EPackageImpl implements DCPackage {
/**
* <!-- begin-user-doc --> <!-- end-user-doc -->
+ *
* @generated
*/
public EDataType getBoolean() {
@@ -300,6 +315,7 @@ public class DCPackageImpl extends EPackageImpl implements DCPackage {
/**
* <!-- begin-user-doc --> <!-- end-user-doc -->
+ *
* @generated
*/
public EDataType getInteger() {
@@ -308,6 +324,7 @@ public class DCPackageImpl extends EPackageImpl implements DCPackage {
/**
* <!-- begin-user-doc --> <!-- end-user-doc -->
+ *
* @generated
*/
public EDataType getReal() {
@@ -316,6 +333,7 @@ public class DCPackageImpl extends EPackageImpl implements DCPackage {
/**
* <!-- begin-user-doc --> <!-- end-user-doc -->
+ *
* @generated
*/
public EDataType getString() {
@@ -324,6 +342,7 @@ public class DCPackageImpl extends EPackageImpl implements DCPackage {
/**
* <!-- begin-user-doc --> <!-- end-user-doc -->
+ *
* @generated
*/
public EDataType getColor() {
@@ -332,6 +351,7 @@ public class DCPackageImpl extends EPackageImpl implements DCPackage {
/**
* <!-- begin-user-doc --> <!-- end-user-doc -->
+ *
* @generated
*/
public DCFactory getDCFactory() {
@@ -340,32 +360,32 @@ public class DCPackageImpl extends EPackageImpl implements DCPackage {
/**
* <!-- begin-user-doc --> <!-- end-user-doc -->
+ *
* @generated
*/
private boolean isCreated = false;
/**
- * Creates the meta-model objects for the package. This method is
+ * Creates the meta-model objects for the package. This method is
* guarded to have no affect on any invocation but its first.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
+ *
* @generated
*/
public void createPackageContents() {
- if (isCreated) return;
+ if(isCreated)
+ return;
isCreated = true;
-
// Create classes and their features
pointEClass = createEClass(POINT);
createEAttribute(pointEClass, POINT__X);
createEAttribute(pointEClass, POINT__Y);
-
dimensionEClass = createEClass(DIMENSION);
createEAttribute(dimensionEClass, DIMENSION__WIDTH);
createEAttribute(dimensionEClass, DIMENSION__HEIGHT);
createEOperation(dimensionEClass, DIMENSION___NON_NEGATIVE_WIDTH__DIAGNOSTICCHAIN_MAP);
createEOperation(dimensionEClass, DIMENSION___NON_NEGATIVE_HEIGHT__DIAGNOSTICCHAIN_MAP);
-
boundsEClass = createEClass(BOUNDS);
createEAttribute(boundsEClass, BOUNDS__X);
createEAttribute(boundsEClass, BOUNDS__Y);
@@ -373,10 +393,8 @@ public class DCPackageImpl extends EPackageImpl implements DCPackage {
createEAttribute(boundsEClass, BOUNDS__HEIGHT);
createEOperation(boundsEClass, BOUNDS___NON_NEGATIVE_WIDTH__DIAGNOSTICCHAIN_MAP);
createEOperation(boundsEClass, BOUNDS___NON_NEGATIVE_HEIGHT__DIAGNOSTICCHAIN_MAP);
-
// Create enums
knownColorEEnum = createEEnum(KNOWN_COLOR);
-
// Create data types
booleanEDataType = createEDataType(BOOLEAN);
integerEDataType = createEDataType(INTEGER);
@@ -387,6 +405,7 @@ public class DCPackageImpl extends EPackageImpl implements DCPackage {
/**
* <!-- begin-user-doc --> <!-- end-user-doc -->
+ *
* @generated
*/
private boolean isInitialized = false;
@@ -399,29 +418,23 @@ public class DCPackageImpl extends EPackageImpl implements DCPackage {
* @generated
*/
public void initializePackageContents() {
- if (isInitialized) return;
+ if(isInitialized)
+ return;
isInitialized = true;
-
// Initialize package
setName(eNAME);
setNsPrefix(eNS_PREFIX);
setNsURI(eNS_URI);
-
// Create type parameters
-
// Set bounds for type parameters
-
// Add supertypes to classes
-
// Initialize classes, features, and operations; add parameters
initEClass(pointEClass, Point.class, "Point", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
initEAttribute(getPoint_X(), this.getReal(), "x", "0", 0, 1, Point.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, !IS_ORDERED);
initEAttribute(getPoint_Y(), this.getReal(), "y", "0", 0, 1, Point.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, !IS_ORDERED);
-
initEClass(dimensionEClass, Dimension.class, "Dimension", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
initEAttribute(getDimension_Width(), this.getReal(), "width", "0", 0, 1, Dimension.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, !IS_ORDERED);
initEAttribute(getDimension_Height(), this.getReal(), "height", "0", 0, 1, Dimension.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, !IS_ORDERED);
-
EOperation op = initEOperation(getDimension__NonNegativeWidth__DiagnosticChain_Map(), ecorePackage.getEBoolean(), "nonNegativeWidth", 0, 1, IS_UNIQUE, IS_ORDERED);
addEParameter(op, ecorePackage.getEDiagnosticChain(), "diagnostics", 0, 1, IS_UNIQUE, IS_ORDERED);
EGenericType g1 = createEGenericType(ecorePackage.getEMap());
@@ -430,7 +443,6 @@ public class DCPackageImpl extends EPackageImpl implements DCPackage {
g2 = createEGenericType(ecorePackage.getEJavaObject());
g1.getETypeArguments().add(g2);
addEParameter(op, g1, "context", 0, 1, IS_UNIQUE, IS_ORDERED);
-
op = initEOperation(getDimension__NonNegativeHeight__DiagnosticChain_Map(), ecorePackage.getEBoolean(), "nonNegativeHeight", 0, 1, IS_UNIQUE, IS_ORDERED);
addEParameter(op, ecorePackage.getEDiagnosticChain(), "diagnostics", 0, 1, IS_UNIQUE, IS_ORDERED);
g1 = createEGenericType(ecorePackage.getEMap());
@@ -439,13 +451,11 @@ public class DCPackageImpl extends EPackageImpl implements DCPackage {
g2 = createEGenericType(ecorePackage.getEJavaObject());
g1.getETypeArguments().add(g2);
addEParameter(op, g1, "context", 0, 1, IS_UNIQUE, IS_ORDERED);
-
initEClass(boundsEClass, Bounds.class, "Bounds", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
initEAttribute(getBounds_X(), this.getReal(), "x", "0", 0, 1, Bounds.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, !IS_ORDERED);
initEAttribute(getBounds_Y(), this.getReal(), "y", "0", 0, 1, Bounds.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, !IS_ORDERED);
initEAttribute(getBounds_Width(), this.getReal(), "width", "0", 0, 1, Bounds.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, !IS_ORDERED);
initEAttribute(getBounds_Height(), this.getReal(), "height", "0", 0, 1, Bounds.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, !IS_ORDERED);
-
op = initEOperation(getBounds__NonNegativeWidth__DiagnosticChain_Map(), ecorePackage.getEBoolean(), "nonNegativeWidth", 0, 1, IS_UNIQUE, IS_ORDERED);
addEParameter(op, ecorePackage.getEDiagnosticChain(), "diagnostics", 0, 1, IS_UNIQUE, IS_ORDERED);
g1 = createEGenericType(ecorePackage.getEMap());
@@ -454,7 +464,6 @@ public class DCPackageImpl extends EPackageImpl implements DCPackage {
g2 = createEGenericType(ecorePackage.getEJavaObject());
g1.getETypeArguments().add(g2);
addEParameter(op, g1, "context", 0, 1, IS_UNIQUE, IS_ORDERED);
-
op = initEOperation(getBounds__NonNegativeHeight__DiagnosticChain_Map(), ecorePackage.getEBoolean(), "nonNegativeHeight", 0, 1, IS_UNIQUE, IS_ORDERED);
addEParameter(op, ecorePackage.getEDiagnosticChain(), "diagnostics", 0, 1, IS_UNIQUE, IS_ORDERED);
g1 = createEGenericType(ecorePackage.getEMap());
@@ -463,7 +472,6 @@ public class DCPackageImpl extends EPackageImpl implements DCPackage {
g2 = createEGenericType(ecorePackage.getEJavaObject());
g1.getETypeArguments().add(g2);
addEParameter(op, g1, "context", 0, 1, IS_UNIQUE, IS_ORDERED);
-
// Initialize enums and add enum literals
initEEnum(knownColorEEnum, KnownColor.class, "KnownColor");
addEEnumLiteral(knownColorEEnum, KnownColor.MAROON);
@@ -483,17 +491,14 @@ public class DCPackageImpl extends EPackageImpl implements DCPackage {
addEEnumLiteral(knownColorEEnum, KnownColor.BLACK);
addEEnumLiteral(knownColorEEnum, KnownColor.SILVER);
addEEnumLiteral(knownColorEEnum, KnownColor.GRAY);
-
// Initialize data types
initEDataType(booleanEDataType, boolean.class, "Boolean", IS_SERIALIZABLE, !IS_GENERATED_INSTANCE_CLASS);
initEDataType(integerEDataType, int.class, "Integer", IS_SERIALIZABLE, !IS_GENERATED_INSTANCE_CLASS);
initEDataType(realEDataType, double.class, "Real", IS_SERIALIZABLE, !IS_GENERATED_INSTANCE_CLASS);
initEDataType(stringEDataType, String.class, "String", IS_SERIALIZABLE, !IS_GENERATED_INSTANCE_CLASS);
initEDataType(colorEDataType, Color.class, "Color", IS_SERIALIZABLE, !IS_GENERATED_INSTANCE_CLASS);
-
// Create resource
createResource(eNS_URI);
-
// Create annotations
// http://www.eclipse.org/emf/2002/Ecore
createEcoreAnnotations();
@@ -505,50 +510,26 @@ public class DCPackageImpl extends EPackageImpl implements DCPackage {
* Initializes the annotations for <b>http://www.eclipse.org/emf/2002/Ecore</b>.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
+ *
* @generated
*/
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"
- });
+ String source = "http://www.eclipse.org/emf/2002/Ecore";
+ addAnnotation(this, source, new String[]{ "validationDelegates", "http://www.eclipse.org/emf/2002/Ecore/OCL" });
}
/**
* Initializes the annotations for <b>http://www.eclipse.org/emf/2002/Ecore/OCL</b>.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
+ *
* @generated
*/
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"
- });
+ 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" });
}
-
} // 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 d80e692..669ddcd 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
@@ -32,24 +32,23 @@ import org.eclipse.papyrus.dd.dc.Dimension;
import org.eclipse.papyrus.dd.dc.util.DCValidator;
/**
- * <!-- begin-user-doc --> An implementation of the model object '
- * <em><b>Dimension</b></em>'. <!-- end-user-doc -->
+ * <!-- begin-user-doc --> An implementation of the model object ' <em><b>Dimension</b></em>'. <!-- end-user-doc -->
* <p>
* The following features are implemented:
* <ul>
- * <li>{@link org.eclipse.papyrus.dd.dc.impl.DimensionImpl#getWidth <em>Width</em>}</li>
- * <li>{@link org.eclipse.papyrus.dd.dc.impl.DimensionImpl#getHeight <em>Height</em>}</li>
+ * <li>{@link org.eclipse.papyrus.dd.dc.impl.DimensionImpl#getWidth <em>Width</em>}</li>
+ * <li>{@link org.eclipse.papyrus.dd.dc.impl.DimensionImpl#getHeight <em>Height</em>}</li>
* </ul>
* </p>
- *
+ *
* @generated
*/
-public class DimensionImpl extends MinimalEObjectImpl.Container implements
- Dimension {
+public class DimensionImpl extends MinimalEObjectImpl.Container implements Dimension {
/**
* The default value of the '{@link #getWidth() <em>Width</em>}' attribute.
* <!-- begin-user-doc --> <!-- end-user-doc -->
+ *
* @see #getWidth()
* @generated
* @ordered
@@ -59,6 +58,7 @@ public class DimensionImpl extends MinimalEObjectImpl.Container implements
/**
* The cached value of the '{@link #getWidth() <em>Width</em>}' attribute.
* <!-- begin-user-doc --> <!-- end-user-doc -->
+ *
* @see #getWidth()
* @generated
* @ordered
@@ -69,6 +69,7 @@ public class DimensionImpl extends MinimalEObjectImpl.Container implements
* This is true if the Width attribute has been set.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
+ *
* @generated
* @ordered
*/
@@ -77,6 +78,7 @@ public class DimensionImpl extends MinimalEObjectImpl.Container implements
/**
* The default value of the '{@link #getHeight() <em>Height</em>}' attribute.
* <!-- begin-user-doc --> <!-- end-user-doc -->
+ *
* @see #getHeight()
* @generated
* @ordered
@@ -86,6 +88,7 @@ public class DimensionImpl extends MinimalEObjectImpl.Container implements
/**
* The cached value of the '{@link #getHeight() <em>Height</em>}' attribute.
* <!-- begin-user-doc --> <!-- end-user-doc -->
+ *
* @see #getHeight()
* @generated
* @ordered
@@ -96,6 +99,7 @@ public class DimensionImpl extends MinimalEObjectImpl.Container implements
* This is true if the Height attribute has been set.
* <!-- begin-user-doc
* --> <!-- end-user-doc -->
+ *
* @generated
* @ordered
*/
@@ -103,6 +107,7 @@ public class DimensionImpl extends MinimalEObjectImpl.Container implements
/**
* <!-- begin-user-doc --> <!-- end-user-doc -->
+ *
* @generated
*/
protected DimensionImpl() {
@@ -111,6 +116,7 @@ public class DimensionImpl extends MinimalEObjectImpl.Container implements
/**
* <!-- begin-user-doc --> <!-- end-user-doc -->
+ *
* @generated
*/
@Override
@@ -120,6 +126,7 @@ public class DimensionImpl extends MinimalEObjectImpl.Container implements
/**
* <!-- begin-user-doc --> <!-- end-user-doc -->
+ *
* @generated
*/
public double getWidth() {
@@ -128,6 +135,7 @@ public class DimensionImpl extends MinimalEObjectImpl.Container implements
/**
* <!-- begin-user-doc --> <!-- end-user-doc -->
+ *
* @generated
*/
public void setWidth(double newWidth) {
@@ -135,12 +143,13 @@ public class DimensionImpl extends MinimalEObjectImpl.Container implements
width = newWidth;
boolean oldWidthESet = widthESet;
widthESet = true;
- if (eNotificationRequired())
+ if(eNotificationRequired())
eNotify(new ENotificationImpl(this, Notification.SET, DCPackage.DIMENSION__WIDTH, oldWidth, width, !oldWidthESet));
}
/**
* <!-- begin-user-doc --> <!-- end-user-doc -->
+ *
* @generated
*/
public void unsetWidth() {
@@ -148,12 +157,13 @@ public class DimensionImpl extends MinimalEObjectImpl.Container implements
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));
}
/**
* <!-- begin-user-doc --> <!-- end-user-doc -->
+ *
* @generated
*/
public boolean isSetWidth() {
@@ -162,6 +172,7 @@ public class DimensionImpl extends MinimalEObjectImpl.Container implements
/**
* <!-- begin-user-doc --> <!-- end-user-doc -->
+ *
* @generated
*/
public double getHeight() {
@@ -170,6 +181,7 @@ public class DimensionImpl extends MinimalEObjectImpl.Container implements
/**
* <!-- begin-user-doc --> <!-- end-user-doc -->
+ *
* @generated
*/
public void setHeight(double newHeight) {
@@ -177,12 +189,13 @@ public class DimensionImpl extends MinimalEObjectImpl.Container implements
height = newHeight;
boolean oldHeightESet = heightESet;
heightESet = true;
- if (eNotificationRequired())
+ if(eNotificationRequired())
eNotify(new ENotificationImpl(this, Notification.SET, DCPackage.DIMENSION__HEIGHT, oldHeight, height, !oldHeightESet));
}
/**
* <!-- begin-user-doc --> <!-- end-user-doc -->
+ *
* @generated
*/
public void unsetHeight() {
@@ -190,12 +203,13 @@ public class DimensionImpl extends MinimalEObjectImpl.Container implements
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));
}
/**
* <!-- begin-user-doc --> <!-- end-user-doc -->
+ *
* @generated
*/
public boolean isSetHeight() {
@@ -203,9 +217,11 @@ public class DimensionImpl extends MinimalEObjectImpl.Container implements
}
/**
- * The cached validation expression for the '{@link #nonNegativeWidth(org.eclipse.emf.common.util.DiagnosticChain, java.util.Map) <em>Non Negative Width</em>}' invariant operation.
+ * The cached validation expression for the '{@link #nonNegativeWidth(org.eclipse.emf.common.util.DiagnosticChain, java.util.Map)
+ * <em>Non Negative Width</em>}' invariant operation.
* <!-- begin-user-doc
* --> <!-- end-user-doc -->
+ *
* @see #nonNegativeWidth(org.eclipse.emf.common.util.DiagnosticChain, java.util.Map)
* @generated
* @ordered
@@ -214,28 +230,19 @@ public class DimensionImpl extends MinimalEObjectImpl.Container implements
/**
* <!-- begin-user-doc --> <!-- end-user-doc -->
+ *
* @generated
*/
- public boolean nonNegativeWidth(DiagnosticChain diagnostics,
- Map<Object, Object> context) {
- return
- DCValidator.validate
- (DCPackage.Literals.DIMENSION,
- this,
- diagnostics,
- context,
- "http://www.eclipse.org/emf/2002/Ecore/OCL",
- DCPackage.Literals.DIMENSION___NON_NEGATIVE_WIDTH__DIAGNOSTICCHAIN_MAP,
- NON_NEGATIVE_WIDTH_DIAGNOSTIC_CHAIN_MAP__EEXPRESSION,
- Diagnostic.ERROR,
- DCValidator.DIAGNOSTIC_SOURCE,
- DCValidator.DIMENSION__NON_NEGATIVE_WIDTH);
+ public boolean nonNegativeWidth(DiagnosticChain diagnostics, Map<Object, Object> context) {
+ return DCValidator.validate(DCPackage.Literals.DIMENSION, this, diagnostics, context, "http://www.eclipse.org/emf/2002/Ecore/OCL", DCPackage.Literals.DIMENSION___NON_NEGATIVE_WIDTH__DIAGNOSTICCHAIN_MAP, NON_NEGATIVE_WIDTH_DIAGNOSTIC_CHAIN_MAP__EEXPRESSION, Diagnostic.ERROR, DCValidator.DIAGNOSTIC_SOURCE, DCValidator.DIMENSION__NON_NEGATIVE_WIDTH);
}
/**
- * The cached validation expression for the '{@link #nonNegativeHeight(org.eclipse.emf.common.util.DiagnosticChain, java.util.Map) <em>Non Negative Height</em>}' invariant operation.
+ * The cached validation expression for the '{@link #nonNegativeHeight(org.eclipse.emf.common.util.DiagnosticChain, java.util.Map)
+ * <em>Non Negative Height</em>}' invariant operation.
* <!-- begin-user-doc
* --> <!-- end-user-doc -->
+ *
* @see #nonNegativeHeight(org.eclipse.emf.common.util.DiagnosticChain, java.util.Map)
* @generated
* @ordered
@@ -244,120 +251,119 @@ public class DimensionImpl extends MinimalEObjectImpl.Container implements
/**
* <!-- begin-user-doc --> <!-- end-user-doc -->
+ *
* @generated
*/
- 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);
+ 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);
}
/**
* <!-- begin-user-doc --> <!-- end-user-doc -->
+ *
* @generated
*/
@Override
public Object eGet(int featureID, boolean resolve, boolean coreType) {
- switch (featureID) {
- case DCPackage.DIMENSION__WIDTH:
- return getWidth();
- case DCPackage.DIMENSION__HEIGHT:
- return getHeight();
+ switch(featureID) {
+ case DCPackage.DIMENSION__WIDTH:
+ return getWidth();
+ case DCPackage.DIMENSION__HEIGHT:
+ return getHeight();
}