Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorcletavernie2012-02-14 05:33:53 -0500
committercletavernie2012-02-14 05:33:53 -0500
commitb77c9cf432654e41df9d514739f15a8e22687072 (patch)
tree36c43dfe8e89f2ddd17d24b06af0792d8df35f17
parent53436177a9621a1c1d16bebfdca7fa152bbb4743 (diff)
downloadorg.eclipse.papyrus-b77c9cf432654e41df9d514739f15a8e22687072.tar.gz
org.eclipse.papyrus-b77c9cf432654e41df9d514739f15a8e22687072.tar.xz
org.eclipse.papyrus-b77c9cf432654e41df9d514739f15a8e22687072.zip
371460: [UML Diagram Common] The UML Diagram Common plug-in should be split
https://bugs.eclipse.org/bugs/show_bug.cgi?id=371460
-rw-r--r--plugins/customization/org.eclipse.papyrus.customization.properties/Model/ui/SingleLayoutType.xwt4
-rw-r--r--plugins/customization/org.eclipse.papyrus.customization.properties/src/org/eclipse/papyrus/customization/properties/editor/UIEditor.java24
-rw-r--r--plugins/infra/emf/org.eclipse.papyrus.infra.emf/src/org/eclipse/papyrus/infra/emf/databinding/AnnotationObservableValue.java71
-rw-r--r--plugins/infra/emf/org.eclipse.papyrus.infra.emf/src/org/eclipse/papyrus/infra/emf/providers/SemanticFromModelExplorer.java19
-rw-r--r--plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.commands/META-INF/MANIFEST.MF5
-rw-r--r--plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.commands/src/org/eclipse/papyrus/commands/wrappers/OperationToGEFCommandWrapper.java1
-rw-r--r--plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/.classpath1
-rw-r--r--plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/META-INF/MANIFEST.MF11
-rw-r--r--plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/build.properties13
-rw-r--r--plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/icons/refresh.gifbin0 -> 330 bytes
-rw-r--r--plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/plugin.xml40
-rw-r--r--plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src-gen/org/eclipse/papyrus/infra/gmfdiag/common/notation/ArrowStyleProvider.java23
-rw-r--r--plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src-gen/org/eclipse/papyrus/infra/gmfdiag/common/notation/BooleanListValueStyleProvider.java20
-rw-r--r--plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src-gen/org/eclipse/papyrus/infra/gmfdiag/common/notation/BooleanValueStyleProvider.java19
-rw-r--r--plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src-gen/org/eclipse/papyrus/infra/gmfdiag/common/notation/ByteArrayValueStyleProvider.java19
-rw-r--r--plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src-gen/org/eclipse/papyrus/infra/gmfdiag/common/notation/CanonicalStyleProvider.java19
-rw-r--r--plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src-gen/org/eclipse/papyrus/infra/gmfdiag/common/notation/ConnectorStyleProvider.java18
-rw-r--r--plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src-gen/org/eclipse/papyrus/infra/gmfdiag/common/notation/DataTypeStyleProvider.java18
-rw-r--r--plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src-gen/org/eclipse/papyrus/infra/gmfdiag/common/notation/DescriptionStyleProvider.java19
-rw-r--r--plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src-gen/org/eclipse/papyrus/infra/gmfdiag/common/notation/DiagramLinkStyleProvider.java18
-rw-r--r--plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src-gen/org/eclipse/papyrus/infra/gmfdiag/common/notation/DiagramStyleProvider.java18
-rw-r--r--plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src-gen/org/eclipse/papyrus/infra/gmfdiag/common/notation/DoubleListValueStyleProvider.java20
-rw-r--r--plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src-gen/org/eclipse/papyrus/infra/gmfdiag/common/notation/DoubleValueStyleProvider.java19
-rw-r--r--plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src-gen/org/eclipse/papyrus/infra/gmfdiag/common/notation/DrawerStyleProvider.java19
-rw-r--r--plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src-gen/org/eclipse/papyrus/infra/gmfdiag/common/notation/EObjectListValueStyleProvider.java18
-rw-r--r--plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src-gen/org/eclipse/papyrus/infra/gmfdiag/common/notation/EObjectValueStyleProvider.java18
-rw-r--r--plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src-gen/org/eclipse/papyrus/infra/gmfdiag/common/notation/FillStyleProvider.java25
-rw-r--r--plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src-gen/org/eclipse/papyrus/infra/gmfdiag/common/notation/FilteringStyleProvider.java23
-rw-r--r--plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src-gen/org/eclipse/papyrus/infra/gmfdiag/common/notation/FontStyleProvider.java37
-rw-r--r--plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src-gen/org/eclipse/papyrus/infra/gmfdiag/common/notation/GuideStyleProvider.java18
-rw-r--r--plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src-gen/org/eclipse/papyrus/infra/gmfdiag/common/notation/HintedDiagramLinkStyleProvider.java19
-rw-r--r--plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src-gen/org/eclipse/papyrus/infra/gmfdiag/common/notation/ImageBufferStyleProvider.java18
-rw-r--r--plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src-gen/org/eclipse/papyrus/infra/gmfdiag/common/notation/ImageStyleProvider.java22
-rw-r--r--plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src-gen/org/eclipse/papyrus/infra/gmfdiag/common/notation/IntListValueStyleProvider.java20
-rw-r--r--plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src-gen/org/eclipse/papyrus/infra/gmfdiag/common/notation/IntValueStyleProvider.java19
-rw-r--r--plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src-gen/org/eclipse/papyrus/infra/gmfdiag/common/notation/LineStyleProvider.java22
-rw-r--r--plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src-gen/org/eclipse/papyrus/infra/gmfdiag/common/notation/LineTypeStyleProvider.java20
-rw-r--r--plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src-gen/org/eclipse/papyrus/infra/gmfdiag/common/notation/ListValueStyleProvider.java20
-rw-r--r--plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src-gen/org/eclipse/papyrus/infra/gmfdiag/common/notation/MultiDiagramLinkStyleProvider.java18
-rw-r--r--plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src-gen/org/eclipse/papyrus/infra/gmfdiag/common/notation/NamedStyleProvider.java19
-rw-r--r--plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src-gen/org/eclipse/papyrus/infra/gmfdiag/common/notation/PageStyleProvider.java28
-rw-r--r--plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src-gen/org/eclipse/papyrus/infra/gmfdiag/common/notation/PropertiesSetStyleProvider.java18
-rw-r--r--plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src-gen/org/eclipse/papyrus/infra/gmfdiag/common/notation/RoundedCornersStyleProvider.java19
-rw-r--r--plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src-gen/org/eclipse/papyrus/infra/gmfdiag/common/notation/RoutingStyleProvider.java41
-rw-r--r--plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src-gen/org/eclipse/papyrus/infra/gmfdiag/common/notation/ShapeStyleProvider.java18
-rw-r--r--plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src-gen/org/eclipse/papyrus/infra/gmfdiag/common/notation/SingleValueStyleProvider.java19
-rw-r--r--plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src-gen/org/eclipse/papyrus/infra/gmfdiag/common/notation/SortingStyleProvider.java23
-rw-r--r--plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src-gen/org/eclipse/papyrus/infra/gmfdiag/common/notation/StringListValueStyleProvider.java20
-rw-r--r--plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src-gen/org/eclipse/papyrus/infra/gmfdiag/common/notation/StringValueStyleProvider.java19
-rw-r--r--plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src-gen/org/eclipse/papyrus/infra/gmfdiag/common/notation/TextStyleProvider.java20
-rw-r--r--plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src-gen/org/eclipse/papyrus/infra/gmfdiag/common/notation/TitleStyleProvider.java19
-rw-r--r--plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/OverlayVisibilityIcon.java73
-rw-r--r--plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/SemanticFromGMFElement.java1
-rw-r--r--plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/SynchronizableGmfDiagramEditor.java29
-rw-r--r--plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/editpart/ConnectionEditPart.java72
-rw-r--r--plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/editpart/IPapyrusEditPart.java20
-rw-r--r--plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/editpart/IStylableEditPart.java17
-rw-r--r--plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/editpart/NodeEditPart.java300
-rw-r--r--plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/editpart/PapyrusCompartmentEditPart.java87
-rw-r--r--plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/editpart/PapyrusDiagramEditPart.java24
-rw-r--r--plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/editpart/PapyrusLabelEditPart.java87
-rw-r--r--plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/editpart/ResizeableListCompartmentEditPart.java122
-rw-r--r--plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/editpolicies/AbstractStyleEditPolicy.java53
-rw-r--r--plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/editpolicies/IMaskManagedLabelEditPolicy.java95
-rw-r--r--plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/editpolicies/StyleEditPolicy.java23
-rw-r--r--plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/figure/node/IPapyrusNodeFigure.java118
-rw-r--r--plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/handler/RefreshHandler.java45
-rw-r--r--plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/helper/DiagramHelper.java42
-rw-r--r--plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/build.properties4
-rw-r--r--plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/ui/SingleView.xwt5
-rw-r--r--plugins/infra/org.eclipse.papyrus.infra.hyperlink/src/org/eclipse/papyrus/infra/hyperlink/util/HyperLinkHelpersRegistrationUtil.java4
-rw-r--r--plugins/infra/services/org.eclipse.papyrus.infra.services.decoration/src/org/eclipse/papyrus/infra/services/decoration/util/DecorationUtils.java2
-rw-r--r--plugins/uml/org.eclipse.papyrus.uml.profile/META-INF/MANIFEST.MF16
-rw-r--r--plugins/uml/org.eclipse.papyrus.uml.profile/plugin.xml2
-rw-r--r--plugins/uml/org.eclipse.papyrus.uml.profile/src/org/eclipse/papyrus/uml/profile/filter/AppliedProfileSectionFilter.java66
-rw-r--r--plugins/uml/org.eclipse.papyrus.uml.profile/src/org/eclipse/papyrus/uml/profile/filter/AppliedStereotypeSectionFilter.java73
-rw-r--r--plugins/uml/org.eclipse.papyrus.uml.profile/src/org/eclipse/papyrus/uml/profile/filter/CompartmentEditPartPropertySectionFilter.java31
-rw-r--r--plugins/uml/org.eclipse.papyrus.uml.profile/src/org/eclipse/papyrus/uml/profile/ui/dialogs/ChooseSetAssistedDialog.java30
-rw-r--r--plugins/uml/org.eclipse.papyrus.uml.profile/src/org/eclipse/papyrus/uml/profile/ui/dialogs/ChooseSetDialog.java638
-rw-r--r--plugins/uml/org.eclipse.papyrus.uml.profile/src/org/eclipse/papyrus/uml/profile/ui/dialogs/DefinitionHistoryDialog.java324
-rw-r--r--plugins/uml/org.eclipse.papyrus.uml.profile/src/org/eclipse/papyrus/uml/profile/ui/dialogs/ElementList.java15
-rw-r--r--plugins/uml/org.eclipse.papyrus.uml.profile/src/org/eclipse/papyrus/uml/profile/ui/dialogs/LabelEditorDialog.java193
-rw-r--r--plugins/uml/org.eclipse.papyrus.uml.profile/src/org/eclipse/papyrus/uml/profile/ui/dialogs/PackageImportTreeSelectionDialog.java1
-rw-r--r--plugins/uml/org.eclipse.papyrus.uml.profile/src/org/eclipse/papyrus/uml/profile/utils/UmlElementFilter.java38
-rw-r--r--plugins/uml/properties/org.eclipse.papyrus.uml.properties.tabbedproperties.comments/plugin.xml1
-rw-r--r--plugins/uml/properties/org.eclipse.papyrus.uml.properties/.project4
-rw-r--r--plugins/uml/properties/org.eclipse.papyrus.uml.properties/META-INF/MANIFEST.MF32
-rw-r--r--plugins/uml/properties/org.eclipse.papyrus.uml.properties/plugin.xml11
-rw-r--r--plugins/uml/properties/org.eclipse.papyrus.uml.properties/src/org/eclipse/papyrus/uml/properties/databinding/ElementCustomizationObservableValue.java16
-rw-r--r--plugins/uml/properties/org.eclipse.papyrus.uml.properties/src/org/eclipse/papyrus/uml/properties/databinding/StereotypeAppearanceObservableValue.java30
-rw-r--r--plugins/uml/properties/org.eclipse.papyrus.uml.properties/src/org/eclipse/papyrus/uml/properties/extensionpoint/LanguageEditorExtensionPoint.java1
-rw-r--r--plugins/uml/properties/org.eclipse.papyrus.uml.properties/src/org/eclipse/papyrus/uml/properties/modelelement/StereotypeAppearanceModelElement.java6
-rw-r--r--plugins/uml/properties/org.eclipse.papyrus.uml.properties/src/org/eclipse/papyrus/uml/properties/preferences/LanguageRegistry.java7
-rw-r--r--plugins/uml/properties/org.eclipse.papyrus.uml.properties/src/org/eclipse/papyrus/uml/properties/profile/ui/actions/AbstractPackageImportAction.java (renamed from plugins/uml/org.eclipse.papyrus.uml.profile/src/org/eclipse/papyrus/uml/profile/ui/actions/AbstractPackageImportAction.java)2
-rw-r--r--plugins/uml/properties/org.eclipse.papyrus.uml.properties/src/org/eclipse/papyrus/uml/properties/profile/ui/actions/AbstractViewActionDelegate.java (renamed from plugins/uml/org.eclipse.papyrus.uml.profile/src/org/eclipse/papyrus/uml/profile/ui/actions/AbstractViewActionDelegate.java)2
-rw-r--r--plugins/uml/properties/org.eclipse.papyrus.uml.properties/src/org/eclipse/papyrus/uml/properties/profile/ui/actions/ImportFromFile.java (renamed from plugins/uml/org.eclipse.papyrus.uml.profile/src/org/eclipse/papyrus/uml/profile/ui/actions/ImportFromFile.java)15
-rw-r--r--plugins/uml/properties/org.eclipse.papyrus.uml.properties/src/org/eclipse/papyrus/uml/properties/profile/ui/actions/ImportLibrariesFromRepositoryAction.java (renamed from plugins/uml/org.eclipse.papyrus.uml.profile/src/org/eclipse/papyrus/uml/profile/ui/actions/ImportLibrariesFromRepositoryAction.java)2
-rw-r--r--plugins/uml/properties/org.eclipse.papyrus.uml.properties/src/org/eclipse/papyrus/uml/properties/profile/ui/actions/ImportProfileAction.java (renamed from plugins/uml/org.eclipse.papyrus.uml.profile/src/org/eclipse/papyrus/uml/profile/ui/actions/ImportProfileAction.java)4
-rw-r--r--plugins/uml/properties/org.eclipse.papyrus.uml.properties/src/org/eclipse/papyrus/uml/properties/profile/ui/actions/ImportProfilesAsLibraryFromRepositoryAction.java (renamed from plugins/uml/org.eclipse.papyrus.uml.profile/src/org/eclipse/papyrus/uml/profile/ui/actions/ImportProfilesAsLibraryFromRepositoryAction.java)2
-rw-r--r--plugins/uml/properties/org.eclipse.papyrus.uml.properties/src/org/eclipse/papyrus/uml/properties/profile/ui/actions/ReApplyProfiles.java (renamed from plugins/uml/org.eclipse.papyrus.uml.profile/src/org/eclipse/papyrus/uml/profile/ui/actions/ReApplyProfiles.java)2
-rw-r--r--plugins/uml/properties/org.eclipse.papyrus.uml.properties/src/org/eclipse/papyrus/uml/properties/profile/ui/compositeforview/AppearanceForAppliedStereotypeComposite.java (renamed from plugins/uml/org.eclipse.papyrus.uml.profile/src/org/eclipse/papyrus/uml/profile/ui/compositeforview/AppearanceForAppliedStereotypeComposite.java)20
-rw-r--r--plugins/uml/properties/org.eclipse.papyrus.uml.properties/src/org/eclipse/papyrus/uml/properties/profile/ui/compositeforview/AppliedProfileCompositeWithView.java (renamed from plugins/uml/org.eclipse.papyrus.uml.profile/src/org/eclipse/papyrus/uml/profile/ui/compositeforview/AppliedProfileCompositeWithView.java)4
-rw-r--r--plugins/uml/properties/org.eclipse.papyrus.uml.properties/src/org/eclipse/papyrus/uml/properties/profile/ui/compositeforview/AppliedStereotypeCompositeWithView.java (renamed from plugins/uml/org.eclipse.papyrus.uml.profile/src/org/eclipse/papyrus/uml/profile/ui/compositeforview/AppliedStereotypeCompositeWithView.java)6
-rw-r--r--plugins/uml/properties/org.eclipse.papyrus.uml.properties/src/org/eclipse/papyrus/uml/properties/profile/ui/compositeforview/AppliedStereotypeDisplayComposite.java (renamed from plugins/uml/org.eclipse.papyrus.uml.profile/src/org/eclipse/papyrus/uml/profile/ui/compositeforview/AppliedStereotypeDisplayComposite.java)6
-rw-r--r--plugins/uml/properties/org.eclipse.papyrus.uml.properties/src/org/eclipse/papyrus/uml/properties/profile/ui/compositeforview/AppliedStereotypePropertyCompositeWithView.java (renamed from plugins/uml/org.eclipse.papyrus.uml.profile/src/org/eclipse/papyrus/uml/profile/ui/compositeforview/AppliedStereotypePropertyCompositeWithView.java)6
-rw-r--r--plugins/uml/properties/org.eclipse.papyrus.uml.properties/src/org/eclipse/papyrus/uml/properties/profile/ui/compositeforview/IViewComposite.java (renamed from plugins/uml/org.eclipse.papyrus.uml.profile/src/org/eclipse/papyrus/uml/profile/ui/compositeforview/IViewComposite.java)2
-rw-r--r--plugins/uml/properties/org.eclipse.papyrus.uml.properties/src/org/eclipse/papyrus/uml/properties/profile/ui/compositeforview/ProfileElementWithDisplayContentProvider.java (renamed from plugins/uml/org.eclipse.papyrus.uml.profile/src/org/eclipse/papyrus/uml/profile/ui/compositeforview/ProfileElementWithDisplayContentProvider.java)2
-rw-r--r--plugins/uml/properties/org.eclipse.papyrus.uml.properties/src/org/eclipse/papyrus/uml/properties/profile/ui/compositeforview/ProfileElementWithDisplayLabelProvider.java (renamed from plugins/uml/org.eclipse.papyrus.uml.profile/src/org/eclipse/papyrus/uml/profile/ui/compositeforview/ProfileElementWithDisplayLabelProvider.java)2
-rw-r--r--plugins/uml/properties/org.eclipse.papyrus.uml.properties/src/org/eclipse/papyrus/uml/properties/profile/ui/compositeforview/StereotypePropertiesDoubleClickListener.java (renamed from plugins/uml/org.eclipse.papyrus.uml.profile/src/org/eclipse/papyrus/uml/profile/ui/compositeforview/StereotypePropertiesDoubleClickListener.java)4
-rw-r--r--plugins/uml/properties/org.eclipse.papyrus.uml.properties/src/org/eclipse/papyrus/uml/properties/profile/ui/compositesformodel/AppearanceDecoratedTreeComposite.java (renamed from plugins/uml/org.eclipse.papyrus.uml.profile/src/org/eclipse/papyrus/uml/profile/ui/compositesformodel/AppearanceDecoratedTreeComposite.java)2
-rw-r--r--plugins/uml/properties/org.eclipse.papyrus.uml.properties/src/org/eclipse/papyrus/uml/properties/profile/ui/compositesformodel/AppliedProfileCompositeOnModel.java (renamed from plugins/uml/org.eclipse.papyrus.uml.profile/src/org/eclipse/papyrus/uml/profile/ui/compositesformodel/AppliedProfileCompositeOnModel.java)12
-rw-r--r--plugins/uml/properties/org.eclipse.papyrus.uml.properties/src/org/eclipse/papyrus/uml/properties/profile/ui/compositesformodel/AppliedStereotypeCompositeOnModel.java (renamed from plugins/uml/org.eclipse.papyrus.uml.profile/src/org/eclipse/papyrus/uml/profile/ui/compositesformodel/AppliedStereotypeCompositeOnModel.java)6
-rw-r--r--plugins/uml/properties/org.eclipse.papyrus.uml.properties/src/org/eclipse/papyrus/uml/properties/profile/ui/compositesformodel/DecoratedTreeComposite.java (renamed from plugins/uml/org.eclipse.papyrus.uml.profile/src/org/eclipse/papyrus/uml/profile/ui/compositesformodel/DecoratedTreeComposite.java)2
-rw-r--r--plugins/uml/properties/org.eclipse.papyrus.uml.properties/src/org/eclipse/papyrus/uml/properties/profile/ui/compositesformodel/ISectionComposite.java (renamed from plugins/uml/org.eclipse.papyrus.uml.profile/src/org/eclipse/papyrus/uml/profile/ui/compositesformodel/ISectionComposite.java)2
-rw-r--r--plugins/uml/properties/org.eclipse.papyrus.uml.properties/src/org/eclipse/papyrus/uml/properties/profile/ui/compositesformodel/PropertyComposite.java (renamed from plugins/uml/org.eclipse.papyrus.uml.profile/src/org/eclipse/papyrus/uml/profile/ui/compositesformodel/PropertyComposite.java)2
-rw-r--r--plugins/uml/properties/org.eclipse.papyrus.uml.properties/src/org/eclipse/papyrus/uml/properties/profile/ui/dialogs/ChooseSetStereotypeDialog.java (renamed from plugins/uml/org.eclipse.papyrus.uml.profile/src/org/eclipse/papyrus/uml/profile/ui/dialogs/ChooseSetStereotypeDialog.java)5
-rw-r--r--plugins/uml/properties/org.eclipse.papyrus.uml.properties/src/org/eclipse/papyrus/uml/properties/profile/ui/dialogs/FileSelectionFilter.java (renamed from plugins/uml/org.eclipse.papyrus.uml.profile/src/org/eclipse/papyrus/uml/profile/ui/dialogs/FileSelectionFilter.java)2
-rw-r--r--plugins/uml/properties/org.eclipse.papyrus.uml.properties/src/org/eclipse/papyrus/uml/properties/profile/ui/dialogs/FileSelectionValidator.java (renamed from plugins/uml/org.eclipse.papyrus.uml.profile/src/org/eclipse/papyrus/uml/profile/ui/dialogs/FileSelectionValidator.java)2
-rw-r--r--plugins/uml/properties/org.eclipse.papyrus.uml.properties/src/org/eclipse/papyrus/uml/properties/profile/ui/dialogs/Message.java (renamed from plugins/uml/org.eclipse.papyrus.uml.profile/src/org/eclipse/papyrus/uml/profile/ui/dialogs/Message.java)2
-rw-r--r--plugins/uml/properties/org.eclipse.papyrus.uml.properties/src/org/eclipse/papyrus/uml/properties/profile/ui/dialogs/RegisteredProfileSelectionDialog.java (renamed from plugins/uml/org.eclipse.papyrus.uml.profile/src/org/eclipse/papyrus/uml/profile/ui/dialogs/RegisteredProfileSelectionDialog.java)3
-rw-r--r--plugins/uml/properties/org.eclipse.papyrus.uml.properties/src/org/eclipse/papyrus/uml/properties/profile/ui/dialogs/StereotypeLabelProvider.java (renamed from plugins/uml/org.eclipse.papyrus.uml.profile/src/org/eclipse/papyrus/uml/profile/ui/dialogs/StereotypeLabelProvider.java)2
-rw-r--r--plugins/uml/properties/org.eclipse.papyrus.uml.properties/src/org/eclipse/papyrus/uml/properties/profile/ui/dialogs/StereotypeQualifiedLabelProvider.java (renamed from plugins/uml/org.eclipse.papyrus.uml.profile/src/org/eclipse/papyrus/uml/profile/ui/dialogs/StereotypeQualifiedLabelProvider.java)2
-rw-r--r--plugins/uml/properties/org.eclipse.papyrus.uml.properties/src/org/eclipse/papyrus/uml/properties/profile/ui/items/CompositeItems.java98
-rw-r--r--plugins/uml/properties/org.eclipse.papyrus.uml.properties/src/org/eclipse/papyrus/uml/properties/profile/ui/items/DataTypeItems.java58
-rw-r--r--plugins/uml/properties/org.eclipse.papyrus.uml.properties/src/org/eclipse/papyrus/uml/properties/profile/ui/items/EnumerationItems.java104
-rw-r--r--plugins/uml/properties/org.eclipse.papyrus.uml.properties/src/org/eclipse/papyrus/uml/properties/profile/ui/items/MetaclassItems.java96
-rw-r--r--plugins/uml/properties/org.eclipse.papyrus.uml.properties/src/org/eclipse/papyrus/uml/properties/profile/ui/items/PrimitiveTypeItems.java61
-rw-r--r--plugins/uml/properties/org.eclipse.papyrus.uml.properties/src/org/eclipse/papyrus/uml/properties/profile/ui/items/StereotypeItems.java109
-rw-r--r--plugins/uml/properties/org.eclipse.papyrus.uml.properties/src/org/eclipse/papyrus/uml/properties/profile/ui/listeners/DoubleClickListener.java (renamed from plugins/uml/org.eclipse.papyrus.uml.profile/src/org/eclipse/papyrus/uml/profile/ui/listeners/DoubleClickListener.java)2
-rw-r--r--plugins/uml/properties/org.eclipse.papyrus.uml.properties/src/org/eclipse/papyrus/uml/properties/profile/ui/listeners/NoValueException.java (renamed from plugins/uml/org.eclipse.papyrus.uml.profile/src/org/eclipse/papyrus/uml/profile/ui/listeners/NoValueException.java)2
-rw-r--r--plugins/uml/properties/org.eclipse.papyrus.uml.properties/src/org/eclipse/papyrus/uml/properties/profile/ui/panels/AbstractPanel.java (renamed from plugins/uml/org.eclipse.papyrus.uml.profile/src/org/eclipse/papyrus/uml/profile/ui/panels/AbstractPanel.java)2
-rw-r--r--plugins/uml/properties/org.eclipse.papyrus.uml.properties/src/org/eclipse/papyrus/uml/properties/profile/ui/panels/AppliedProfilePanel.java (renamed from plugins/uml/org.eclipse.papyrus.uml.profile/src/org/eclipse/papyrus/uml/profile/ui/panels/AppliedProfilePanel.java)8
-rw-r--r--plugins/uml/properties/org.eclipse.papyrus.uml.properties/src/org/eclipse/papyrus/uml/properties/profile/ui/panels/AppliedStereotypePanel.java (renamed from plugins/uml/org.eclipse.papyrus.uml.profile/src/org/eclipse/papyrus/uml/profile/ui/panels/AppliedStereotypePanel.java)6
-rw-r--r--plugins/uml/properties/org.eclipse.papyrus.uml.properties/src/org/eclipse/papyrus/uml/properties/profile/ui/panels/DefaultPanel.java (renamed from plugins/uml/org.eclipse.papyrus.uml.profile/src/org/eclipse/papyrus/uml/profile/ui/panels/DefaultPanel.java)2
-rw-r--r--plugins/uml/properties/org.eclipse.papyrus.uml.properties/src/org/eclipse/papyrus/uml/properties/profile/ui/section/AppliedProfileSection.java (renamed from plugins/uml/org.eclipse.papyrus.uml.profile/src/org/eclipse/papyrus/uml/profile/ui/section/AppliedProfileSection.java)4
-rw-r--r--plugins/uml/properties/org.eclipse.papyrus.uml.properties/src/org/eclipse/papyrus/uml/properties/profile/ui/section/AppliedStereotypeDisplaySection.java (renamed from plugins/uml/org.eclipse.papyrus.uml.profile/src/org/eclipse/papyrus/uml/profile/ui/section/AppliedStereotypeDisplaySection.java)17
-rw-r--r--plugins/uml/properties/org.eclipse.papyrus.uml.properties/src/org/eclipse/papyrus/uml/properties/profile/ui/section/AppliedStereotypeKindAppearanceSection.java (renamed from plugins/uml/org.eclipse.papyrus.uml.profile/src/org/eclipse/papyrus/uml/profile/ui/section/AppliedStereotypeKindAppearanceSection.java)46
-rw-r--r--plugins/uml/properties/org.eclipse.papyrus.uml.properties/src/org/eclipse/papyrus/uml/properties/profile/ui/section/AppliedStereotypePropertiesPlaceSection.java (renamed from plugins/uml/org.eclipse.papyrus.uml.profile/src/org/eclipse/papyrus/uml/profile/ui/section/AppliedStereotypePropertiesPlaceSection.java)14
-rw-r--r--plugins/uml/properties/org.eclipse.papyrus.uml.properties/src/org/eclipse/papyrus/uml/properties/profile/ui/section/AppliedStereotypeSectionWithView.java (renamed from plugins/uml/org.eclipse.papyrus.uml.profile/src/org/eclipse/papyrus/uml/profile/ui/section/AppliedStereotypeSectionWithView.java)6
-rw-r--r--plugins/uml/properties/org.eclipse.papyrus.uml.properties/src/org/eclipse/papyrus/uml/properties/profile/ui/views/ProfilePanelView.java (renamed from plugins/uml/org.eclipse.papyrus.uml.profile/src/org/eclipse/papyrus/uml/profile/ui/views/ProfilePanelView.java)10
-rw-r--r--plugins/uml/properties/org.eclipse.papyrus.uml.properties/src/org/eclipse/papyrus/uml/properties/util/StereotypeAppearanceConstants.java2
-rw-r--r--plugins/uml/properties/org.eclipse.papyrus.uml.properties/src/org/eclipse/papyrus/uml/properties/widgets/LabelCustomizationMaskProvider.java2
-rw-r--r--plugins/uml/properties/org.eclipse.papyrus.uml.properties/src/org/eclipse/papyrus/uml/properties/widgets/ProfileApplicationEditor.java8
-rw-r--r--plugins/uml/properties/org.eclipse.papyrus.uml.properties/src/org/eclipse/papyrus/uml/properties/widgets/StereotypeApplication.java4
-rw-r--r--plugins/uml/properties/org.eclipse.papyrus.uml.properties/src/org/eclipse/papyrus/uml/properties/widgets/StereotypeDisplay.java2
-rw-r--r--plugins/uml/tools/org.eclipse.papyrus.uml.tools/src/org/eclipse/papyrus/uml/tools/util/UMLProviderHelper.java1
-rw-r--r--plugins/views/modelexplorer/org.eclipse.papyrus.views.modelexplorer/src/org/eclipse/papyrus/views/modelexplorer/MoDiscoLabelProvider.java10
-rw-r--r--plugins/views/properties/org.eclipse.papyrus.views.properties/schema/context.exsd12
-rw-r--r--sandbox/org.eclipse.papyrus.uml.tools.utils_css/META-INF/MANIFEST.MF7
-rw-r--r--sandbox/org.eclipse.papyrus.uml.tools.utils_css/src/org/eclipse/papyrus/uml/tools/utils/ui/VisualInformationPapyrusConstant.java188
-rw-r--r--sandbox/org.eclipse.papyrus.uml.tools.utils_css/src/org/eclipse/papyrus/uml/tools/utils/ui/command/AddAppliedQNStereotypeToDisplayCommand.java82
-rw-r--r--sandbox/org.eclipse.papyrus.uml.tools.utils_css/src/org/eclipse/papyrus/uml/tools/utils/ui/command/AddAppliedStereotypePropertiesToDisplayCommand.java78
-rw-r--r--sandbox/org.eclipse.papyrus.uml.tools.utils_css/src/org/eclipse/papyrus/uml/tools/utils/ui/command/AddAppliedStereotypeToDisplayCommand.java83
-rw-r--r--sandbox/org.eclipse.papyrus.uml.tools.utils_css/src/org/eclipse/papyrus/uml/tools/utils/ui/command/AddMaskManagedLabelDisplayCommand.java67
-rw-r--r--sandbox/org.eclipse.papyrus.uml.tools.utils_css/src/org/eclipse/papyrus/uml/tools/utils/ui/command/CreateEAnnotationCommand.java150
-rw-r--r--sandbox/org.eclipse.papyrus.uml.tools.utils_css/src/org/eclipse/papyrus/uml/tools/utils/ui/command/RemoveAppliedStereotypePropertiesToDisplayCommand.java83
-rw-r--r--sandbox/org.eclipse.papyrus.uml.tools.utils_css/src/org/eclipse/papyrus/uml/tools/utils/ui/command/RemoveAppliedStereotypeToDisplayCommand.java95
-rw-r--r--sandbox/org.eclipse.papyrus.uml.tools.utils_css/src/org/eclipse/papyrus/uml/tools/utils/ui/command/RemoveEAnnotationCommand.java77
-rw-r--r--sandbox/org.eclipse.papyrus.uml.tools.utils_css/src/org/eclipse/papyrus/uml/tools/utils/ui/command/SetAppliedStereotypePropertiesLocalizationCommand.java74
-rw-r--r--sandbox/org.eclipse.papyrus.uml.tools.utils_css/src/org/eclipse/papyrus/uml/tools/utils/ui/command/SetAppliedStereotypeToDisplayCommand.java78
-rw-r--r--sandbox/org.eclipse.papyrus.uml.tools.utils_css/src/org/eclipse/papyrus/uml/tools/utils/ui/command/SetGradienColorCommand.java59
-rw-r--r--sandbox/org.eclipse.papyrus.uml.tools.utils_css/src/org/eclipse/papyrus/uml/tools/utils/ui/command/SetNameLabelIconCommand.java55
-rw-r--r--sandbox/org.eclipse.papyrus.uml.tools.utils_css/src/org/eclipse/papyrus/uml/tools/utils/ui/command/SetQualifiedNameDepthCommand.java56
-rw-r--r--sandbox/org.eclipse.papyrus.uml.tools.utils_css/src/org/eclipse/papyrus/uml/tools/utils/ui/command/SetShadowFigureCommand.java55
-rw-r--r--sandbox/org.eclipse.papyrus.uml.tools.utils_css/src/org/eclipse/papyrus/uml/tools/utils/ui/helper/AppliedStereotypeHelper.java341
-rw-r--r--sandbox/org.eclipse.papyrus.uml.tools.utils_css/src/org/eclipse/papyrus/uml/tools/utils/ui/helper/NameLabelIconHelper.java87
-rw-r--r--sandbox/org.eclipse.papyrus.uml.tools.utils_css/src/org/eclipse/papyrus/uml/tools/utils/ui/helper/QualifiedNameHelper.java77
-rw-r--r--sandbox/org.eclipse.papyrus.uml.tools.utils_css/src/org/eclipse/papyrus/uml/tools/utils/ui/helper/ShadowFigureHelper.java75
168 files changed, 2939 insertions, 3515 deletions
diff --git a/plugins/customization/org.eclipse.papyrus.customization.properties/Model/ui/SingleLayoutType.xwt b/plugins/customization/org.eclipse.papyrus.customization.properties/Model/ui/SingleLayoutType.xwt
index 858ca014eb4..f20ae461153 100644
--- a/plugins/customization/org.eclipse.papyrus.customization.properties/Model/ui/SingleLayoutType.xwt
+++ b/plugins/customization/org.eclipse.papyrus.customization.properties/Model/ui/SingleLayoutType.xwt
@@ -10,8 +10,8 @@
<ppel:PropertiesLayout numColumns="1"></ppel:PropertiesLayout>
</Composite.layout>
<ppe:StringEditor input="{Binding}"
- property="properties:environment:WidgetType:label" showLabel="false"></ppe:StringEditor>
+ property="properties:environment:WidgetType:label"></ppe:StringEditor>
<ppe:StringEditor input="{Binding}"
- property="properties:environment:WidgetType:widgetClass" showLabel="false"></ppe:StringEditor>
+ property="properties:environment:WidgetType:widgetClass"></ppe:StringEditor>
</Composite>
</Composite> \ No newline at end of file
diff --git a/plugins/customization/org.eclipse.papyrus.customization.properties/src/org/eclipse/papyrus/customization/properties/editor/UIEditor.java b/plugins/customization/org.eclipse.papyrus.customization.properties/src/org/eclipse/papyrus/customization/properties/editor/UIEditor.java
index 040ca422ef7..2c48bdfc7f8 100644
--- a/plugins/customization/org.eclipse.papyrus.customization.properties/src/org/eclipse/papyrus/customization/properties/editor/UIEditor.java
+++ b/plugins/customization/org.eclipse.papyrus.customization.properties/src/org/eclipse/papyrus/customization/properties/editor/UIEditor.java
@@ -33,8 +33,6 @@ import org.eclipse.emf.edit.ui.dnd.ViewerDragAdapter;
import org.eclipse.emf.edit.ui.provider.UnwrappingSelectionProvider;
import org.eclipse.jface.action.MenuManager;
import org.eclipse.jface.action.Separator;
-import org.eclipse.jface.dialogs.IDialogConstants;
-import org.eclipse.jface.dialogs.MessageDialog;
import org.eclipse.jface.viewers.ILabelProvider;
import org.eclipse.jface.viewers.SelectionChangedEvent;
import org.eclipse.jface.viewers.StructuredSelection;
@@ -44,7 +42,6 @@ import org.eclipse.jface.viewers.ViewerFilter;
import org.eclipse.papyrus.customization.properties.Activator;
import org.eclipse.papyrus.customization.properties.editor.preview.Preview;
import org.eclipse.papyrus.customization.properties.messages.Messages;
-import org.eclipse.papyrus.customization.properties.preferences.CustomizationPreferencePage;
import org.eclipse.papyrus.customization.properties.providers.ContextContentProvider;
import org.eclipse.papyrus.customization.properties.providers.ContextLabelProvider;
import org.eclipse.papyrus.infra.widgets.editors.AbstractEditor;
@@ -197,16 +194,17 @@ public class UIEditor extends EcoreEditor implements ITabbedPropertySheetPageCon
return;
}
- boolean openPerspective;
-
- if(CustomizationPreferencePage.askForConfirmation()) {
- int defaultIndex = CustomizationPreferencePage.openCustomizationPerspective() ? 0 : 1;
- MessageDialog confirmationDialog = new MessageDialog(getContainer().getShell(), Messages.UIEditor_ChangePerspective, null, Messages.UIEditor_ChangePerspectiveMessage, MessageDialog.QUESTION, new String[]{ IDialogConstants.YES_LABEL, IDialogConstants.NO_LABEL }, defaultIndex);
- confirmationDialog.open();
- openPerspective = confirmationDialog.getReturnCode() == 0;
- } else {
- openPerspective = CustomizationPreferencePage.openCustomizationPerspective();
- }
+ boolean openPerspective = false;
+
+ // if(CustomizationPreferencePage.askForConfirmation()) {
+ // int defaultIndex = CustomizationPreferencePage.openCustomizationPerspective() ? 0 : 1;
+ // System.out.println(getContainer().getShell());
+ // MessageDialog confirmationDialog = new MessageDialog(getContainer().getShell(), Messages.UIEditor_ChangePerspective, null, Messages.UIEditor_ChangePerspectiveMessage, MessageDialog.QUESTION, new String[]{ IDialogConstants.YES_LABEL, IDialogConstants.NO_LABEL }, defaultIndex);
+ // confirmationDialog.open();
+ // openPerspective = confirmationDialog.getReturnCode() == 0;
+ // } else {
+ // openPerspective = CustomizationPreferencePage.openCustomizationPerspective();
+ // }
if(openPerspective) {
try {
diff --git a/plugins/infra/emf/org.eclipse.papyrus.infra.emf/src/org/eclipse/papyrus/infra/emf/databinding/AnnotationObservableValue.java b/plugins/infra/emf/org.eclipse.papyrus.infra.emf/src/org/eclipse/papyrus/infra/emf/databinding/AnnotationObservableValue.java
index 994a0cc4c62..d223c890198 100644
--- a/plugins/infra/emf/org.eclipse.papyrus.infra.emf/src/org/eclipse/papyrus/infra/emf/databinding/AnnotationObservableValue.java
+++ b/plugins/infra/emf/org.eclipse.papyrus.infra.emf/src/org/eclipse/papyrus/infra/emf/databinding/AnnotationObservableValue.java
@@ -14,6 +14,7 @@ package org.eclipse.papyrus.infra.emf.databinding;
import java.util.Map.Entry;
import org.eclipse.core.databinding.observable.value.AbstractObservableValue;
+import org.eclipse.emf.common.command.Command;
import org.eclipse.emf.common.command.CompoundCommand;
import org.eclipse.emf.common.util.BasicEMap;
import org.eclipse.emf.common.util.EMap;
@@ -52,12 +53,6 @@ public class AnnotationObservableValue extends AbstractObservableValue {
protected String key;
/**
- * The EAnnotation being edited
- * May be null
- */
- protected EAnnotation annotation;
-
- /**
* Constructor.
*
* Creates an IObservableValue for the annotation. The annotation doesn't
@@ -77,7 +72,6 @@ public class AnnotationObservableValue extends AbstractObservableValue {
this.domain = domain;
this.annotationName = annotationName;
this.key = key;
- annotation = source.getEAnnotation(annotationName);
}
/**
@@ -92,6 +86,7 @@ public class AnnotationObservableValue extends AbstractObservableValue {
*/
@Override
protected Object doGetValue() {
+ EAnnotation annotation = getEAnnotation();
if(annotation == null) {
return null;
}
@@ -100,21 +95,56 @@ public class AnnotationObservableValue extends AbstractObservableValue {
}
+ protected EAnnotation getEAnnotation() {
+ return source.getEAnnotation(annotationName);
+ }
+
/**
* {@inheritDoc}
*/
@Override
protected void doSetValue(Object value) {
- if(!(value instanceof String)) {
- return;
+ Command emfCommand = getCommand(value);
+ if(emfCommand != null) {
+ domain.getCommandStack().execute(emfCommand);
+ }
+ }
+
+ protected Command getCommand(Object value) {
+ EAnnotation annotation = getEAnnotation();
+
+ if(value == null) {
+ if(annotation == null) {
+ return null;
+ }
+ } else {
+ if(!(value instanceof String)) {
+ return null;
+ }
}
- CompoundCommand emfCommand = new CompoundCommand("Set " + key);
+ CompoundCommand emfCommand = new CompoundCommand("Set " + key) {
+
+ @Override
+ public boolean prepare() {
+ if(this.isEmpty()) {
+ return false;
+ }
+
+ return commandList.get(0).canExecute();
+ }
+
+ };
if(annotation == null) {
annotation = EcoreFactory.eINSTANCE.createEAnnotation();
- SetCommand command = new SetCommand(domain, annotation, EcorePackage.eINSTANCE.getEAnnotation_Source(), source);
- emfCommand.append(command);
+ SetCommand nameCommand = new SetCommand(domain, annotation, EcorePackage.eINSTANCE.getEAnnotation_Source(), annotationName);
+ nameCommand.setLabel("Set name");
+ emfCommand.append(nameCommand);
+
+ SetCommand attachToSourceCommand = new SetCommand(domain, annotation, EcorePackage.eINSTANCE.getEAnnotation_EModelElement(), source);
+ nameCommand.setLabel("Attach to source");
+ emfCommand.append(attachToSourceCommand);
}
EMap<String, String> details = new BasicEMap<String, String>();
@@ -122,12 +152,23 @@ public class AnnotationObservableValue extends AbstractObservableValue {
details.put(entry.getKey(), entry.getValue());
}
- details.put(key, (String)value);
+ if(value == null) {
+ details.remove(key);
+ if(details.isEmpty()) { //We removed the last key : delete the annotation
+ SetCommand command = new SetCommand(domain, annotation, EcorePackage.eINSTANCE.getEAnnotation_EModelElement(), null);
+ command.setLabel("Delete EAnnotation");
+ emfCommand.append(command);
+ annotation = null;
+ return emfCommand;
+ }
+ } else {
+ details.put(key, (String)value);
+ }
SetCommand command = new SetCommand(domain, annotation, EcorePackage.eINSTANCE.getEAnnotation_Details(), details);
+ command.setLabel("Set details");
emfCommand.append(command);
- domain.getCommandStack().execute(emfCommand);
+ return emfCommand;
}
-
}
diff --git a/plugins/infra/emf/org.eclipse.papyrus.infra.emf/src/org/eclipse/papyrus/infra/emf/providers/SemanticFromModelExplorer.java b/plugins/infra/emf/org.eclipse.papyrus.infra.emf/src/org/eclipse/papyrus/infra/emf/providers/SemanticFromModelExplorer.java
index b98efd6feab..50698bb43ed 100644
--- a/plugins/infra/emf/org.eclipse.papyrus.infra.emf/src/org/eclipse/papyrus/infra/emf/providers/SemanticFromModelExplorer.java
+++ b/plugins/infra/emf/org.eclipse.papyrus.infra.emf/src/org/eclipse/papyrus/infra/emf/providers/SemanticFromModelExplorer.java
@@ -13,37 +13,30 @@
*****************************************************************************/
package org.eclipse.papyrus.infra.emf.providers;
-import org.eclipse.core.runtime.IAdaptable;
import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.EReference;
import org.eclipse.gmf.runtime.notation.Diagram;
import org.eclipse.papyrus.infra.core.IElementWithSemantic;
+import org.eclipse.papyrus.infra.emf.utils.EMFHelper;
/**
* This class is used to obtain the semantic element for element of the model explorer
- *
- * @deprecated See EMFHelper#getEObject(Object)
*/
-@Deprecated
+//FIXME: Remove the dependency to gmf
public class SemanticFromModelExplorer implements IElementWithSemantic {
/**
* {@inheritDoc}
*/
public Object getSemanticElement(Object wrapper) {
- if(wrapper instanceof IAdaptable) {
- Object obj = ((IAdaptable)wrapper).getAdapter(EObject.class);
- if(obj == null) {
- obj = ((IAdaptable)wrapper).getAdapter(EReference.class);
- }
- if(obj != null) {
- return obj;
- }
+ EObject semantic = EMFHelper.getEObject(wrapper);
+ if(semantic != null) {
+ return semantic;
}
if(wrapper instanceof Diagram) {
return wrapper;
}
+
return null;
}
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.commands/META-INF/MANIFEST.MF b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.commands/META-INF/MANIFEST.MF
index b66f39a4d57..50a791fa4dd 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.commands/META-INF/MANIFEST.MF
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.commands/META-INF/MANIFEST.MF
@@ -6,7 +6,10 @@ Require-Bundle: org.eclipse.ui.workbench,
org.eclipse.gmf.runtime.common.core,
org.eclipse.emf.common,
org.eclipse.gef,
- org.eclipse.gmf.runtime.diagram.ui
+ org.eclipse.emf.workspace;bundle-version="1.4.0",
+ org.eclipse.emf.transaction.ui;bundle-version="1.4.0",
+ org.eclipse.gmf.runtime.emf.commands.core;bundle-version="1.4.0",
+ org.eclipse.gmf.runtime.diagram.ui;bundle-version="1.5.0"
Bundle-Vendor: %providerName
Bundle-ActivationPolicy: lazy
Bundle-Version: 0.9.0.qualifier
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.commands/src/org/eclipse/papyrus/commands/wrappers/OperationToGEFCommandWrapper.java b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.commands/src/org/eclipse/papyrus/commands/wrappers/OperationToGEFCommandWrapper.java
index 72e65878209..1fa51967da2 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.commands/src/org/eclipse/papyrus/commands/wrappers/OperationToGEFCommandWrapper.java
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.commands/src/org/eclipse/papyrus/commands/wrappers/OperationToGEFCommandWrapper.java
@@ -19,7 +19,6 @@ import org.eclipse.core.runtime.Assert;
import org.eclipse.core.runtime.NullProgressMonitor;
import org.eclipse.gef.commands.Command;
import org.eclipse.gmf.runtime.common.core.command.ICommand;
-import org.eclipse.gmf.runtime.diagram.ui.commands.ICommandProxy;
import org.eclipse.papyrus.commands.Activator;
/**
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/.classpath b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/.classpath
index 2d1a4302f04..ed2585fb3f4 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/.classpath
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/.classpath
@@ -3,5 +3,6 @@
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>
<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
<classpathentry kind="src" path="src"/>
+ <classpathentry kind="src" path="src-gen"/>
<classpathentry kind="output" path="bin"/>
</classpath>
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/META-INF/MANIFEST.MF b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/META-INF/MANIFEST.MF
index 1e8703688ae..7c93c8a1520 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/META-INF/MANIFEST.MF
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/META-INF/MANIFEST.MF
@@ -1,5 +1,11 @@
Manifest-Version: 1.0
-Export-Package: org.eclipse.papyrus.infra.gmfdiag.common
+Export-Package: org.eclipse.papyrus.infra.gmfdiag.common,
+ org.eclipse.papyrus.infra.gmfdiag.common.editpart,
+ org.eclipse.papyrus.infra.gmfdiag.common.editpolicies,
+ org.eclipse.papyrus.infra.gmfdiag.common.figure.node,
+ org.eclipse.papyrus.infra.gmfdiag.common.handler,
+ org.eclipse.papyrus.infra.gmfdiag.common.helper,
+ org.eclipse.papyrus.infra.gmfdiag.common.notation
Bundle-ActivationPolicy: lazy
Bundle-ClassPath: .
Bundle-Name: %pluginName
@@ -11,7 +17,8 @@ Require-Bundle: org.eclipse.emf.edit.ui;bundle-version="2.5.0",
org.eclipse.gmf.runtime.diagram.ui.resources.editor;bundle-version="1.2.0",
org.eclipse.gef;bundle-version="3.7.1",
org.eclipse.emf.workspace;bundle-version="1.4.0",
- org.eclipse.gmf.runtime.diagram.ui;bundle-version="1.5.0"
+ org.eclipse.gmf.runtime.diagram.ui;bundle-version="1.5.0",
+ org.eclipse.papyrus.infra.emf.appearance;bundle-version="0.9.0"
Bundle-Vendor: %providerName
Bundle-Version: 0.9.0.qualifier
Bundle-ManifestVersion: 2
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/build.properties b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/build.properties
index fd672fc8c77..2b26888ccc5 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/build.properties
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/build.properties
@@ -1,8 +1,17 @@
#
#Mon Sep 12 09:29:38 CEST 2011
-bin.includes=.options,META-INF/,plugin.properties,about.html,.,plugin.xml,schema/,messages.properties
+bin.includes = .options,\
+ META-INF/,\
+ plugin.properties,\
+ about.html,\
+ .,\
+ plugin.xml,\
+ schema/,\
+ messages.properties,\
+ icons/
output..=bin/
jars.compile.order=.
-src.includes=about.html,.options,META-INF/,plugin.properties,.,plugin.xml,schema/,messages.properties
+src.includes = about.html,\
+ .
source..=src/
bin..=bin/
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/icons/refresh.gif b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/icons/refresh.gif
new file mode 100644
index 00000000000..e3831471a65
--- /dev/null
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/icons/refresh.gif
Binary files differ
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/plugin.xml b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/plugin.xml
index babeb5c9eb9..4e7ccd0c39e 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/plugin.xml
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/plugin.xml
@@ -27,7 +27,45 @@
contextClass="org.eclipse.papyrus.infra.gmfdiag.common.GmfEditorContext"
id="com.cea.papyrus.gmf.editor.context">
</editorContext>
- </extension>
+ </extension>
+<extension
+ point="org.eclipse.ui.handlers">
+ <handler
+ class="org.eclipse.papyrus.infra.gmfdiag.common.handler.RefreshHandler"
+ commandId="org.eclipse.ui.file.refresh">
+ <activeWhen>
+ <with
+ variable="activeEditorId">
+ <equals
+ value="org.eclipse.papyrus.infra.core.papyrusEditor">
+ </equals>
+ </with>
+ </activeWhen>
+ </handler>
+</extension>
+<extension
+ point="org.eclipse.ui.menus">
+ <menuContribution
+ allPopups="false"
+ locationURI="toolbar:org.eclipes.papyrus.menu.toolbar">
+ <command
+ commandId="org.eclipse.ui.file.refresh"
+ icon="icons/refresh.gif"
+ label="Refresh"
+ style="push"
+ tooltip="Refresh the current diagram">
+ <visibleWhen
+ checkEnabled="false">
+ <with
+ variable="activeEditorId">
+ <equals
+ value="org.eclipse.papyrus.infra.core.papyrusEditor">
+ </equals>
+ </with>
+ </visibleWhen>
+ </command>
+ </menuContribution>
+</extension>
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src-gen/org/eclipse/papyrus/infra/gmfdiag/common/notation/ArrowStyleProvider.java b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src-gen/org/eclipse/papyrus/infra/gmfdiag/common/notation/ArrowStyleProvider.java
new file mode 100644
index 00000000000..b0f683bd9c5
--- /dev/null
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src-gen/org/eclipse/papyrus/infra/gmfdiag/common/notation/ArrowStyleProvider.java
@@ -0,0 +1,23 @@
+/*****************************************************************************
+ * Copyright (c) 2012 CEA LIST.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation
+ *****************************************************************************/
+package org.eclipse.papyrus.infra.gmfdiag.common.notation;
+
+import org.eclipse.gmf.runtime.notation.ArrowType;
+
+public interface ArrowStyleProvider {
+
+ public ArrowType getArrowSource();
+
+
+ public ArrowType getArrowTarget();
+
+}
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src-gen/org/eclipse/papyrus/infra/gmfdiag/common/notation/BooleanListValueStyleProvider.java b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src-gen/org/eclipse/papyrus/infra/gmfdiag/common/notation/BooleanListValueStyleProvider.java
new file mode 100644
index 00000000000..c0cf5524060
--- /dev/null
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src-gen/org/eclipse/papyrus/infra/gmfdiag/common/notation/BooleanListValueStyleProvider.java
@@ -0,0 +1,20 @@
+/*****************************************************************************
+ * Copyright (c) 2012 CEA LIST.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation
+ *****************************************************************************/
+package org.eclipse.papyrus.infra.gmfdiag.common.notation;
+
+import org.eclipse.emf.common.util.EList;
+
+public interface BooleanListValueStyleProvider extends NamedStyleProvider{
+
+ public EList getBooleanListValue();
+
+}
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src-gen/org/eclipse/papyrus/infra/gmfdiag/common/notation/BooleanValueStyleProvider.java b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src-gen/org/eclipse/papyrus/infra/gmfdiag/common/notation/BooleanValueStyleProvider.java
new file mode 100644
index 00000000000..802d60e4bcc
--- /dev/null
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src-gen/org/eclipse/papyrus/infra/gmfdiag/common/notation/BooleanValueStyleProvider.java
@@ -0,0 +1,19 @@
+/*****************************************************************************
+ * Copyright (c) 2012 CEA LIST.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation
+ *****************************************************************************/
+package org.eclipse.papyrus.infra.gmfdiag.common.notation;
+
+
+public interface BooleanValueStyleProvider extends NamedStyleProvider{
+
+ public boolean isBooleanValue();
+
+}
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src-gen/org/eclipse/papyrus/infra/gmfdiag/common/notation/ByteArrayValueStyleProvider.java b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src-gen/org/eclipse/papyrus/infra/gmfdiag/common/notation/ByteArrayValueStyleProvider.java
new file mode 100644
index 00000000000..cf40c759b1c
--- /dev/null
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src-gen/org/eclipse/papyrus/infra/gmfdiag/common/notation/ByteArrayValueStyleProvider.java
@@ -0,0 +1,19 @@
+/*****************************************************************************
+ * Copyright (c) 2012 CEA LIST.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation
+ *****************************************************************************/
+package org.eclipse.papyrus.infra.gmfdiag.common.notation;
+
+
+public interface ByteArrayValueStyleProvider extends NamedStyleProvider{
+
+ public byte[] getByteArrayValue();
+
+}
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src-gen/org/eclipse/papyrus/infra/gmfdiag/common/notation/CanonicalStyleProvider.java b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src-gen/org/eclipse/papyrus/infra/gmfdiag/common/notation/CanonicalStyleProvider.java
new file mode 100644
index 00000000000..40aee741e13
--- /dev/null
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src-gen/org/eclipse/papyrus/infra/gmfdiag/common/notation/CanonicalStyleProvider.java
@@ -0,0 +1,19 @@
+/*****************************************************************************
+ * Copyright (c) 2012 CEA LIST.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation
+ *****************************************************************************/
+package org.eclipse.papyrus.infra.gmfdiag.common.notation;
+
+
+public interface CanonicalStyleProvider {
+
+ public boolean isCanonical();
+
+}
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src-gen/org/eclipse/papyrus/infra/gmfdiag/common/notation/ConnectorStyleProvider.java b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src-gen/org/eclipse/papyrus/infra/gmfdiag/common/notation/ConnectorStyleProvider.java
new file mode 100644
index 00000000000..4461ce15447
--- /dev/null
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src-gen/org/eclipse/papyrus/infra/gmfdiag/common/notation/ConnectorStyleProvider.java
@@ -0,0 +1,18 @@
+/*****************************************************************************
+ * Copyright (c) 2012 CEA LIST.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation
+ *****************************************************************************/
+package org.eclipse.papyrus.infra.gmfdiag.common.notation;
+
+
+public interface ConnectorStyleProvider extends RoundedCornersStyleProvider, RoutingStyleProvider, LineStyleProvider{
+
+
+}
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src-gen/org/eclipse/papyrus/infra/gmfdiag/common/notation/DataTypeStyleProvider.java b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src-gen/org/eclipse/papyrus/infra/gmfdiag/common/notation/DataTypeStyleProvider.java
new file mode 100644
index 00000000000..1e973726da7
--- /dev/null
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src-gen/org/eclipse/papyrus/infra/gmfdiag/common/notation/DataTypeStyleProvider.java
@@ -0,0 +1,18 @@
+/*****************************************************************************
+ * Copyright (c) 2012 CEA LIST.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation
+ *****************************************************************************/
+package org.eclipse.papyrus.infra.gmfdiag.common.notation;
+
+
+public interface DataTypeStyleProvider extends NamedStyleProvider{
+
+
+}
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src-gen/org/eclipse/papyrus/infra/gmfdiag/common/notation/DescriptionStyleProvider.java b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src-gen/org/eclipse/papyrus/infra/gmfdiag/common/notation/DescriptionStyleProvider.java
new file mode 100644
index 00000000000..7b332c37eff
--- /dev/null
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src-gen/org/eclipse/papyrus/infra/gmfdiag/common/notation/DescriptionStyleProvider.java
@@ -0,0 +1,19 @@
+/*****************************************************************************
+ * Copyright (c) 2012 CEA LIST.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation
+ *****************************************************************************/
+package org.eclipse.papyrus.infra.gmfdiag.common.notation;
+
+
+public interface DescriptionStyleProvider {
+
+ public java.lang.String getDescription();
+
+}
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src-gen/org/eclipse/papyrus/infra/gmfdiag/common/notation/DiagramLinkStyleProvider.java b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src-gen/org/eclipse/papyrus/infra/gmfdiag/common/notation/DiagramLinkStyleProvider.java
new file mode 100644
index 00000000000..b0e37c20096
--- /dev/null
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src-gen/org/eclipse/papyrus/infra/gmfdiag/common/notation/DiagramLinkStyleProvider.java
@@ -0,0 +1,18 @@
+/*****************************************************************************
+ * Copyright (c) 2012 CEA LIST.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation
+ *****************************************************************************/
+package org.eclipse.papyrus.infra.gmfdiag.common.notation;
+
+
+public interface DiagramLinkStyleProvider {
+
+
+}
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src-gen/org/eclipse/papyrus/infra/gmfdiag/common/notation/DiagramStyleProvider.java b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src-gen/org/eclipse/papyrus/infra/gmfdiag/common/notation/DiagramStyleProvider.java
new file mode 100644
index 00000000000..869a7c8d843
--- /dev/null
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src-gen/org/eclipse/papyrus/infra/gmfdiag/common/notation/DiagramStyleProvider.java
@@ -0,0 +1,18 @@
+/*****************************************************************************
+ * Copyright (c) 2012 CEA LIST.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation
+ *****************************************************************************/
+package org.eclipse.papyrus.infra.gmfdiag.common.notation;
+
+
+public interface DiagramStyleProvider extends PageStyleProvider, GuideStyleProvider, DescriptionStyleProvider{
+
+
+}
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src-gen/org/eclipse/papyrus/infra/gmfdiag/common/notation/DoubleListValueStyleProvider.java b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src-gen/org/eclipse/papyrus/infra/gmfdiag/common/notation/DoubleListValueStyleProvider.java
new file mode 100644
index 00000000000..17397e58a4d
--- /dev/null
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src-gen/org/eclipse/papyrus/infra/gmfdiag/common/notation/DoubleListValueStyleProvider.java
@@ -0,0 +1,20 @@
+/*****************************************************************************
+ * Copyright (c) 2012 CEA LIST.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation
+ *****************************************************************************/
+package org.eclipse.papyrus.infra.gmfdiag.common.notation;
+
+import org.eclipse.emf.common.util.EList;
+
+public interface DoubleListValueStyleProvider extends NamedStyleProvider{
+
+ public EList getDoubleListValue();
+
+}
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src-gen/org/eclipse/papyrus/infra/gmfdiag/common/notation/DoubleValueStyleProvider.java b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src-gen/org/eclipse/papyrus/infra/gmfdiag/common/notation/DoubleValueStyleProvider.java
new file mode 100644
index 00000000000..da74f416ece
--- /dev/null
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src-gen/org/eclipse/papyrus/infra/gmfdiag/common/notation/DoubleValueStyleProvider.java
@@ -0,0 +1,19 @@
+/*****************************************************************************
+ * Copyright (c) 2012 CEA LIST.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation
+ *****************************************************************************/
+package org.eclipse.papyrus.infra.gmfdiag.common.notation;
+
+
+public interface DoubleValueStyleProvider extends NamedStyleProvider{
+
+ public double getDoubleValue();
+
+}
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src-gen/org/eclipse/papyrus/infra/gmfdiag/common/notation/DrawerStyleProvider.java b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src-gen/org/eclipse/papyrus/infra/gmfdiag/common/notation/DrawerStyleProvider.java
new file mode 100644
index 00000000000..b6444f80ac4
--- /dev/null
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src-gen/org/eclipse/papyrus/infra/gmfdiag/common/notation/DrawerStyleProvider.java
@@ -0,0 +1,19 @@
+/*****************************************************************************
+ * Copyright (c) 2012 CEA LIST.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation
+ *****************************************************************************/
+package org.eclipse.papyrus.infra.gmfdiag.common.notation;
+
+
+public interface DrawerStyleProvider {
+
+ public boolean isCollapsed();
+
+}
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src-gen/org/eclipse/papyrus/infra/gmfdiag/common/notation/EObjectListValueStyleProvider.java b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src-gen/org/eclipse/papyrus/infra/gmfdiag/common/notation/EObjectListValueStyleProvider.java
new file mode 100644
index 00000000000..8a9e05cb809
--- /dev/null
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src-gen/org/eclipse/papyrus/infra/gmfdiag/common/notation/EObjectListValueStyleProvider.java
@@ -0,0 +1,18 @@
+/*****************************************************************************
+ * Copyright (c) 2012 CEA LIST.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation
+ *****************************************************************************/
+package org.eclipse.papyrus.infra.gmfdiag.common.notation;
+
+
+public interface EObjectListValueStyleProvider extends NamedStyleProvider{
+
+
+}
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src-gen/org/eclipse/papyrus/infra/gmfdiag/common/notation/EObjectValueStyleProvider.java b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src-gen/org/eclipse/papyrus/infra/gmfdiag/common/notation/EObjectValueStyleProvider.java
new file mode 100644
index 00000000000..1d8defa095d
--- /dev/null
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src-gen/org/eclipse/papyrus/infra/gmfdiag/common/notation/EObjectValueStyleProvider.java
@@ -0,0 +1,18 @@
+/*****************************************************************************
+ * Copyright (c) 2012 CEA LIST.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation
+ *****************************************************************************/
+package org.eclipse.papyrus.infra.gmfdiag.common.notation;
+
+
+public interface EObjectValueStyleProvider extends NamedStyleProvider{
+
+
+}
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src-gen/org/eclipse/papyrus/infra/gmfdiag/common/notation/FillStyleProvider.java b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src-gen/org/eclipse/papyrus/infra/gmfdiag/common/notation/FillStyleProvider.java
new file mode 100644
index 00000000000..243068920e9
--- /dev/null
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src-gen/org/eclipse/papyrus/infra/gmfdiag/common/notation/FillStyleProvider.java
@@ -0,0 +1,25 @@
+/*****************************************************************************
+ * Copyright (c) 2012 CEA LIST.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation
+ *****************************************************************************/
+package org.eclipse.papyrus.infra.gmfdiag.common.notation;
+
+
+public interface FillStyleProvider {
+
+ public int getFillColor();
+
+
+ public int getTransparency();
+
+
+ public org.eclipse.gmf.runtime.notation.datatype.GradientData getGradient();
+
+}
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src-gen/org/eclipse/papyrus/infra/gmfdiag/common/notation/FilteringStyleProvider.java b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src-gen/org/eclipse/papyrus/infra/gmfdiag/common/notation/FilteringStyleProvider.java
new file mode 100644
index 00000000000..04f900e727d
--- /dev/null
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src-gen/org/eclipse/papyrus/infra/gmfdiag/common/notation/FilteringStyleProvider.java
@@ -0,0 +1,23 @@
+/*****************************************************************************
+ * Copyright (c) 2012 CEA LIST.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation
+ *****************************************************************************/
+package org.eclipse.papyrus.infra.gmfdiag.common.notation;
+
+import org.eclipse.gmf.runtime.notation.Filtering;
+
+public interface FilteringStyleProvider {
+
+ public Filtering getFiltering();
+
+
+ public java.util.List getFilteringKeys();
+
+}
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src-gen/org/eclipse/papyrus/infra/gmfdiag/common/notation/FontStyleProvider.java b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src-gen/org/eclipse/papyrus/infra/gmfdiag/common/notation/FontStyleProvider.java
new file mode 100644
index 00000000000..3048772bcd6
--- /dev/null
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src-gen/org/eclipse/papyrus/infra/gmfdiag/common/notation/FontStyleProvider.java
@@ -0,0 +1,37 @@
+/*****************************************************************************
+ * Copyright (c) 2012 CEA LIST.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation
+ *****************************************************************************/
+package org.eclipse.papyrus.infra.gmfdiag.common.notation;
+
+
+public interface FontStyleProvider {
+
+ public int getFontColor();
+
+
+ public java.lang.String getFontName();
+
+
+ public int getFontHeight();
+
+
+ public boolean isBold();
+
+
+ public boolean isItalic();
+
+
+ public boolean isUnderline();
+
+
+ public boolean isStrikeThrough();
+
+}
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src-gen/org/eclipse/papyrus/infra/gmfdiag/common/notation/GuideStyleProvider.java b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src-gen/org/eclipse/papyrus/infra/gmfdiag/common/notation/GuideStyleProvider.java
new file mode 100644
index 00000000000..f3b1325d108
--- /dev/null
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src-gen/org/eclipse/papyrus/infra/gmfdiag/common/notation/GuideStyleProvider.java
@@ -0,0 +1,18 @@
+/*****************************************************************************
+ * Copyright (c) 2012 CEA LIST.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation
+ *****************************************************************************/
+package org.eclipse.papyrus.infra.gmfdiag.common.notation;
+
+
+public interface GuideStyleProvider {
+
+
+}
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src-gen/org/eclipse/papyrus/infra/gmfdiag/common/notation/HintedDiagramLinkStyleProvider.java b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src-gen/org/eclipse/papyrus/infra/gmfdiag/common/notation/HintedDiagramLinkStyleProvider.java
new file mode 100644
index 00000000000..813fb21f73e
--- /dev/null
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src-gen/org/eclipse/papyrus/infra/gmfdiag/common/notation/HintedDiagramLinkStyleProvider.java
@@ -0,0 +1,19 @@
+/*****************************************************************************
+ * Copyright (c) 2012 CEA LIST.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation
+ *****************************************************************************/
+package org.eclipse.papyrus.infra.gmfdiag.common.notation;
+
+
+public interface HintedDiagramLinkStyleProvider extends DiagramLinkStyleProvider{
+
+ public java.lang.String getHint();
+
+}
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src-gen/org/eclipse/papyrus/infra/gmfdiag/common/notation/ImageBufferStyleProvider.java b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src-gen/org/eclipse/papyrus/infra/gmfdiag/common/notation/ImageBufferStyleProvider.java
new file mode 100644
index 00000000000..640f2bb8c51
--- /dev/null
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src-gen/org/eclipse/papyrus/infra/gmfdiag/common/notation/ImageBufferStyleProvider.java
@@ -0,0 +1,18 @@
+/*****************************************************************************
+ * Copyright (c) 2012 CEA LIST.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation
+ *****************************************************************************/
+package org.eclipse.papyrus.infra.gmfdiag.common.notation;
+
+
+public interface ImageBufferStyleProvider extends ImageStyleProvider{
+
+
+}
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src-gen/org/eclipse/papyrus/infra/gmfdiag/common/notation/ImageStyleProvider.java b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src-gen/org/eclipse/papyrus/infra/gmfdiag/common/notation/ImageStyleProvider.java
new file mode 100644
index 00000000000..3c349965fa8
--- /dev/null
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src-gen/org/eclipse/papyrus/infra/gmfdiag/common/notation/ImageStyleProvider.java
@@ -0,0 +1,22 @@
+/*****************************************************************************
+ * Copyright (c) 2012 CEA LIST.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation
+ *****************************************************************************/
+package org.eclipse.papyrus.infra.gmfdiag.common.notation;
+
+
+public interface ImageStyleProvider {
+
+ public java.lang.Boolean getAntiAlias();
+
+
+ public java.lang.Boolean getMaintainAspectRatio();
+
+}
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src-gen/org/eclipse/papyrus/infra/gmfdiag/common/notation/IntListValueStyleProvider.java b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src-gen/org/eclipse/papyrus/infra/gmfdiag/common/notation/IntListValueStyleProvider.java
new file mode 100644
index 00000000000..69686c6b805
--- /dev/null
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src-gen/org/eclipse/papyrus/infra/gmfdiag/common/notation/IntListValueStyleProvider.java
@@ -0,0 +1,20 @@
+/*****************************************************************************
+ * Copyright (c) 2012 CEA LIST.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation
+ *****************************************************************************/
+package org.eclipse.papyrus.infra.gmfdiag.common.notation;
+
+import org.eclipse.emf.common.util.EList;
+
+public interface IntListValueStyleProvider extends NamedStyleProvider{
+
+ public EList getIntListValue();
+
+}
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src-gen/org/eclipse/papyrus/infra/gmfdiag/common/notation/IntValueStyleProvider.java b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src-gen/org/eclipse/papyrus/infra/gmfdiag/common/notation/IntValueStyleProvider.java
new file mode 100644
index 00000000000..b9ff77f9e6c
--- /dev/null
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src-gen/org/eclipse/papyrus/infra/gmfdiag/common/notation/IntValueStyleProvider.java
@@ -0,0 +1,19 @@
+/*****************************************************************************
+ * Copyright (c) 2012 CEA LIST.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation
+ *****************************************************************************/
+package org.eclipse.papyrus.infra.gmfdiag.common.notation;
+
+
+public interface IntValueStyleProvider extends NamedStyleProvider{
+
+ public int getIntValue();
+
+}
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src-gen/org/eclipse/papyrus/infra/gmfdiag/common/notation/LineStyleProvider.java b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src-gen/org/eclipse/papyrus/infra/gmfdiag/common/notation/LineStyleProvider.java
new file mode 100644
index 00000000000..dc90b26c9d8
--- /dev/null
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src-gen/org/eclipse/papyrus/infra/gmfdiag/common/notation/LineStyleProvider.java
@@ -0,0 +1,22 @@
+/*****************************************************************************
+ * Copyright (c) 2012 CEA LIST.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation
+ *****************************************************************************/
+package org.eclipse.papyrus.infra.gmfdiag.common.notation;
+
+
+public interface LineStyleProvider {
+
+ public int getLineColor();
+
+
+ public int getLineWidth();
+
+}
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src-gen/org/eclipse/papyrus/infra/gmfdiag/common/notation/LineTypeStyleProvider.java b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src-gen/org/eclipse/papyrus/infra/gmfdiag/common/notation/LineTypeStyleProvider.java
new file mode 100644
index 00000000000..3a8e0253df4
--- /dev/null
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src-gen/org/eclipse/papyrus/infra/gmfdiag/common/notation/LineTypeStyleProvider.java
@@ -0,0 +1,20 @@
+/*****************************************************************************
+ * Copyright (c) 2012 CEA LIST.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation
+ *****************************************************************************/
+package org.eclipse.papyrus.infra.gmfdiag.common.notation;
+
+import org.eclipse.gmf.runtime.notation.LineType;
+
+public interface LineTypeStyleProvider {
+
+ public LineType getLineType();
+
+}
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src-gen/org/eclipse/papyrus/infra/gmfdiag/common/notation/ListValueStyleProvider.java b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src-gen/org/eclipse/papyrus/infra/gmfdiag/common/notation/ListValueStyleProvider.java
new file mode 100644
index 00000000000..f1766447f1b
--- /dev/null
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src-gen/org/eclipse/papyrus/infra/gmfdiag/common/notation/ListValueStyleProvider.java
@@ -0,0 +1,20 @@
+/*****************************************************************************
+ * Copyright (c) 2012 CEA LIST.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation
+ *****************************************************************************/
+package org.eclipse.papyrus.infra.gmfdiag.common.notation;
+
+import org.eclipse.emf.common.util.EList;
+
+public interface ListValueStyleProvider extends NamedStyleProvider, DataTypeStyleProvider{
+
+ public EList getRawValuesList();
+
+}
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src-gen/org/eclipse/papyrus/infra/gmfdiag/common/notation/MultiDiagramLinkStyleProvider.java b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src-gen/org/eclipse/papyrus/infra/gmfdiag/common/notation/MultiDiagramLinkStyleProvider.java
new file mode 100644
index 00000000000..3acd78834d2
--- /dev/null
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src-gen/org/eclipse/papyrus/infra/gmfdiag/common/notation/MultiDiagramLinkStyleProvider.java
@@ -0,0 +1,18 @@
+/*****************************************************************************
+ * Copyright (c) 2012 CEA LIST.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation
+ *****************************************************************************/
+package org.eclipse.papyrus.infra.gmfdiag.common.notation;
+
+
+public interface MultiDiagramLinkStyleProvider {
+
+
+}
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src-gen/org/eclipse/papyrus/infra/gmfdiag/common/notation/NamedStyleProvider.java b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src-gen/org/eclipse/papyrus/infra/gmfdiag/common/notation/NamedStyleProvider.java
new file mode 100644
index 00000000000..51f4b234a68
--- /dev/null
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src-gen/org/eclipse/papyrus/infra/gmfdiag/common/notation/NamedStyleProvider.java
@@ -0,0 +1,19 @@
+/*****************************************************************************
+ * Copyright (c) 2012 CEA LIST.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation
+ *****************************************************************************/
+package org.eclipse.papyrus.infra.gmfdiag.common.notation;
+
+
+public interface NamedStyleProvider {
+
+ public java.lang.String getName();
+
+}
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src-gen/org/eclipse/papyrus/infra/gmfdiag/common/notation/PageStyleProvider.java b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src-gen/org/eclipse/papyrus/infra/gmfdiag/common/notation/PageStyleProvider.java
new file mode 100644
index 00000000000..f891c3f15d4
--- /dev/null
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src-gen/org/eclipse/papyrus/infra/gmfdiag/common/notation/PageStyleProvider.java
@@ -0,0 +1,28 @@
+/*****************************************************************************
+ * Copyright (c) 2012 CEA LIST.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation
+ *****************************************************************************/
+package org.eclipse.papyrus.infra.gmfdiag.common.notation;
+
+
+public interface PageStyleProvider {
+
+ public int getPageX();
+
+
+ public int getPageY();
+
+
+ public int getPageWidth();
+
+
+ public int getPageHeight();
+
+}
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src-gen/org/eclipse/papyrus/infra/gmfdiag/common/notation/PropertiesSetStyleProvider.java b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src-gen/org/eclipse/papyrus/infra/gmfdiag/common/notation/PropertiesSetStyleProvider.java
new file mode 100644
index 00000000000..a2043690225
--- /dev/null
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src-gen/org/eclipse/papyrus/infra/gmfdiag/common/notation/PropertiesSetStyleProvider.java
@@ -0,0 +1,18 @@
+/*****************************************************************************
+ * Copyright (c) 2012 CEA LIST.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation
+ *****************************************************************************/
+package org.eclipse.papyrus.infra.gmfdiag.common.notation;
+
+
+public interface PropertiesSetStyleProvider extends NamedStyleProvider{
+
+
+}
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src-gen/org/eclipse/papyrus/infra/gmfdiag/common/notation/RoundedCornersStyleProvider.java b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src-gen/org/eclipse/papyrus/infra/gmfdiag/common/notation/RoundedCornersStyleProvider.java
new file mode 100644
index 00000000000..9f228e3ca79
--- /dev/null
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src-gen/org/eclipse/papyrus/infra/gmfdiag/common/notation/RoundedCornersStyleProvider.java
@@ -0,0 +1,19 @@
+/*****************************************************************************
+ * Copyright (c) 2012 CEA LIST.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation
+ *****************************************************************************/
+package org.eclipse.papyrus.infra.gmfdiag.common.notation;
+
+
+public interface RoundedCornersStyleProvider {
+
+ public int getRoundedBendpointsRadius();
+
+}
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src-gen/org/eclipse/papyrus/infra/gmfdiag/common/notation/RoutingStyleProvider.java b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src-gen/org/eclipse/papyrus/infra/gmfdiag/common/notation/RoutingStyleProvider.java
new file mode 100644
index 00000000000..718d0117785
--- /dev/null
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src-gen/org/eclipse/papyrus/infra/gmfdiag/common/notation/RoutingStyleProvider.java
@@ -0,0 +1,41 @@
+/*****************************************************************************
+ * Copyright (c) 2012 CEA LIST.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation
+ *****************************************************************************/
+package org.eclipse.papyrus.infra.gmfdiag.common.notation;
+
+import org.eclipse.gmf.runtime.notation.JumpLinkStatus;
+import org.eclipse.gmf.runtime.notation.JumpLinkType;
+import org.eclipse.gmf.runtime.notation.Routing;
+import org.eclipse.gmf.runtime.notation.Smoothness;
+
+public interface RoutingStyleProvider extends RoundedCornersStyleProvider{
+
+ public Routing getRouting();
+
+
+ public Smoothness getSmoothness();
+
+
+ public boolean isAvoidObstructions();
+
+
+ public boolean isClosestDistance();
+
+
+ public JumpLinkStatus getJumpLinkStatus();
+
+
+ public JumpLinkType getJumpLinkType();
+
+
+ public boolean isJumpLinksReverse();
+
+}
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src-gen/org/eclipse/papyrus/infra/gmfdiag/common/notation/ShapeStyleProvider.java b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src-gen/org/eclipse/papyrus/infra/gmfdiag/common/notation/ShapeStyleProvider.java
new file mode 100644
index 00000000000..db756ae4fe1
--- /dev/null
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src-gen/org/eclipse/papyrus/infra/gmfdiag/common/notation/ShapeStyleProvider.java
@@ -0,0 +1,18 @@
+/*****************************************************************************
+ * Copyright (c) 2012 CEA LIST.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation
+ *****************************************************************************/
+package org.eclipse.papyrus.infra.gmfdiag.common.notation;
+
+
+public interface ShapeStyleProvider extends FontStyleProvider, DescriptionStyleProvider, FillStyleProvider, LineStyleProvider, RoundedCornersStyleProvider{
+
+
+}
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src-gen/org/eclipse/papyrus/infra/gmfdiag/common/notation/SingleValueStyleProvider.java b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src-gen/org/eclipse/papyrus/infra/gmfdiag/common/notation/SingleValueStyleProvider.java
new file mode 100644
index 00000000000..dbbca0423ff
--- /dev/null
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src-gen/org/eclipse/papyrus/infra/gmfdiag/common/notation/SingleValueStyleProvider.java
@@ -0,0 +1,19 @@
+/*****************************************************************************
+ * Copyright (c) 2012 CEA LIST.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation
+ *****************************************************************************/
+package org.eclipse.papyrus.infra.gmfdiag.common.notation;
+
+
+public interface SingleValueStyleProvider extends NamedStyleProvider, DataTypeStyleProvider{
+
+ public java.lang.String getRawValue();
+
+}
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src-gen/org/eclipse/papyrus/infra/gmfdiag/common/notation/SortingStyleProvider.java b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src-gen/org/eclipse/papyrus/infra/gmfdiag/common/notation/SortingStyleProvider.java
new file mode 100644
index 00000000000..da1dbc4a264
--- /dev/null
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src-gen/org/eclipse/papyrus/infra/gmfdiag/common/notation/SortingStyleProvider.java
@@ -0,0 +1,23 @@
+/*****************************************************************************
+ * Copyright (c) 2012 CEA LIST.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation
+ *****************************************************************************/
+package org.eclipse.papyrus.infra.gmfdiag.common.notation;
+
+import org.eclipse.gmf.runtime.notation.Sorting;
+
+public interface SortingStyleProvider {
+
+ public Sorting getSorting();
+
+
+ public java.util.Map getSortingKeys();
+
+}
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src-gen/org/eclipse/papyrus/infra/gmfdiag/common/notation/StringListValueStyleProvider.java b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src-gen/org/eclipse/papyrus/infra/gmfdiag/common/notation/StringListValueStyleProvider.java
new file mode 100644
index 00000000000..bfefcdb2d4f
--- /dev/null
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src-gen/org/eclipse/papyrus/infra/gmfdiag/common/notation/StringListValueStyleProvider.java
@@ -0,0 +1,20 @@
+/*****************************************************************************
+ * Copyright (c) 2012 CEA LIST.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation
+ *****************************************************************************/
+package org.eclipse.papyrus.infra.gmfdiag.common.notation;
+
+import org.eclipse.emf.common.util.EList;
+
+public interface StringListValueStyleProvider extends NamedStyleProvider{
+
+ public EList getStringListValue();
+
+}
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src-gen/org/eclipse/papyrus/infra/gmfdiag/common/notation/StringValueStyleProvider.java b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src-gen/org/eclipse/papyrus/infra/gmfdiag/common/notation/StringValueStyleProvider.java
new file mode 100644
index 00000000000..09d85ece79f
--- /dev/null
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src-gen/org/eclipse/papyrus/infra/gmfdiag/common/notation/StringValueStyleProvider.java
@@ -0,0 +1,19 @@
+/*****************************************************************************
+ * Copyright (c) 2012 CEA LIST.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation
+ *****************************************************************************/
+package org.eclipse.papyrus.infra.gmfdiag.common.notation;
+
+
+public interface StringValueStyleProvider extends NamedStyleProvider{
+
+ public java.lang.String getStringValue();
+
+}
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src-gen/org/eclipse/papyrus/infra/gmfdiag/common/notation/TextStyleProvider.java b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src-gen/org/eclipse/papyrus/infra/gmfdiag/common/notation/TextStyleProvider.java
new file mode 100644
index 00000000000..21c8edf8662
--- /dev/null
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src-gen/org/eclipse/papyrus/infra/gmfdiag/common/notation/TextStyleProvider.java
@@ -0,0 +1,20 @@
+/*****************************************************************************
+ * Copyright (c) 2012 CEA LIST.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation
+ *****************************************************************************/
+package org.eclipse.papyrus.infra.gmfdiag.common.notation;
+
+import org.eclipse.gmf.runtime.notation.TextAlignment;
+
+public interface TextStyleProvider {
+
+ public TextAlignment getTextAlignment();
+
+}
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src-gen/org/eclipse/papyrus/infra/gmfdiag/common/notation/TitleStyleProvider.java b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src-gen/org/eclipse/papyrus/infra/gmfdiag/common/notation/TitleStyleProvider.java
new file mode 100644
index 00000000000..3762618617a
--- /dev/null
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src-gen/org/eclipse/papyrus/infra/gmfdiag/common/notation/TitleStyleProvider.java
@@ -0,0 +1,19 @@
+/*****************************************************************************
+ * Copyright (c) 2012 CEA LIST.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation
+ *****************************************************************************/
+package org.eclipse.papyrus.infra.gmfdiag.common.notation;
+
+
+public interface TitleStyleProvider {
+
+ public boolean isShowTitle();
+
+}
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/OverlayVisibilityIcon.java b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/OverlayVisibilityIcon.java
new file mode 100644
index 00000000000..51b0ae9ad3a
--- /dev/null
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/OverlayVisibilityIcon.java
@@ -0,0 +1,73 @@
+/*****************************************************************************
+ * Copyright (c) 2008 CEA LIST.
+ *
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * Patrick Tessier (CEA LIST) Patrick.tessier@cea.fr - Initial API and implementation
+ *
+ *****************************************************************************/
+package org.eclipse.papyrus.infra.gmfdiag.common;
+
+import org.eclipse.jface.resource.CompositeImageDescriptor;
+import org.eclipse.jface.resource.ImageDescriptor;
+import org.eclipse.swt.graphics.Image;
+import org.eclipse.swt.graphics.ImageData;
+import org.eclipse.swt.graphics.Point;
+
+/**
+ * This class is used to add UML visibility decoration over stereotype icons
+ *
+ */
+public class OverlayVisibilityIcon extends CompositeImageDescriptor {
+
+ /**
+ * Initial image
+ */
+ private Image initialImage;
+
+ /**
+ * Initial image
+ */
+ private ImageDescriptor visDesc;
+
+ /**
+ * Size of the initial image
+ */
+ private Point size;
+
+ /**
+ * Main constructor
+ */
+ public OverlayVisibilityIcon(Image initialImage, ImageDescriptor visibilityDescriptor) {
+ this.initialImage = initialImage;
+ this.visDesc = visibilityDescriptor;
+ this.size = new Point(initialImage.getBounds().width, initialImage.getBounds().height);
+ }
+
+ @Override
+ protected void drawCompositeImage(int arg0, int arg1) {
+ // Draw the base image
+ drawImage(initialImage.getImageData(), 0, 0);
+ ImageData imageData = visDesc.getImageData();
+ drawImage(imageData, size.x - imageData.width, size.y - imageData.height);
+ }
+
+ @Override
+ protected Point getSize() {
+ return size;
+ }
+
+ /**
+ * Get the image formed by overlaying different images on the base image
+ *
+ * @return composite image
+ */
+ public Image getImage() {
+ return createImage();
+ }
+}
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/SemanticFromGMFElement.java b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/SemanticFromGMFElement.java
index e14dd2eddf2..ea885dc4088 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/SemanticFromGMFElement.java
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/SemanticFromGMFElement.java
@@ -15,7 +15,6 @@ package org.eclipse.papyrus.infra.gmfdiag.common;
import org.eclipse.core.runtime.IAdaptable;
import org.eclipse.emf.ecore.EObject;
-import org.eclipse.gmf.runtime.diagram.ui.editparts.GraphicalEditPart;
import org.eclipse.gmf.runtime.diagram.ui.editparts.IGraphicalEditPart;
import org.eclipse.papyrus.infra.core.IElementWithSemantic;
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/SynchronizableGmfDiagramEditor.java b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/SynchronizableGmfDiagramEditor.java
index 7c4ad6bc226..c8968cf5f9c 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/SynchronizableGmfDiagramEditor.java
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/SynchronizableGmfDiagramEditor.java
@@ -16,7 +16,6 @@ package org.eclipse.papyrus.infra.gmfdiag.common;
import java.util.Iterator;
import java.util.List;
-import org.eclipse.emf.workspace.impl.WorkspaceCommandStackImpl;
import org.eclipse.gef.DefaultEditDomain;
import org.eclipse.gef.GraphicalViewer;
import org.eclipse.gef.commands.CommandStack;
@@ -28,10 +27,10 @@ import org.eclipse.papyrus.commands.CheckedDiagramCommandStack;
import org.eclipse.papyrus.infra.core.ui.IRevealSemanticElement;
/**
- /**
+ * /**
*
* This GMF editor contains a methods in order to reveal visual element from a list of semantic element.
- *
+ *
*/
public class SynchronizableGmfDiagramEditor extends DiagramDocumentEditor implements IRevealSemanticElement {
@@ -43,31 +42,33 @@ public class SynchronizableGmfDiagramEditor extends DiagramDocumentEditor implem
/**
* reveal all editpart that represent an element in the given list.
+ *
* @see org.eclipse.papyrus.infra.core.ui.IRevealSemanticElement#revealSemanticElement(java.util.List)
*
*/
public void revealSemanticElement(List<?> elementList) {
//create an instance that can get semantic element from gmf
- SemanticFromGMFElement semanticFromGMFElement= new SemanticFromGMFElement();
+ SemanticFromGMFElement semanticFromGMFElement = new SemanticFromGMFElement();
// get the graphical viewer
- GraphicalViewer graphicalViewer =getGraphicalViewer() ;
- if( graphicalViewer!=null){
+ GraphicalViewer graphicalViewer = getGraphicalViewer();
+ if(graphicalViewer != null) {
//look for among all edit part if the semantic is contained in the list
- Iterator<?> iter=graphicalViewer.getEditPartRegistry().values().iterator();
- IGraphicalEditPart researchedEditPart=null;
- while(iter.hasNext()&& researchedEditPart==null) {
- Object currentEditPart = (Object)iter.next();
+ Iterator<?> iter = graphicalViewer.getEditPartRegistry().values().iterator();
+ IGraphicalEditPart researchedEditPart = null;
+ while(iter.hasNext() && researchedEditPart == null) {
+ Object currentEditPart = iter.next();
//look for only among IPrimary editpart to avoid compartment and labels of links
- if(currentEditPart instanceof IPrimaryEditPart){
- if(elementList.contains(semanticFromGMFElement.getSemanticElement(currentEditPart))){
- researchedEditPart=((IGraphicalEditPart)currentEditPart);}
+ if(currentEditPart instanceof IPrimaryEditPart) {
+ if(elementList.contains(semanticFromGMFElement.getSemanticElement(currentEditPart))) {
+ researchedEditPart = ((IGraphicalEditPart)currentEditPart);
+ }
}
}
//an editpart has been found so put selection on it.
- if(researchedEditPart!=null){
+ if(researchedEditPart != null) {
graphicalViewer.select(researchedEditPart);
}
}
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/editpart/ConnectionEditPart.java b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/editpart/ConnectionEditPart.java
new file mode 100644
index 00000000000..b9e0a32cfe2
--- /dev/null
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/editpart/ConnectionEditPart.java
@@ -0,0 +1,72 @@
+/*****************************************************************************
+ * Copyright (c) 2012 CEA LIST.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation
+ *****************************************************************************/
+package org.eclipse.papyrus.infra.gmfdiag.common.editpart;
+
+import org.eclipse.emf.ecore.EClass;
+import org.eclipse.gmf.runtime.diagram.ui.editparts.ConnectionNodeEditPart;
+import org.eclipse.gmf.runtime.diagram.ui.l10n.DiagramColorRegistry;
+import org.eclipse.gmf.runtime.notation.NotationPackage;
+import org.eclipse.gmf.runtime.notation.View;
+import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.StyleEditPolicy;
+import org.eclipse.papyrus.infra.gmfdiag.common.notation.LineStyleProvider;
+
+
+/**
+ * Abstract edit part for all connection nodes. CSS Ready.
+ */
+//TODO : Intercept the GMF Styles and retrieve the values from the CSS Engine
+//TODO: Move this EditPart to infra.gmfdiag.common
+public abstract class ConnectionEditPart extends ConnectionNodeEditPart implements IPapyrusEditPart, IStylableEditPart {
+
+ public ConnectionEditPart(View view) {
+ super(view);
+ //TODO: Implement refresh* to use the StyleEditPolicy
+ }
+
+
+ //Styles implementation
+
+ // refreshVisibility();
+ // refreshRoutingStyles();
+ // refreshSmoothness();
+ // refreshRoundedBendpoints();
+ // refreshJumplinks();
+ // refreshBendpoints();
+ // refreshFont();
+
+ @Override
+ protected final void refreshForegroundColor() {
+ LineStyleProvider provider = (LineStyleProvider)getStyleProvider(NotationPackage.eINSTANCE.getLineStyle());
+ if(provider == null) {
+ super.refreshForegroundColor();
+ return;
+ }
+ setForegroundColor(DiagramColorRegistry.getInstance().getColor(Integer.valueOf(provider.getLineColor())));
+ }
+
+ /**
+ * Returns the StyleProvider for the given Style EClass
+ * May be null if a StyleEditPolicy is not defined.
+ *
+ * @param styleClass
+ * @return
+ */
+ protected Object getStyleProvider(EClass styleClass) {
+ Object styleEditPolicy = getEditPolicy(StyleEditPolicy.KEY);
+ if(styleEditPolicy == null || !(styleEditPolicy instanceof StyleEditPolicy)) {
+ return null;
+ }
+
+ Object styleProvider = ((StyleEditPolicy)styleEditPolicy).getStyle(styleClass);
+ return styleProvider;
+ }
+}
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/editpart/IPapyrusEditPart.java b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/editpart/IPapyrusEditPart.java
new file mode 100644
index 00000000000..cf3aa85306f
--- /dev/null
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/editpart/IPapyrusEditPart.java
@@ -0,0 +1,20 @@
+package org.eclipse.papyrus.infra.gmfdiag.common.editpart;
+
+import org.eclipse.draw2d.IFigure;
+
+/**
+ * This is an editPart in which we can get primaryShape to obtain the figure
+ *
+ */
+public interface IPapyrusEditPart {
+
+ /**
+ * <p>
+ * Returns the primary shape being the View of this edit part.
+ * </p>
+ * <b>Warning</b> It should never return <code>null</code>
+ *
+ * @return the primary shape associated to this edit part.
+ */
+ public IFigure getPrimaryShape();
+}
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/editpart/IStylableEditPart.java b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/editpart/IStylableEditPart.java
new file mode 100644
index 00000000000..90d2f4fc844
--- /dev/null
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/editpart/IStylableEditPart.java
@@ -0,0 +1,17 @@
+/*****************************************************************************
+ * Copyright (c) 2012 CEA LIST.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation
+ *****************************************************************************/
+package org.eclipse.papyrus.infra.gmfdiag.common.editpart;
+
+
+public interface IStylableEditPart {
+
+}
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/editpart/NodeEditPart.java b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/editpart/NodeEditPart.java
new file mode 100644
index 00000000000..a744c4bc197
--- /dev/null
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/editpart/NodeEditPart.java
@@ -0,0 +1,300 @@
+/*****************************************************************************
+ * Copyright (c) 2008-2009 CEA LIST.
+ *
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * Patrick Tessier (CEA LIST) Patrick.tessier@cea.fr - Initial API and implementation
+ * Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Style implementation
+ *
+ *****************************************************************************/
+package org.eclipse.papyrus.infra.gmfdiag.common.editpart;
+
+import org.eclipse.emf.common.notify.Notification;
+import org.eclipse.emf.ecore.EClass;
+import org.eclipse.gmf.runtime.diagram.ui.editparts.AbstractBorderedShapeEditPart;
+import org.eclipse.gmf.runtime.diagram.ui.l10n.DiagramColorRegistry;
+import org.eclipse.gmf.runtime.gef.ui.figures.NodeFigure;
+import org.eclipse.gmf.runtime.notation.FillStyle;
+import org.eclipse.gmf.runtime.notation.FontStyle;
+import org.eclipse.gmf.runtime.notation.NotationPackage;
+import org.eclipse.gmf.runtime.notation.View;
+import org.eclipse.gmf.runtime.notation.datatype.GradientData;
+import org.eclipse.papyrus.infra.emf.appearance.helper.ShadowFigureHelper;
+import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.StyleEditPolicy;
+import org.eclipse.papyrus.infra.gmfdiag.common.figure.node.IPapyrusNodeFigure;
+import org.eclipse.papyrus.infra.gmfdiag.common.notation.FillStyleProvider;
+import org.eclipse.papyrus.infra.gmfdiag.common.notation.FontStyleProvider;
+import org.eclipse.papyrus.infra.gmfdiag.common.notation.LineStyleProvider;
+import org.eclipse.swt.SWT;
+import org.eclipse.swt.graphics.Color;
+import org.eclipse.swt.graphics.FontData;
+
+/**
+ * this uml edit part can refresh shadow and gradient.
+ */
+//TODO: Move this EditPart to infra.gmfdiag.common
+//TODO: Move IPapyrusNodeFigure to infra.gmfdiag.common
+//TODO: Move ShadowFigureHelper to infra.gmfdiag.common
+public abstract class NodeEditPart extends AbstractBorderedShapeEditPart implements IPapyrusEditPart, IStylableEditPart {
+
+ public NodeEditPart(View view) {
+ super(view);
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ @Override
+ protected NodeFigure createMainFigure() {
+ return createNodeFigure();
+ }
+
+ /**
+ * <p>
+ * Returns the primary shape being the View of this edit part.
+ * </p>
+ * <b>Warning</b> It should never return <code>null</code>
+ *
+ * @return the primary shape associated to this edit part.
+ */
+ public abstract IPapyrusNodeFigure getPrimaryShape();
+
+ /**
+ * {@inheritDoc}
+ */
+ @Override
+ public boolean supportsGradient() {
+ return true;
+ }
+
+ /**
+ *
+ * {@inheritDoc}
+ */
+ @Override
+ protected void handleNotificationEvent(Notification event) {
+ super.handleNotificationEvent(event);
+
+ // Update the figure when the line width changes
+ Object feature = event.getFeature();
+ if((getModel() != null) && (getModel() == event.getNotifier())) {
+ if(NotationPackage.eINSTANCE.getLineStyle_LineWidth().equals(feature)) {
+ refreshLineWidth();
+ } else if(NotationPackage.eINSTANCE.getLineTypeStyle_LineType().equals(feature)) {
+ refreshLineType();
+ }
+ }
+
+ // set the figure active when the feature of the of a class is true
+ if(resolveSemanticElement() != null) {
+ refreshShadow();
+ }
+ }
+
+ @Override
+ public void activate() {
+ super.activate();
+ }
+
+ @Override
+ protected void setLineWidth(int width) {
+ if(width < 0) {
+ width = 1;
+ }
+ getPrimaryShape().setLineWidth(width);
+ }
+
+ @Override
+ protected void setLineType(int style) {
+ getPrimaryShape().setLineStyle(style);
+ }
+
+ /**
+ * Override to set the transparency to the correct figure
+ */
+ @Override
+ protected void setTransparency(int transp) {
+ getPrimaryShape().setTransparency(transp);
+ }
+
+ /**
+ * sets the back ground color of this edit part
+ *
+ * @param color
+ * the new value of the back ground color
+ */
+ @Override
+ protected void setBackgroundColor(Color color) {
+ getPrimaryShape().setBackgroundColor(color);
+ getPrimaryShape().setIsUsingGradient(false);
+ getPrimaryShape().setGradientData(-1, -1, 0);
+ }
+
+ /**
+ * Override to set the gradient data to the correct figure
+ */
+ @Override
+ protected void setGradient(GradientData gradient) {
+ IPapyrusNodeFigure fig = getPrimaryShape();
+ if(gradient != null) {
+ fig.setIsUsingGradient(true);
+ fig.setGradientData(getFillColor(), gradient.getGradientColor1(), gradient.getGradientStyle());
+ } else {
+ fig.setIsUsingGradient(false);
+ }
+ }
+
+ /**
+ * sets the font color
+ *
+ * @param color
+ * the new value of the font color
+ */
+ @Override
+ protected void setFontColor(Color color) {
+ // NULL implementation
+ }
+
+ /**
+ * sets the fore ground color of this edit part's figure
+ *
+ * @param color
+ * the new value of the foregroundcolor
+ */
+ @Override
+ protected void setForegroundColor(Color color) {
+ getPrimaryShape().setForegroundColor(color);
+ }
+
+ @Override
+ protected void refreshVisuals() {
+ super.refreshVisuals();
+ refreshShadow();
+ refreshLineType();
+ refreshLineWidth();
+ refreshFontColor();
+ }
+
+ //Style Implementation
+
+ @Override
+ protected final void refreshBackgroundColor() {
+ if(supportsGradient()) {
+ GradientData gradient = getGradient();
+ if(gradient != null) {
+ setGradient(gradient);
+ return;
+ }
+ }
+
+ setBackgroundColor(DiagramColorRegistry.getInstance().getColor(getFillColor()));
+ }
+
+ protected int getFillColor() {
+ FillStyleProvider provider = (FillStyleProvider)getStyleProvider(NotationPackage.eINSTANCE.getFillStyle());
+ if(provider == null) {
+ return ((FillStyle)getNotationView().getStyle(NotationPackage.eINSTANCE.getFillStyle())).getFillColor();
+ }
+ return provider.getFillColor();
+ }
+
+ protected GradientData getGradient() {
+ FillStyleProvider provider = (FillStyleProvider)getStyleProvider(NotationPackage.eINSTANCE.getFillStyle());
+ if(provider == null) {
+ return ((FillStyle)getNotationView().getStyle(NotationPackage.eINSTANCE.getFillStyle())).getGradient();
+ }
+ return provider.getGradient();
+ }
+
+ /**
+ * Refresh the shadow of the figure
+ */
+ protected final void refreshShadow() {
+ getPrimaryShape().setShadow(ShadowFigureHelper.getShadowFigureValue((View)getModel()));
+ }
+
+ // @Override
+ // protected final void refreshLineType() {
+ //
+ // }
+ //
+ // @Override
+ // protected final void refreshLineWidth() {
+ //
+ // }
+ //
+
+ @Override
+ protected final void refreshForegroundColor() {
+ LineStyleProvider provider = (LineStyleProvider)getStyleProvider(NotationPackage.eINSTANCE.getLineStyle());
+
+ if(provider == null) {
+ super.refreshForegroundColor();
+ return;
+ }
+
+ setForegroundColor(DiagramColorRegistry.getInstance().getColor(Integer.valueOf(provider.getLineColor())));
+ }
+
+
+ @Override
+ protected void refreshFont() {
+ FontStyle style = (FontStyle)getNotationView().getStyle(NotationPackage.eINSTANCE.getFontStyle());
+ if(style != null) {
+ setFont(getFontData(style));
+ }
+ }
+
+ /**
+ * Update the fontData
+ *
+ * @param style
+ * the font style of the figure
+ * @return the new font data to use
+ */
+ protected FontData getFontData(FontStyle style) {
+ FontStyleProvider provider = (FontStyleProvider)getStyleProvider(NotationPackage.eINSTANCE.getFontStyle());
+
+ if(provider == null) {
+ return new FontData(style.getFontName(), style.getFontHeight(), (style.isBold() ? SWT.BOLD : SWT.NORMAL) | (style.isItalic() ? SWT.ITALIC : SWT.NORMAL));
+ }
+
+ return new FontData(provider.getFontName(), provider.getFontHeight(), (provider.isBold() ? SWT.BOLD : SWT.NORMAL) | (provider.isItalic() ? SWT.ITALIC : SWT.NORMAL));
+ }
+
+ // @Override
+ // protected final void refreshBounds() {
+ //
+ // }
+ //
+ // @Override
+ // protected final void refreshVisibility() {
+ //
+ // }
+
+ @Override
+ protected final void refreshFontColor() {
+ FontStyleProvider provider = (FontStyleProvider)getStyleProvider(NotationPackage.eINSTANCE.getFontStyle());
+ if(provider == null) {
+ super.refreshFontColor();
+ return;
+ }
+
+ setFontColor(DiagramColorRegistry.getInstance().getColor(Integer.valueOf(provider.getFontColor())));
+ }
+
+ protected Object getStyleProvider(EClass styleClass) {
+ Object styleEditPolicy = getEditPolicy(StyleEditPolicy.KEY);
+ if(styleEditPolicy == null || !(styleEditPolicy instanceof StyleEditPolicy)) {
+ return null;
+ }
+
+ Object styleProvider = ((StyleEditPolicy)styleEditPolicy).getStyle(styleClass);
+ return styleProvider;
+ }
+}
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/editpart/PapyrusCompartmentEditPart.java b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/editpart/PapyrusCompartmentEditPart.java
new file mode 100644
index 00000000000..9a4f08885f4
--- /dev/null
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/editpart/PapyrusCompartmentEditPart.java
@@ -0,0 +1,87 @@
+/*****************************************************************************
+ * Copyright (c) 2012 CEA LIST.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation
+ *****************************************************************************/
+package org.eclipse.papyrus.infra.gmfdiag.common.editpart;
+
+import org.eclipse.emf.ecore.EClass;
+import org.eclipse.emf.ecore.EObject;
+import org.eclipse.gmf.runtime.diagram.ui.editparts.CompartmentEditPart;
+import org.eclipse.gmf.runtime.diagram.ui.l10n.DiagramColorRegistry;
+import org.eclipse.gmf.runtime.notation.FontStyle;
+import org.eclipse.gmf.runtime.notation.NotationPackage;
+import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.StyleEditPolicy;
+import org.eclipse.papyrus.infra.gmfdiag.common.notation.FontStyleProvider;
+import org.eclipse.swt.SWT;
+import org.eclipse.swt.graphics.FontData;
+
+
+public abstract class PapyrusCompartmentEditPart extends CompartmentEditPart implements IStylableEditPart {
+
+ public PapyrusCompartmentEditPart(EObject model) {
+ super(model);
+ }
+
+ @Override
+ protected void refreshVisuals() {
+ super.refreshVisuals();
+ refreshFont();
+ refreshFontColor();
+ }
+
+ //Style support
+
+ @Override
+ protected void refreshFont() {
+ FontStyle style = (FontStyle)getNotationView().getStyle(NotationPackage.eINSTANCE.getFontStyle());
+ if(style != null) {
+ setFont(getFontData(style));
+ }
+ }
+
+ /**
+ * Update the fontData
+ *
+ * @param style
+ * the font style of the figure
+ * @return the new font data to use
+ */
+ protected FontData getFontData(FontStyle style) {
+ FontStyleProvider provider = (FontStyleProvider)getStyleProvider(NotationPackage.eINSTANCE.getFontStyle());
+
+ if(provider == null) {
+ return new FontData(style.getFontName(), style.getFontHeight(), (style.isBold() ? SWT.BOLD : SWT.NORMAL) | (style.isItalic() ? SWT.ITALIC : SWT.NORMAL));
+ }
+
+ return new FontData(provider.getFontName(), provider.getFontHeight(), (provider.isBold() ? SWT.BOLD : SWT.NORMAL) | (provider.isItalic() ? SWT.ITALIC : SWT.NORMAL));
+ }
+
+ @Override
+ protected final void refreshFontColor() {
+ FontStyleProvider provider = (FontStyleProvider)getStyleProvider(NotationPackage.eINSTANCE.getFontStyle());
+ if(provider == null) {
+ super.refreshFontColor();
+ return;
+ }
+
+ setFontColor(DiagramColorRegistry.getInstance().getColor(Integer.valueOf(provider.getFontColor())));
+ }
+
+ protected Object getStyleProvider(EClass styleClass) {
+ Object styleEditPolicy = getEditPolicy(StyleEditPolicy.KEY);
+ if(styleEditPolicy == null || !(styleEditPolicy instanceof StyleEditPolicy)) {
+ return null;
+ }
+
+ Object styleProvider = ((StyleEditPolicy)styleEditPolicy).getStyle(styleClass);
+ return styleProvider;
+ }
+
+}
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/editpart/PapyrusDiagramEditPart.java b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/editpart/PapyrusDiagramEditPart.java
new file mode 100644
index 00000000000..52ebdbe22a1
--- /dev/null
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/editpart/PapyrusDiagramEditPart.java
@@ -0,0 +1,24 @@
+/*****************************************************************************
+ * Copyright (c) 2012 CEA LIST.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation
+ *****************************************************************************/
+package org.eclipse.papyrus.infra.gmfdiag.common.editpart;
+
+import org.eclipse.gmf.runtime.diagram.ui.editparts.DiagramEditPart;
+import org.eclipse.gmf.runtime.notation.View;
+
+
+public class PapyrusDiagramEditPart extends DiagramEditPart implements IStylableEditPart {
+
+ public PapyrusDiagramEditPart(View diagramView) {
+ super(diagramView);
+ }
+
+}
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/editpart/PapyrusLabelEditPart.java b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/editpart/PapyrusLabelEditPart.java
new file mode 100644
index 00000000000..40f87277dc2
--- /dev/null
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/editpart/PapyrusLabelEditPart.java
@@ -0,0 +1,87 @@
+/*****************************************************************************
+ * Copyright (c) 2012 CEA LIST.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation
+ *****************************************************************************/
+package org.eclipse.papyrus.infra.gmfdiag.common.editpart;
+
+import org.eclipse.emf.ecore.EClass;
+import org.eclipse.gmf.runtime.diagram.ui.editparts.LabelEditPart;
+import org.eclipse.gmf.runtime.diagram.ui.l10n.DiagramColorRegistry;
+import org.eclipse.gmf.runtime.notation.FontStyle;
+import org.eclipse.gmf.runtime.notation.NotationPackage;
+import org.eclipse.gmf.runtime.notation.View;
+import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.StyleEditPolicy;
+import org.eclipse.papyrus.infra.gmfdiag.common.notation.FontStyleProvider;
+import org.eclipse.swt.SWT;
+import org.eclipse.swt.graphics.FontData;
+
+
+public abstract class PapyrusLabelEditPart extends LabelEditPart implements IStylableEditPart {
+
+ public PapyrusLabelEditPart(View view) {
+ super(view);
+ }
+
+ //Style support
+
+ @Override
+ protected void refreshVisuals() {
+ super.refreshVisuals();
+ refreshFont();
+ refreshFontColor();
+ }
+
+ @Override
+ protected void refreshFont() {
+ FontStyle style = (FontStyle)getNotationView().getStyle(NotationPackage.eINSTANCE.getFontStyle());
+ if(style != null) {
+ setFont(getFontData(style));
+ }
+ }
+
+ /**
+ * Update the fontData
+ *
+ * @param style
+ * the font style of the figure
+ * @return the new font data to use
+ */
+ protected FontData getFontData(FontStyle style) {
+ FontStyleProvider provider = (FontStyleProvider)getStyleProvider(NotationPackage.eINSTANCE.getFontStyle());
+
+ if(provider == null) {
+ return new FontData(style.getFontName(), style.getFontHeight(), (style.isBold() ? SWT.BOLD : SWT.NORMAL) | (style.isItalic() ? SWT.ITALIC : SWT.NORMAL));
+ }
+
+ return new FontData(provider.getFontName(), provider.getFontHeight(), (provider.isBold() ? SWT.BOLD : SWT.NORMAL) | (provider.isItalic() ? SWT.ITALIC : SWT.NORMAL));
+ }
+
+ @Override
+ protected final void refreshFontColor() {
+ FontStyleProvider provider = (FontStyleProvider)getStyleProvider(NotationPackage.eINSTANCE.getFontStyle());
+ if(provider == null) {
+ super.refreshFontColor();
+ return;
+ }
+
+ setFontColor(DiagramColorRegistry.getInstance().getColor(Integer.valueOf(provider.getFontColor())));
+ }
+
+ protected Object getStyleProvider(EClass styleClass) {
+ Object styleEditPolicy = getEditPolicy(StyleEditPolicy.KEY);
+ if(styleEditPolicy == null || !(styleEditPolicy instanceof StyleEditPolicy)) {
+ return null;
+ }
+
+ Object styleProvider = ((StyleEditPolicy)styleEditPolicy).getStyle(styleClass);
+ return styleProvider;
+ }
+
+}
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/editpart/ResizeableListCompartmentEditPart.java b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/editpart/ResizeableListCompartmentEditPart.java
new file mode 100644
index 00000000000..51a9dcc3188
--- /dev/null
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/editpart/ResizeableListCompartmentEditPart.java
@@ -0,0 +1,122 @@
+/*****************************************************************************
+ * Copyright (c) 2009 CEA LIST.
+ *
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * Patrick Tessier (CEA LIST) Patrick.tessier@cea.fr - Initial API and implementation
+ *
+ *****************************************************************************/
+package org.eclipse.papyrus.infra.gmfdiag.common.editpart;
+
+import org.eclipse.draw2d.geometry.Dimension;
+import org.eclipse.draw2d.geometry.Point;
+import org.eclipse.draw2d.geometry.Rectangle;
+import org.eclipse.emf.common.notify.Notification;
+import org.eclipse.emf.ecore.EClass;
+import org.eclipse.emf.ecore.EObject;
+import org.eclipse.gef.GraphicalEditPart;
+import org.eclipse.gmf.runtime.diagram.ui.editparts.ListCompartmentEditPart;
+import org.eclipse.gmf.runtime.diagram.ui.l10n.DiagramColorRegistry;
+import org.eclipse.gmf.runtime.notation.FontStyle;
+import org.eclipse.gmf.runtime.notation.NotationPackage;
+import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.StyleEditPolicy;
+import org.eclipse.papyrus.infra.gmfdiag.common.notation.FontStyleProvider;
+import org.eclipse.swt.SWT;
+import org.eclipse.swt.graphics.FontData;
+
+public abstract class ResizeableListCompartmentEditPart extends ListCompartmentEditPart implements IStylableEditPart {
+
+ public ResizeableListCompartmentEditPart(EObject model) {
+ super(model);
+ }
+
+ /**
+ * refresh the bounds
+ */
+ protected void refreshBounds() {
+ int width = ((Integer)getStructuralFeatureValue(NotationPackage.eINSTANCE.getSize_Width())).intValue();
+ int height = ((Integer)getStructuralFeatureValue(NotationPackage.eINSTANCE.getSize_Height())).intValue();
+ Dimension size = new Dimension(width, height);
+ int x = ((Integer)getStructuralFeatureValue(NotationPackage.eINSTANCE.getLocation_X())).intValue();
+ int y = ((Integer)getStructuralFeatureValue(NotationPackage.eINSTANCE.getLocation_Y())).intValue();
+ Point loc = new Point(x, y);
+ ((GraphicalEditPart)getParent()).setLayoutConstraint(this, getFigure(), new Rectangle(loc, size));
+ }
+
+ /**
+ *
+ * {@inheritDoc}
+ */
+ @Override
+ protected void refreshVisuals() {
+ super.refreshVisuals();
+ refreshBounds();
+ }
+
+ /**
+ *
+ * {@inheritDoc}
+ */
+ @Override
+ protected void handleNotificationEvent(Notification notification) {
+ Object feature = notification.getFeature();
+ if(NotationPackage.eINSTANCE.getSize_Width().equals(feature) || NotationPackage.eINSTANCE.getSize_Height().equals(feature) || NotationPackage.eINSTANCE.getLocation_X().equals(feature) || NotationPackage.eINSTANCE.getLocation_Y().equals(feature)) {
+ refreshBounds();
+ }
+ super.handleNotificationEvent(notification);
+ }
+
+ //Style support
+
+ @Override
+ protected void refreshFont() {
+ FontStyle style = (FontStyle)getNotationView().getStyle(NotationPackage.eINSTANCE.getFontStyle());
+ if(style != null) {
+ setFont(getFontData(style));
+ }
+ }
+
+ /**
+ * Update the fontData
+ *
+ * @param style
+ * the font style of the figure
+ * @return the new font data to use
+ */
+ protected FontData getFontData(FontStyle style) {
+ FontStyleProvider provider = (FontStyleProvider)getStyleProvider(NotationPackage.eINSTANCE.getFontStyle());
+
+ if(provider == null) {
+ return new FontData(style.getFontName(), style.getFontHeight(), (style.isBold() ? SWT.BOLD : SWT.NORMAL) | (style.isItalic() ? SWT.ITALIC : SWT.NORMAL));
+ }
+
+ return new FontData(provider.getFontName(), provider.getFontHeight(), (provider.isBold() ? SWT.BOLD : SWT.NORMAL) | (provider.isItalic() ? SWT.ITALIC : SWT.NORMAL));
+ }
+
+ @Override
+ protected final void refreshFontColor() {
+ FontStyleProvider provider = (FontStyleProvider)getStyleProvider(NotationPackage.eINSTANCE.getFontStyle());
+ if(provider == null) {
+ super.refreshFontColor();
+ return;
+ }
+
+ setFontColor(DiagramColorRegistry.getInstance().getColor(Integer.valueOf(provider.getFontColor())));
+ }
+
+ protected Object getStyleProvider(EClass styleClass) {
+ Object styleEditPolicy = getEditPolicy(StyleEditPolicy.KEY);
+ if(styleEditPolicy == null || !(styleEditPolicy instanceof StyleEditPolicy)) {
+ return null;
+ }
+
+ Object styleProvider = ((StyleEditPolicy)styleEditPolicy).getStyle(styleClass);
+ return styleProvider;
+ }
+
+}
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/editpolicies/AbstractStyleEditPolicy.java b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/editpolicies/AbstractStyleEditPolicy.java
new file mode 100644
index 00000000000..45edc35aeec
--- /dev/null
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/editpolicies/AbstractStyleEditPolicy.java
@@ -0,0 +1,53 @@
+/*****************************************************************************
+ * Copyright (c) 2012 CEA LIST.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation
+ *****************************************************************************/
+package org.eclipse.papyrus.infra.gmfdiag.common.editpolicies;
+
+import java.util.HashMap;
+import java.util.Map;
+
+import org.eclipse.emf.ecore.EClass;
+import org.eclipse.gmf.runtime.diagram.ui.editparts.IGraphicalEditPart;
+import org.eclipse.gmf.runtime.gef.ui.internal.editpolicies.GraphicalEditPolicyEx;
+import org.eclipse.gmf.runtime.notation.View;
+
+
+@SuppressWarnings("restriction")
+public abstract class AbstractStyleEditPolicy extends GraphicalEditPolicyEx implements StyleEditPolicy {
+
+ private final Map<EClass, Object> styleProviders = new HashMap<EClass, Object>();
+
+ @Override
+ public void activate() {
+ super.activate();
+ }
+
+ @Override
+ public void deactivate() {
+ styleProviders.clear();
+ }
+
+ @Override
+ public void refresh() {
+ super.refresh();
+ styleProviders.clear();
+ }
+
+ public Object getStyle(EClass styleClass) {
+ if(!styleProviders.containsKey(styleClass)) {
+ View view = ((IGraphicalEditPart)getHost()).getNotationView();
+ styleProviders.put(styleClass, findStyle(styleClass, view));
+ }
+ return styleProviders.get(styleClass);
+ }
+
+ protected abstract Object findStyle(EClass styleClass, View view);
+}
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/editpolicies/IMaskManagedLabelEditPolicy.java b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/editpolicies/IMaskManagedLabelEditPolicy.java
new file mode 100644
index 00000000000..1afe1f6f924
--- /dev/null
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/editpolicies/IMaskManagedLabelEditPolicy.java
@@ -0,0 +1,95 @@
+/*****************************************************************************
+ * Copyright (c) 2008, 2009 CEA LIST.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * Remi Schnekenburger (CEA LIST) - Initial API and implementation
+ *
+ *****************************************************************************/
+package org.eclipse.papyrus.infra.gmfdiag.common.editpolicies;
+
+import java.util.Collection;
+import java.util.Map;
+
+/**
+ * Interface for all edit policies that manage the label of a {@link GraphicalEditPart}. The label must be controlled by a system of mask,
+ * i.e. the label shows or not some part of the string.
+ */
+public interface IMaskManagedLabelEditPolicy {
+
+ /** key for this edit policy */
+ public String MASK_MANAGED_LABEL_EDIT_POLICY = "MaskManagedLabelPolicy";
+
+ /**
+ * Retrieve the mask name for the given mask value.
+ *
+ * @param value
+ * the value of the given mask
+ * @return the mask name
+ */
+ // @unused
+ public String getMaskLabel(int value);
+
+ /**
+ * Returns the {@link Collection} of mask names
+ *
+ * @return the {@link Collection} of mask names
+ */
+ // @unused
+ public Collection<String> getMaskLabels();
+
+ /**
+ * Returns the {@link Collection} of mask values
+ *
+ * @return the {@link Collection} of mask values
+ */
+ // @unused
+ public Collection<Integer> getMaskValues();
+
+ /**
+ * Returns the {@link Map} of masks
+ *
+ * @return the {@link Map} of masks
+ */
+ public Map<Integer, String> getMasks();
+
+ /**
+ * Retrieve the current display Value for the current host edit part.
+ *
+ * @return the current display Value for the current host edit part.
+ */
+ public int getCurrentDisplayValue();
+
+ /**
+ * Retrieve the default display Value for the current host edit part.
+ *
+ * @return the default display Value for the current host edit part.
+ */
+ public int getDefaultDisplayValue();
+
+ /**
+ * Refreshes the display of the edit part
+ */
+ public void refreshDisplay();
+
+ /**
+ * Sets the new Value for the element that manages the mask value
+ */
+ public void updateDisplayValue(int newValue);
+
+ /**
+ * Sets the default display value for the edit part
+ */
+ public void setDefaultDisplayValue();
+
+ /**
+ * returns the preference page ID
+ *
+ * @return
+ */
+ public String getPreferencePageID();
+}
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/editpolicies/StyleEditPolicy.java b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/editpolicies/StyleEditPolicy.java
new file mode 100644
index 00000000000..56e455fb903
--- /dev/null
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/editpolicies/StyleEditPolicy.java
@@ -0,0 +1,23 @@
+/*****************************************************************************
+ * Copyright (c) 2012 CEA LIST.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation
+ *****************************************************************************/
+package org.eclipse.papyrus.infra.gmfdiag.common.editpolicies;
+
+import org.eclipse.emf.ecore.EClass;
+import org.eclipse.gef.EditPolicy;
+
+public interface StyleEditPolicy extends EditPolicy {
+
+ public static final String KEY = "StyleEditPolicy"; //$NON-NLS-1$
+
+ public Object getStyle(EClass styleClass);
+
+}
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/figure/node/IPapyrusNodeFigure.java b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/figure/node/IPapyrusNodeFigure.java
new file mode 100644
index 00000000000..50eb9654386
--- /dev/null
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/figure/node/IPapyrusNodeFigure.java
@@ -0,0 +1,118 @@
+/*****************************************************************************
+ * Copyright (c) 2009 CEA LIST.
+ *
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * Patrick Tessier (CEA LIST) Patrick.tessier@cea.fr - Initial API and implementation
+ *
+ *****************************************************************************/
+package org.eclipse.papyrus.infra.gmfdiag.common.figure.node;
+
+import org.eclipse.draw2d.IFigure;
+import org.eclipse.gmf.runtime.gef.ui.figures.NodeFigure;
+import org.eclipse.swt.graphics.Color;
+
+/**
+ * Figure associated to {@link NodeEditPart}
+ */
+//TODO: Move to infra.gmfdiag.common
+public interface IPapyrusNodeFigure extends IFigure {
+
+ /**
+ * get the color of the border
+ *
+ * @return the color
+ */
+ public Color getBorderColor();
+
+ /**
+ *
+ * @return true is the figure is in the mode shadow
+ */
+ // @unused
+ public boolean isShadow();
+
+ /**
+ * set the color for the border
+ *
+ * @param borderColor
+ * color
+ */
+ // @unused
+ public void setBorderColor(Color borderColor);
+
+ /**
+ * set the shadow
+ *
+ * @param shadow
+ * a boolean true if we want to display the shadow
+ */
+ public void setShadow(boolean shadow);
+
+ /**
+ * Comes from GMF
+ * <p>
+ * Returns the primary shape being the View of this edit part.
+ * </p>
+ * <b>Warning</b> It should never return <code>null</code>
+ *
+ * @return the primary shape associated to this edit part.
+ */
+ public void setTransparency(int transparency);
+
+ /**
+ * Comes from GMF Sets values defining gradient data.
+ *
+ * @param gradientColor1
+ * @param gradientColor2
+ * @param gradientStyle
+ * @since 1.2
+ */
+ public void setGradientData(int gradientColor1, int gradientColor2, int gradientStyle);
+
+ /**
+ * Comes from GMF Sets the value of isUsingGradient
+ *
+ * @param b
+ * value for isUsingGradient
+ * @since 1.2
+ */
+ public void setIsUsingGradient(boolean b);
+
+ /**
+ * Comes from GMF {@link NodeFigure#setLineStyle}
+ *
+ * @param s
+ * the new line style
+ * @since 1.2
+ */
+ public void setLineStyle(int s);
+
+ /**
+ * Comes from GMF {@link NodeFigure#getLineStyle}
+ *
+ * @since 1.2
+ */
+ public int getLineStyle();
+
+ /**
+ * Comes from GMF {@link NodeFigure#setLineWidth}
+ *
+ * @param w
+ * the new width
+ * @since 1.2
+ */
+ public void setLineWidth(int w);
+
+ /**
+ * Comes from GMF {@link NodeFigure#getLineWidth}
+ *
+ * @since 1.2
+ */
+ public int getLineWidth();
+}
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/handler/RefreshHandler.java b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/handler/RefreshHandler.java
new file mode 100644
index 00000000000..4908d43bc4f
--- /dev/null
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/handler/RefreshHandler.java
@@ -0,0 +1,45 @@
+/*****************************************************************************
+ * Copyright (c) 2012 CEA LIST.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation
+ *****************************************************************************/
+package org.eclipse.papyrus.infra.gmfdiag.common.handler;
+
+import org.eclipse.core.commands.AbstractHandler;
+import org.eclipse.core.commands.ExecutionEvent;
+import org.eclipse.core.commands.ExecutionException;
+import org.eclipse.gmf.runtime.diagram.ui.editparts.DiagramEditPart;
+import org.eclipse.gmf.runtime.diagram.ui.parts.DiagramEditor;
+import org.eclipse.papyrus.infra.core.utils.EditorUtils;
+import org.eclipse.papyrus.infra.gmfdiag.common.helper.DiagramHelper;
+import org.eclipse.ui.IEditorPart;
+
+/**
+ * Handles the refresh command on the Papyrus editor (F5)
+ *
+ * Refreshes the active diagram
+ *
+ * @author Camille Letavernier
+ */
+//TODO: To be refactored. Move to infra/gmfdiag/menu when the plugin exists
+public class RefreshHandler extends AbstractHandler {
+
+ public Object execute(ExecutionEvent event) throws ExecutionException {
+ IEditorPart activeEditor = EditorUtils.getMultiDiagramEditor().getActiveEditor();
+ if(activeEditor instanceof DiagramEditor) {
+ DiagramEditor diagramEditor = (DiagramEditor)activeEditor;
+ DiagramEditPart topEditPart = diagramEditor.getDiagramEditPart();
+ if(topEditPart != null) {
+ DiagramHelper.refresh(topEditPart, true);
+ }
+ }
+
+ return null;
+ }
+}
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/helper/DiagramHelper.java b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/helper/DiagramHelper.java
new file mode 100644
index 00000000000..470f3f05b26
--- /dev/null
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/helper/DiagramHelper.java
@@ -0,0 +1,42 @@
+/*****************************************************************************
+ * Copyright (c) 2012 CEA LIST.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation
+ *****************************************************************************/
+package org.eclipse.papyrus.infra.gmfdiag.common.helper;
+
+import java.util.List;
+
+import org.eclipse.gef.EditPart;
+import org.eclipse.gmf.runtime.diagram.ui.editparts.DiagramEditPart;
+
+
+public class DiagramHelper {
+
+ public static void refresh(EditPart editPart, boolean recursive) {
+ editPart.refresh();
+ if(recursive) {
+ for(EditPart childEditPart : (List<EditPart>)editPart.getChildren()) {
+ refresh(childEditPart, true);
+ }
+ }
+ }
+
+ public static void refresh(DiagramEditPart diagramEditPart, boolean recursive) {
+ diagramEditPart.refresh();
+ if(recursive) {
+ for(EditPart childEditPart : (List<EditPart>)diagramEditPart.getChildren()) {
+ refresh(childEditPart, true);
+ }
+ for(EditPart childEditPart : (List<EditPart>)diagramEditPart.getConnections()) {
+ refresh(childEditPart, true);
+ }
+ }
+ }
+}
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/build.properties b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/build.properties
index a2edf6a67ce..6e58a7f8e45 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/build.properties
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/build.properties
@@ -1,7 +1,7 @@
#
#Mon Sep 12 09:30:06 CEST 2011
-bin.includes=META-INF/,.,plugin.xml,icons/,model/,OSGI-INF/,about.html
+bin.includes=META-INF/,.,plugin.xml,model/,OSGI-INF/,about.html
output..=bin/
-src.includes=META-INF/,.,plugin.xml,icons/,model/,OSGI-INF/,about.html
+src.includes=about.html
source..=src/
bin..=bin/
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/ui/SingleView.xwt b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/ui/SingleView.xwt
index f776d748c5a..d8c23398037 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/ui/SingleView.xwt
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/ui/SingleView.xwt
@@ -10,9 +10,8 @@
<Composite.layout>
<ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout>
</Composite.layout>
- <ppe:BooleanToggle text="Hello, world"
- image="/org.eclipse.papyrus.infra.widgets/icons/papyrus.png" input="{Binding}"
- property="notation:View:visible"></ppe:BooleanToggle>
+ <ppe:BooleanRadio input="{Binding}"
+ property="notation:View:visible"></ppe:BooleanRadio>
<ppe:BooleanRadio input="{Binding}" property="notation:View:mutable"></ppe:BooleanRadio>
</Composite>
<Composite>
diff --git a/plugins/infra/org.eclipse.papyrus.infra.hyperlink/src/org/eclipse/papyrus/infra/hyperlink/util/HyperLinkHelpersRegistrationUtil.java b/plugins/infra/org.eclipse.papyrus.infra.hyperlink/src/org/eclipse/papyrus/infra/hyperlink/util/HyperLinkHelpersRegistrationUtil.java
index 4eeda35cefe..0ae00aec64c 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.hyperlink/src/org/eclipse/papyrus/infra/hyperlink/util/HyperLinkHelpersRegistrationUtil.java
+++ b/plugins/infra/org.eclipse.papyrus.infra.hyperlink/src/org/eclipse/papyrus/infra/hyperlink/util/HyperLinkHelpersRegistrationUtil.java
@@ -92,9 +92,9 @@ public class HyperLinkHelpersRegistrationUtil {
final Object h = e.createExecutableExtension(HELPER);
if(h instanceof AbstractHyperLinkHelper) {
helper = (AbstractHyperLinkHelper)h;
- String o = e.getAttribute(POSITION, null);
+ String o = e.getAttribute(POSITION);
Integer order = Integer.valueOf(o);
- String tabId = e.getAttribute(TAB_ID, null);
+ String tabId = e.getAttribute(TAB_ID);
helper.setTabId(tabId);
map.put(order, helper);
} else {
diff --git a/plugins/infra/services/org.eclipse.papyrus.infra.services.decoration/src/org/eclipse/papyrus/infra/services/decoration/util/DecorationUtils.java b/plugins/infra/services/org.eclipse.papyrus.infra.services.decoration/src/org/eclipse/papyrus/infra/services/decoration/util/DecorationUtils.java
index ca868e7ad6b..c85e79b439e 100644
--- a/plugins/infra/services/org.eclipse.papyrus.infra.services.decoration/src/org/eclipse/papyrus/infra/services/decoration/util/DecorationUtils.java
+++ b/plugins/infra/services/org.eclipse.papyrus.infra.services.decoration/src/org/eclipse/papyrus/infra/services/decoration/util/DecorationUtils.java
@@ -64,7 +64,7 @@ public class DecorationUtils {
EObject eObject = (EObject)Platform.getAdapterManager().getAdapter(element, EObject.class);
if(eObject == null) {
- throw new IllegalArgumentException("The decorated EObject shall not be null");
+ throw new IllegalArgumentException("The decorated element cannot be resolved to an EObject");
}
this.element = element;
diff --git a/plugins/uml/org.eclipse.papyrus.uml.profile/META-INF/MANIFEST.MF b/plugins/uml/org.eclipse.papyrus.uml.profile/META-INF/MANIFEST.MF
index 65d60ea8a23..97e86488e5a 100644
--- a/plugins/uml/org.eclipse.papyrus.uml.profile/META-INF/MANIFEST.MF
+++ b/plugins/uml/org.eclipse.papyrus.uml.profile/META-INF/MANIFEST.MF
@@ -1,27 +1,21 @@
Manifest-Version: 1.0
Require-Bundle: org.eclipse.uml2.uml.editor,
- org.eclipse.papyrus.uml.extensionpoints;bundle-version="0.9.0",
- org.eclipse.gmf.runtime.diagram.ui.properties;bundle-version="1.1.0",
org.eclipse.emf.facet.infra.browser.uicore;bundle-version="0.1.0",
org.eclipse.papyrus.infra.core;bundle-version="0.9.0",
- org.eclipse.papyrus.uml.tools.utils;bundle-version="0.9.0"
+ org.eclipse.papyrus.uml.tools.utils;bundle-version="0.9.0",
+ org.eclipse.core.runtime;bundle-version="3.8.0",
+ org.eclipse.emf.transaction;bundle-version="1.4.0",
+ org.eclipse.papyrus.uml.extensionpoints;bundle-version="0.9.0",
+ org.eclipse.ui.views.properties.tabbed;bundle-version="3.5.200"
Export-Package: org.eclipse.papyrus.uml.profile,
org.eclipse.papyrus.uml.profile.constraints,
org.eclipse.papyrus.uml.profile.definition,
- org.eclipse.papyrus.uml.profile.filter,
org.eclipse.papyrus.uml.profile.preference,
org.eclipse.papyrus.uml.profile.structure,
org.eclipse.papyrus.uml.profile.tree,
org.eclipse.papyrus.uml.profile.tree.objects,
- org.eclipse.papyrus.uml.profile.ui.actions,
- org.eclipse.papyrus.uml.profile.ui.compositeforview,
- org.eclipse.papyrus.uml.profile.ui.compositesformodel,
org.eclipse.papyrus.uml.profile.ui.dialogs,
org.eclipse.papyrus.uml.profile.ui.items,
- org.eclipse.papyrus.uml.profile.ui.listeners,
- org.eclipse.papyrus.uml.profile.ui.panels,
- org.eclipse.papyrus.uml.profile.ui.section,
- org.eclipse.papyrus.uml.profile.ui.views,
org.eclipse.papyrus.uml.profile.utils,
org.eclipse.papyrus.uml.profile.wizard
Bundle-Vendor: %providerName
diff --git a/plugins/uml/org.eclipse.papyrus.uml.profile/plugin.xml b/plugins/uml/org.eclipse.papyrus.uml.profile/plugin.xml
index 436cadb0382..f36bfd8e4af 100644
--- a/plugins/uml/org.eclipse.papyrus.uml.profile/plugin.xml
+++ b/plugins/uml/org.eclipse.papyrus.uml.profile/plugin.xml
@@ -6,7 +6,7 @@
<constraintProvider
cache="true">
<package
- namespaceUri="http://www.eclipse.org/uml2/2.1.0/UML">
+ namespaceUri="http://www.eclipse.org/uml2/4.0.0/UML">
</package>
<constraints
categories="org.eclipse.papyrus.infra.services.validation.CategoryID/UMLProfile">
diff --git a/plugins/uml/org.eclipse.papyrus.uml.profile/src/org/eclipse/papyrus/uml/profile/filter/AppliedProfileSectionFilter.java b/plugins/uml/org.eclipse.papyrus.uml.profile/src/org/eclipse/papyrus/uml/profile/filter/AppliedProfileSectionFilter.java
deleted file mode 100644
index 6e48cbc8b7c..00000000000
--- a/plugins/uml/org.eclipse.papyrus.uml.profile/src/org/eclipse/papyrus/uml/profile/filter/AppliedProfileSectionFilter.java
+++ /dev/null
@@ -1,66 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2008 CEA LIST.
- *
- *
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Chokri Mraidha (CEA LIST) Chokri.Mraidha@cea.fr - Initial API and implementation
- * Patrick Tessier (CEA LIST) Patrick.Tessier@cea.fr - modification
- *
- *****************************************************************************/
-package org.eclipse.papyrus.uml.profile.filter;
-
-import org.eclipse.core.runtime.IAdaptable;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.gmf.runtime.diagram.ui.editparts.DiagramEditPart;
-import org.eclipse.gmf.runtime.diagram.ui.editparts.ShapeEditPart;
-import org.eclipse.gmf.runtime.diagram.ui.properties.filters.ShapeEditPartPropertySectionFilter;
-import org.eclipse.uml2.uml.Package;
-
-public class AppliedProfileSectionFilter extends ShapeEditPartPropertySectionFilter {
-
- public boolean select(Object object) {
- if(object instanceof ShapeEditPart) {
- if(((ShapeEditPart)object).resolveSemanticElement() != null && ((ShapeEditPart)object).resolveSemanticElement() instanceof org.eclipse.uml2.uml.Package) {
- return true;
- }
- } else if(object instanceof DiagramEditPart) {
- DiagramEditPart diagramEditPart = (DiagramEditPart)object;
- if(diagramEditPart.resolveSemanticElement() != null && diagramEditPart.resolveSemanticElement() instanceof org.eclipse.uml2.uml.Package) {
- return true;
- }
-
-
- }
- EObject eobject=resolveSemanticObject(object);
- if(eobject!=null && eobject instanceof Package) {
- return true;
- }
-
- return false;
- }
-
- /**
- * Resolve semantic element
- *
- * @param object
- * the object to resolve
- * @return <code>null</code> or the semantic element associated to the specified object
- */
- private EObject resolveSemanticObject(Object object) {
- if (object instanceof EObject) {
- return (EObject) object;
- } else if (object instanceof IAdaptable) {
- IAdaptable adaptable = (IAdaptable) object;
- if (adaptable.getAdapter(EObject.class) != null) {
- return (EObject) adaptable.getAdapter(EObject.class);
- }
- }
- return null;
- }
-
-}
diff --git a/plugins/uml/org.eclipse.papyrus.uml.profile/src/org/eclipse/papyrus/uml/profile/filter/AppliedStereotypeSectionFilter.java b/plugins/uml/org.eclipse.papyrus.uml.profile/src/org/eclipse/papyrus/uml/profile/filter/AppliedStereotypeSectionFilter.java
deleted file mode 100644
index 81cca93f62f..00000000000
--- a/plugins/uml/org.eclipse.papyrus.uml.profile/src/org/eclipse/papyrus/uml/profile/filter/AppliedStereotypeSectionFilter.java
+++ /dev/null
@@ -1,73 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009 Obeo.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Obeo - initial API and implementation
- *******************************************************************************/
-package org.eclipse.papyrus.uml.profile.filter;
-
-import org.eclipse.core.runtime.IAdaptable;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.gmf.runtime.diagram.ui.editparts.CompartmentEditPart;
-import org.eclipse.gmf.runtime.diagram.ui.editparts.ConnectionNodeEditPart;
-import org.eclipse.gmf.runtime.diagram.ui.editparts.DiagramEditPart;
-import org.eclipse.gmf.runtime.diagram.ui.editparts.ShapeEditPart;
-import org.eclipse.gmf.runtime.diagram.ui.properties.filters.ShapeEditPartPropertySectionFilter;
-import org.eclipse.uml2.uml.Element;
-
-/**
- * This filter is used to check if stereotypes are applicable on the selected Element.
- *
- * @author <a href="mailto:jerome.benois@obeo.fr">Jerome Benois</a>
- */
-public class AppliedStereotypeSectionFilter extends ShapeEditPartPropertySectionFilter {
-
- public boolean select(Object object) {
- if(object instanceof ShapeEditPart) {
- if(((ShapeEditPart)object).resolveSemanticElement() != null && ((ShapeEditPart)object).resolveSemanticElement() instanceof org.eclipse.uml2.uml.Element) {
- return true;
- }
- } else if(object instanceof ConnectionNodeEditPart) {
- if(((ConnectionNodeEditPart)object).resolveSemanticElement() instanceof org.eclipse.uml2.uml.Element) {
- return true;
- }
- } else if(object instanceof CompartmentEditPart) {
- if(((CompartmentEditPart)object).resolveSemanticElement() instanceof org.eclipse.uml2.uml.Element) {
- return true;
- }
- } else if(object instanceof DiagramEditPart) {
- DiagramEditPart diagramEditPart = (DiagramEditPart)object;
- if(diagramEditPart.resolveSemanticElement() != null && diagramEditPart.resolveSemanticElement() instanceof Element) {
- return true;
- }
- }
- EObject eobject=resolveSemanticObject(object);
- if(eobject!=null && eobject instanceof Element) {
- return true;
- }
- return false;
- }
-
- /**
- * Resolve semantic element
- *
- * @param object
- * the object to resolve
- * @return <code>null</code> or the semantic element associated to the specified object
- */
- private EObject resolveSemanticObject(Object object) {
- if (object instanceof EObject) {
- return (EObject) object;
- } else if (object instanceof IAdaptable) {
- IAdaptable adaptable = (IAdaptable) object;
- if (adaptable.getAdapter(EObject.class) != null) {
- return (EObject) adaptable.getAdapter(EObject.class);
- }
- }
- return null;
- }
-}
diff --git a/plugins/uml/org.eclipse.papyrus.uml.profile/src/org/eclipse/papyrus/uml/profile/filter/CompartmentEditPartPropertySectionFilter.java b/plugins/uml/org.eclipse.papyrus.uml.profile/src/org/eclipse/papyrus/uml/profile/filter/CompartmentEditPartPropertySectionFilter.java
deleted file mode 100644
index c73b2a09a2b..00000000000
--- a/plugins/uml/org.eclipse.papyrus.uml.profile/src/org/eclipse/papyrus/uml/profile/filter/CompartmentEditPartPropertySectionFilter.java
+++ /dev/null
@@ -1,31 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2009 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Remi Schnekenburger (CEA LIST) remi.schnekenburger@cea.fr - initial API and implementation
- ****************************************************************************/
-
-package org.eclipse.papyrus.uml.profile.filter;
-
-import org.eclipse.gmf.runtime.diagram.ui.editparts.CompartmentEditPart;
-import org.eclipse.jface.viewers.IFilter;
-
-/**
- * Filter to display a property section if the selection is a compartment edit part.
- */
-public class CompartmentEditPartPropertySectionFilter implements IFilter {
-
- /**
- * {@inheritDoc}
- */
- public boolean select(Object object) {
- if(object instanceof CompartmentEditPart)
- return true;
-
- return false;
- }
-}
diff --git a/plugins/uml/org.eclipse.papyrus.uml.profile/src/org/eclipse/papyrus/uml/profile/ui/dialogs/ChooseSetAssistedDialog.java b/plugins/uml/org.eclipse.papyrus.uml.profile/src/org/eclipse/papyrus/uml/profile/ui/dialogs/ChooseSetAssistedDialog.java
index bc97f942a56..c6127e61e2a 100644
--- a/plugins/uml/org.eclipse.papyrus.uml.profile/src/org/eclipse/papyrus/uml/profile/ui/dialogs/ChooseSetAssistedDialog.java
+++ b/plugins/uml/org.eclipse.papyrus.uml.profile/src/org/eclipse/papyrus/uml/profile/ui/dialogs/ChooseSetAssistedDialog.java
@@ -57,6 +57,7 @@ import org.eclipse.swt.widgets.Shell;
import org.eclipse.swt.widgets.Table;
import org.eclipse.swt.widgets.TableItem;
import org.eclipse.swt.widgets.Text;
+import org.eclipse.ui.actions.WorkspaceModifyOperation;
import org.eclipse.ui.views.properties.tabbed.ITabbedPropertyConstants;
@@ -230,9 +231,7 @@ public class ChooseSetAssistedDialog extends Dialog implements IChooseDialog {
* @param possibleText
* the possible text
*/
- public ChooseSetAssistedDialog(Shell parentShell,
- String possibleText,
- String selectedText) {
+ public ChooseSetAssistedDialog(Shell parentShell, String possibleText, String selectedText) {
super(parentShell);
// add the resize ability to the window
@@ -270,10 +269,8 @@ public class ChooseSetAssistedDialog extends Dialog implements IChooseDialog {
@Override
protected void createButtonsForButtonBar(Composite parent) {
// remove default button = OK (enter pressed)
- createButton(parent, IDialogConstants.OK_ID, IDialogConstants.OK_LABEL,
- false);
- createButton(parent, IDialogConstants.CANCEL_ID,
- IDialogConstants.CANCEL_LABEL, false);
+ createButton(parent, IDialogConstants.OK_ID, IDialogConstants.OK_LABEL, false);
+ createButton(parent, IDialogConstants.CANCEL_ID, IDialogConstants.CANCEL_LABEL, false);
}
/*
@@ -473,9 +470,7 @@ public class ChooseSetAssistedDialog extends Dialog implements IChooseDialog {
char[] autoActivationCharacters = null;
int autoActivationDelay = 500;
- ContentProposalAdapter adapter = new ContentProposalAdapter(possibleElementsText,
- new TextContentAdapter(), getContentProposalProvider(),
- keyStroke, autoActivationCharacters);
+ ContentProposalAdapter adapter = new ContentProposalAdapter(possibleElementsText, new TextContentAdapter(), getContentProposalProvider(), keyStroke, autoActivationCharacters);
adapter.setAutoActivationDelay(autoActivationDelay);
// filter proposals as keys are pressed and proposals popup is present
@@ -1144,10 +1139,12 @@ public class ChooseSetAssistedDialog extends Dialog implements IChooseDialog {
* the v
*/
public void inputChanged(Viewer v, Object oldInput, Object newInput) {
- if(newInput != null)
+ if(newInput != null) {
((ElementList)newInput).addChangeListener(this);
- if(oldInput != null)
+ }
+ if(oldInput != null) {
((ElementList)oldInput).removeChangeListener(this);
+ }
}
/*
@@ -1243,10 +1240,12 @@ public class ChooseSetAssistedDialog extends Dialog implements IChooseDialog {
* the v
*/
public void inputChanged(Viewer v, Object oldInput, Object newInput) {
- if(newInput != null)
+ if(newInput != null) {
((ElementList)newInput).addChangeListener(this);
- if(oldInput != null)
+ }
+ if(oldInput != null) {
((ElementList)oldInput).removeChangeListener(this);
+ }
}
/*
@@ -1363,8 +1362,7 @@ public class ChooseSetAssistedDialog extends Dialog implements IChooseDialog {
* @throws InterruptedException
* @throws InvocationTargetException
*/
- public synchronized final void run(IProgressMonitor monitor)
- throws InvocationTargetException, InterruptedException {
+ public synchronized final void run(IProgressMonitor monitor) throws InvocationTargetException, InterruptedException {
final InvocationTargetException[] iteHolder = new InvocationTargetException[1];
try {
IWorkspaceRunnable workspaceRunnable = new IWorkspaceRunnable() {
diff --git a/plugins/uml/org.eclipse.papyrus.uml.profile/src/org/eclipse/papyrus/uml/profile/ui/dialogs/ChooseSetDialog.java b/plugins/uml/org.eclipse.papyrus.uml.profile/src/org/eclipse/papyrus/uml/profile/ui/dialogs/ChooseSetDialog.java
deleted file mode 100644
index 8dd97411f5c..00000000000
--- a/plugins/uml/org.eclipse.papyrus.uml.profile/src/org/eclipse/papyrus/uml/profile/ui/dialogs/ChooseSetDialog.java
+++ /dev/null
@@ -1,638 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2008 CEA LIST.
- *
- *
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Chokri Mraidha (CEA LIST) Chokri.Mraidha@cea.fr - Initial API and implementation
- * Patrick Tessier (CEA LIST) Patrick.Tessier@cea.fr - modification
- *
- *****************************************************************************/
-package org.eclipse.papyrus.uml.profile.ui.dialogs;
-
-import org.eclipse.jface.dialogs.Dialog;
-import org.eclipse.papyrus.uml.profile.FontManager;
-import org.eclipse.papyrus.uml.profile.ImageManager;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.events.MouseEvent;
-import org.eclipse.swt.events.MouseListener;
-import org.eclipse.swt.graphics.Font;
-import org.eclipse.swt.graphics.FontData;
-import org.eclipse.swt.graphics.Image;
-import org.eclipse.swt.layout.FormAttachment;
-import org.eclipse.swt.layout.FormData;
-import org.eclipse.swt.layout.FormLayout;
-import org.eclipse.swt.layout.GridLayout;
-import org.eclipse.swt.widgets.Button;
-import org.eclipse.swt.widgets.Combo;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Control;
-import org.eclipse.swt.widgets.Label;
-import org.eclipse.swt.widgets.List;
-import org.eclipse.swt.widgets.Shell;
-import org.eclipse.swt.widgets.Text;
-import org.eclipse.ui.views.properties.tabbed.ITabbedPropertyConstants;
-
-
-// TODO: Auto-generated Javadoc
-/**
- * Generic dialog that allows user to add/remove items to an element.
- *
- * @author Patrick Tessier, Remi Schnekenburger
- */
-public class ChooseSetDialog extends Dialog implements IChooseDialog {
-
- /**
- * The combo.
- */
- protected Combo combo;
-
- /**
- * The element list.
- */
- protected String[] elementList = { "test", "test1", "test2" };
-
- /**
- * The name field.
- */
- protected Text nameField;
-
- /**
- * The announce.
- */
- protected String announce = "Choose your element";
-
- /**
- * The Constant channel.
- */
- protected static final int channel = 19;
-
- /**
- * The value.
- */
- protected Object value = null;
-
- /**
- * The possible element list.
- */
- protected List possibleElementList;
-
- /**
- * The selected element list.
- */
- protected List selectedElementList;
-
- /**
- * The add button.
- */
- protected Button addButton;
-
- /**
- * The delete button.
- */
- protected Button deleteButton;
-
- /**
- * The possible set text.
- */
- protected Label possibleSetText;
-
- /**
- * The selected element text.
- */
- protected Label selectedElementText;
-
- /**
- * The possible text.
- */
- protected String possibleText = "Choose Element";
-
- /**
- * The selected text.
- */
- protected String selectedText = "Selected Element";
-
- /**
- * The add button listener.
- */
- protected MouseListener addButtonListener = null;
-
- /**
- * The delete button listener.
- */
- protected MouseListener deleteButtonListener = null;
-
- /**
- * The up button.
- */
- protected Button upButton;
-
- /**
- * The bottom button.
- */
- protected Button bottomButton;
-
- /**
- * The up button listener.
- */
- protected MouseListener upButtonListener = null;
-
- /**
- * The bottom button listener.
- */
- protected MouseListener bottomButtonListener = null;
-
- /**
- * The Constant IMG_UP_ARROW.
- */
- private static final Image IMG_UP_ARROW = ImageManager.IMG_UP;
-
- /**
- * The Constant IMG_DOWN_ARROW.
- */
- private static final Image IMG_DOWN_ARROW = ImageManager.IMG_DOWN;
-
- /**
- * The Constant IMG_LEFT_ARROW.
- */
- private static final Image IMG_LEFT_ARROW = ImageManager.IMG_LEFT;
-
- /**
- * The Constant IMG_RIGHT_ARROW.
- */
- private static final Image IMG_RIGHT_ARROW = ImageManager.IMG_RIGHT;
-
- /**
- * listener of the button to add an elment form possiblelist into selectedList.
- *
- * @author Patrick Tessier
- */
- protected class AddButtonListener implements MouseListener {
-
- /**
- * The Constructor.
- */
- public AddButtonListener() {
- }
-
- /**
- * Mouse double click.
- *
- * @param e
- * the e
- */
- public void mouseDoubleClick(MouseEvent e) {
- }
-
- /**
- * Mouse down.
- *
- * @param e
- * the e
- */
- public void mouseDown(MouseEvent e) {
- }
-
- /**
- * Mouse up.
- *
- * @param e
- * the e
- */
- public void mouseUp(MouseEvent e) {
- runActionAdd();
- }
- };
-
- /**
- * Listener of the button to add an element form selectedList into selectedList possiblelist.
- *
- * @author Patrick Tessier
- */
- protected class DeleteButtonListener implements MouseListener {
-
- /**
- * The Constructor.
- */
- public DeleteButtonListener() {
- }
-
- /**
- * Mouse double click.
- *
- * @param e
- * the e
- */
- public void mouseDoubleClick(MouseEvent e) {
- }
-
- /**
- * Mouse down.
- *
- * @param e
- * the e
- */
- public void mouseDown(MouseEvent e) {
- }
-
- /**
- * Mouse up.
- *
- * @param e
- * the e
- */
- public void mouseUp(MouseEvent e) {
- runActionDelete();
- }
- };
-
- /**
- * listener of the button to move up an element.
- *
- * @author Patrick Tessier
- */
- protected class UpButtonListener implements MouseListener {
-
- /**
- * The Constructor.
- */
- public UpButtonListener() {
- }
-
- /**
- * Mouse double click.
- *
- * @param e
- * the e
- */
- public void mouseDoubleClick(MouseEvent e) {
- }
-
- /**
- * Mouse down.
- *
- * @param e
- * the e
- */
- public void mouseDown(MouseEvent e) {
- }
-
- /**
- * Mouse up.
- *
- * @param e
- * the e
- */
- public void mouseUp(MouseEvent e) {
- runActionUp();
- }
- };
-
- /**
- * listener of the button to move bottom an element.
- *
- * @author Patrick Tessier
- */
- protected class BottomButtonListener implements MouseListener {
-
- /**
- * The Constructor.
- */
- public BottomButtonListener() {
- }
-
- /**
- * Mouse double click.
- *
- * @param e
- * the e
- */
- public void mouseDoubleClick(MouseEvent e) {
- }
-
- /**
- * Mouse down.
- *
- * @param e
- * the e
- */
- public void mouseDown(MouseEvent e) {
- }
-
- /**
- * Mouse up.
- *
- * @param e
- * the e
- */
- public void mouseUp(MouseEvent e) {
- runActionBottom();
- }
- };
-
-
- /**
- * The Constructor.
- *
- * @param parentShell
- * the parent shell
- * @param selectedText
- * the selected text
- * @param possibleText
- * the possible text
- */
- public ChooseSetDialog(Shell parentShell,
- String possibleText,
- String selectedText) {
- super(parentShell);
- setShellStyle(SWT.RESIZE | super.getShellStyle());
- if(possibleText != null) {
- this.possibleText = possibleText; //set possible Text
- }
- if(selectedText != null) {
- this.selectedText = selectedText;//set selected Label
- }
- //Add listener
- this.addButtonListener = new AddButtonListener();
- this.deleteButtonListener = new DeleteButtonListener();
- this.upButtonListener = new UpButtonListener();
- this.bottomButtonListener = new BottomButtonListener();
- }
-
- /**
- * Creates the dialog area.
- *
- * @param parent
- * the parent
- *
- * @return the control
- */
- @Override
- protected Control createDialogArea(Composite parent) {
- //place all buttons
- Composite comp = (Composite)super.createDialogArea(parent);
- FormLayout layout = new FormLayout();
- comp.setLayout(layout);
-
- // initializes data
- FormData data;
-
- // create elements
- createElements(comp);
-
- // set fonts for elements that require fonts
- setFonts();
-
- // set data to the left elements: possible elements
- // Label: available elements title
- data = new FormData();
- data.top = new FormAttachment(0, ITabbedPropertyConstants.VSPACE);
- data.left = new FormAttachment(0, ITabbedPropertyConstants.HSPACE);
- possibleSetText.setLayoutData(data);
-
- // List: available elements list
- data = new FormData();
- data.height = 200;
- data.width = 300;
- data.top = new FormAttachment(possibleSetText, ITabbedPropertyConstants.VSPACE);
- data.left = new FormAttachment(0, ITabbedPropertyConstants.HSPACE);
- data.bottom = new FormAttachment(100, -ITabbedPropertyConstants.VSPACE);
- data.right = new FormAttachment(addButton, -ITabbedPropertyConstants.HSPACE);
- possibleElementList.setLayoutData(data);
-
- // buttons
- // add button
- data = new FormData();
- data.top = new FormAttachment(40, 0);
- data.right = new FormAttachment(50, -(ITabbedPropertyConstants.HSPACE) / 2);
- addButton.setLayoutData(data);
-
- // right button
- data = new FormData();
- data.top = new FormAttachment(addButton, ITabbedPropertyConstants.VSPACE, SWT.BOTTOM);
- data.right = new FormAttachment(50, -(ITabbedPropertyConstants.HSPACE) / 2);
- deleteButton.setLayoutData(data);
-
- // Right part
- // Label: selected elements title
- data = new FormData();
- data.top = new FormAttachment(0, ITabbedPropertyConstants.HSPACE);
- data.left = new FormAttachment(addButton, ITabbedPropertyConstants.HSPACE);
- selectedElementText.setLayoutData(data);
-
- // Label: selected elements list
- data = new FormData();
- data.left = new FormAttachment(addButton, ITabbedPropertyConstants.HSPACE);
- data.top = new FormAttachment(selectedElementText, ITabbedPropertyConstants.VSPACE);
- data.right = new FormAttachment(upButton, -ITabbedPropertyConstants.HSPACE);
- data.bottom = new FormAttachment(100, -ITabbedPropertyConstants.VSPACE);
- selectedElementList.setLayoutData(data);
-
- // up button
- data = new FormData();
- data.top = new FormAttachment(40, 0);
- data.right = new FormAttachment(100, -ITabbedPropertyConstants.HSPACE);
- upButton.setLayoutData(data);
-
- // down button
- data = new FormData();
- data.top = new FormAttachment(upButton, ITabbedPropertyConstants.HSPACE, SWT.BOTTOM);
- data.right = new FormAttachment(100, -ITabbedPropertyConstants.HSPACE);
- bottomButton.setLayoutData(data);
-
- // refresh both lists
- fillSelectedElementList();
- fillPossibleElementList();
-
- // add listeners to button
- addButtonListeners();
-
- // end of the dialog
- return comp;
- }
-
- /**
- * Create elements in the dialog.
- *
- * @param comp
- * the parent composite
- */
- private void createElements(Composite comp) {
- // buttons
- addButton = new Button(comp, SWT.CENTER);
- addButton.setImage(IMG_RIGHT_ARROW);
-
- deleteButton = new Button(comp, SWT.CENTER);
- deleteButton.setImage(IMG_LEFT_ARROW);
-
- upButton = new Button(comp, SWT.CENTER);
- upButton.setImage(IMG_UP_ARROW);
-
- bottomButton = new Button(comp, SWT.CENTER);
- bottomButton.setImage(IMG_DOWN_ARROW);
-
- // texts
- selectedElementText = new Label(comp, SWT.CENTER);
- selectedElementText.setText(selectedText);
-
- possibleSetText = new Label(comp, SWT.CENTER);
- possibleSetText.setText(possibleText);
-
- // lists
- selectedElementList = new List(comp, SWT.SINGLE | SWT.V_SCROLL | SWT.BORDER);
- possibleElementList = new List(comp, SWT.SINGLE | SWT.V_SCROLL | SWT.BORDER);
- }
-
- /**
- * Apply Font to elements that display text.
- */
- private void setFonts() {
- FontData[] fontdata = { new FontData("Arial", 9, SWT.NORMAL) };
- Font font = new FontManager().get(fontdata);
- selectedElementText.setFont(font);
- selectedElementList.setFont(font);
- possibleSetText.setFont(font);
- possibleElementList.setFont(font);
- }
-
- /**
- * Add listeners to buttons.
- */
- private void addButtonListeners() {
- addButton.addMouseListener(addButtonListener);
- deleteButton.addMouseListener(deleteButtonListener);
- upButton.addMouseListener(upButtonListener);
- bottomButton.addMouseListener(bottomButtonListener);
- }
-
- /**
- * Creates the composite.
- *
- * @param parent
- * the parent
- */
- protected void createComposite(Composite parent) {
- Composite comp = new Composite(parent, SWT.NONE);
- comp.setLayout(new GridLayout());
- }
-
- /**
- * fill the possible list.
- */
- protected void fillPossibleElementList() {
- for(int i = 0; i < 20; i++) {
- possibleElementList.add("item" + i);
- }
- }
-
- /**
- * fill the selected list.
- */
- protected void fillSelectedElementList() {
- for(int i = 0; i < 20; i++) {
- selectedElementList.add("itemSelected" + i);
- }
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.jface.dialogs.Dialog#createButtonsForButtonBar(org.eclipse.swt.widgets.Composite)
- */
- /**
- * Creates the buttons for button bar.
- *
- * @param parent
- * the parent
- */
- @Override
- protected void createButtonsForButtonBar(Composite parent) {
- super.createButtonsForButtonBar(parent);
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.jface.dialogs.Dialog#buttonPressed(int)
- */
- /**
- * Button pressed.
- *
- * @param buttonId
- * the button id
- */
- @Override
- protected void buttonPressed(int buttonId) {
- super.buttonPressed(buttonId);
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.jface.dialogs.Dialog#okPressed()
- */
- /**
- * Ok pressed.
- */
- @Override
- protected void okPressed() {
- super.okPressed();
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.jface.dialogs.Dialog#cancelPressed()
- */
- /**
- * Cancel pressed.
- */
- @Override
- protected void cancelPressed() {
- value = null;
- super.cancelPressed();
-
- }
-
- /*
- * (non-Javadoc)
- *
- * @see com.cea.papyrus.ui.dialogs.IChooseDialog#getValue()
- */
- /**
- * Gets the value.
- *
- * @return the value
- */
- public Object getValue() {
- return value;
- }
-
- /**
- * Behavior for the add button.
- */
- protected void runActionAdd() {
- }
-
- /**
- * Behavior for the delete button.
- */
- protected void runActionDelete() {
- }
-
- /**
- * Behavior for the up button.
- */
- protected void runActionUp() {
- }
-
- /**
- * Behavior for the bottom button.
- */
- protected void runActionBottom() {
- }
-}
diff --git a/plugins/uml/org.eclipse.papyrus.uml.profile/src/org/eclipse/papyrus/uml/profile/ui/dialogs/DefinitionHistoryDialog.java b/plugins/uml/org.eclipse.papyrus.uml.profile/src/org/eclipse/papyrus/uml/profile/ui/dialogs/DefinitionHistoryDialog.java
deleted file mode 100644
index c5869e5bb27..00000000000
--- a/plugins/uml/org.eclipse.papyrus.uml.profile/src/org/eclipse/papyrus/uml/profile/ui/dialogs/DefinitionHistoryDialog.java
+++ /dev/null
@@ -1,324 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2008 CEA LIST.
- *
- *
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Chokri Mraidha (CEA LIST) Chokri.Mraidha@cea.fr - Initial API and implementation
- * Patrick Tessier (CEA LIST) Patrick.Tessier@cea.fr - modification
- *
- *****************************************************************************/
-package org.eclipse.papyrus.uml.profile.ui.dialogs;
-
-import java.util.ArrayList;
-import java.util.Iterator;
-import java.util.List;
-
-import org.eclipse.emf.common.util.EList;
-import org.eclipse.emf.ecore.EAnnotation;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.EPackage;
-import org.eclipse.jface.dialogs.IDialogConstants;
-import org.eclipse.jface.dialogs.TitleAreaDialog;
-import org.eclipse.jface.viewers.ColumnWeightData;
-import org.eclipse.jface.viewers.ILabelProviderListener;
-import org.eclipse.jface.viewers.IStructuredContentProvider;
-import org.eclipse.jface.viewers.ITableLabelProvider;
-import org.eclipse.jface.viewers.TableLayout;
-import org.eclipse.jface.viewers.TableViewer;
-import org.eclipse.jface.viewers.Viewer;
-import org.eclipse.papyrus.uml.profile.ImageManager;
-import org.eclipse.papyrus.uml.profile.definition.IPapyrusVersionConstants;
-import org.eclipse.papyrus.uml.profile.definition.PapyrusDefinitionAnnotation;
-import org.eclipse.papyrus.uml.profile.utils.Util;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.graphics.Font;
-import org.eclipse.swt.graphics.Image;
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.layout.GridLayout;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Control;
-import org.eclipse.swt.widgets.Shell;
-import org.eclipse.swt.widgets.Table;
-import org.eclipse.swt.widgets.TableColumn;
-import org.eclipse.uml2.uml.Profile;
-
-
-public class DefinitionHistoryDialog extends TitleAreaDialog {
-
- /** path to the banner image */
- public final static String PROFILE_ANNOTATION_IMG = ImageManager.IMAGE_PATH + "wizban/Annotation.gif";
-
- /** Profile for which definitions are displayed */
- protected Profile profile;
-
- /** list of previous definition annotations */
- List<PapyrusDefinitionAnnotation> oldVersionAnnotations = new ArrayList<PapyrusDefinitionAnnotation>();
-
- /**
- * Creates a new ProfileDefinitionDialog
- *
- * @param parentShell
- * the parent shell for this dialog
- * @param profile
- * the profile for which definition history is displayed
- */
- public DefinitionHistoryDialog(Shell parentShell, Profile profile) {
- super(parentShell);
- setShellStyle(getShellStyle() | SWT.RESIZE);
- this.profile = profile;
-
- computeHistoryAnnotations();
- }
-
- /**
- * retrieve version annotation history
- */
- private void computeHistoryAnnotations() {
- // get all annotations for the given profile
- oldVersionAnnotations = Util.getAllPapyrusDefinitionAnnotation(profile);
- }
-
- /**
- * {@inheritDoc}
- */
- @Override
- protected Control createDialogArea(Composite parent) {
- // top level composite
- Composite parentComposite = (Composite)super.createDialogArea(parent);
-
- setTitle("Profile definition history");
- setTitleImage(ImageManager.getImage(PROFILE_ANNOTATION_IMG));
-
- // create a composite with standard margins and spacing
- Composite composite = new Composite(parentComposite, SWT.NONE);
- GridLayout layout = new GridLayout(1, true);
- layout.marginHeight = convertVerticalDLUsToPixels(IDialogConstants.VERTICAL_MARGIN);
- layout.marginWidth = convertHorizontalDLUsToPixels(IDialogConstants.HORIZONTAL_MARGIN);
- layout.verticalSpacing = convertVerticalDLUsToPixels(IDialogConstants.VERTICAL_SPACING);
- layout.horizontalSpacing = convertHorizontalDLUsToPixels(IDialogConstants.HORIZONTAL_SPACING);
- composite.setLayout(layout);
- composite.setLayoutData(new GridData(SWT.FILL, SWT.FILL, true, true));
- composite.setFont(parentComposite.getFont());
-
- // fill composite with information about definitions:
- GridData gd;
-
- Composite tableArea = createTableArea(composite);
- gd = new GridData(SWT.FILL, SWT.FILL, true, true);
- tableArea.setLayoutData(gd);
-
- applyDialogFont(parentComposite);
- return parentComposite;
- }
-
- /**
- * Creates and returns the content of the advanced area.
- *
- * @param composite
- * The parent composite to contain the advanced area
- */
- private Composite createTableArea(Composite composite) {
- Composite parent = new Composite(composite, SWT.FILL);
- GridLayout layout = new GridLayout();
- parent.setLayout(layout);
- Font font = composite.getFont();
-
- TableViewer viewer = new TableViewer(parent, SWT.BORDER | SWT.H_SCROLL | SWT.V_SCROLL | SWT.MULTI | SWT.FULL_SELECTION);
- final Table table = viewer.getTable();
- TableLayout tableLayout = new TableLayout();
- table.setLayout(tableLayout);
- table.setHeaderVisible(true);
- table.setFont(font);
- GridData gridData = new GridData(GridData.FILL_BOTH);
- gridData.widthHint = 450;
- gridData.heightHint = 300;
- viewer.getControl().setLayoutData(gridData);
- viewer.setContentProvider(new DefinitionHistoryContentProvider());
- viewer.setLabelProvider(new DefinitionHistoryTableLabelProvider());
-
- createTableColumn(table, 20, "version", true, SWT.CENTER);
- createTableColumn(table, 40, "author", true, SWT.CENTER);
- createTableColumn(table, 30, "date", true, SWT.CENTER);
- createTableColumn(table, 30, "comment", true, SWT.LEFT);
- createTableColumn(table, 50, "copyright", true, SWT.LEFT);
-
- // // display is a table with all history versions
- // final Table table = new Table(parent, SWT.MULTI | SWT.H_SCROLL | SWT.V_SCROLL | SWT.BORDER);
- // final TableColumn versionColumn = new TableColumn(table, SWT.CENTER);
- // versionColumn.setText("version");
- // final TableColumn dateColumn = new TableColumn(table, SWT.CENTER);
- // dateColumn.setText("date");
- // final TableColumn authorColumn = new TableColumn(table, SWT.CENTER);
- // authorColumn.setText("author");
- // final TableColumn commentColumn = new TableColumn(table, SWT.CENTER);
- // commentColumn.setText("comment");
-
- // GridData gd = new GridData(SWT.FILL, SWT.FILL, true, true);
- // table.setLayoutData(gd);
-
- // TableViewer viewer = new TableViewer(table);
- // configure viewer
- viewer.setContentProvider(new DefinitionHistoryContentProvider());
- viewer.setLabelProvider(new DefinitionHistoryTableLabelProvider());
- viewer.setInput(profile);
-
- return parent;
- }
-
- /**
- * Creates table columns for the viewer
- *
- * @param table
- * the modified table
- * @param weight
- * weight of the column (size)
- * @param title
- * title of the column
- * @param resizable
- * is the column resizable
- * @return the create column
- */
- protected TableColumn createTableColumn(Table table, int weight, String title, boolean resizable, int style) {
- ((TableLayout)table.getLayout()).addColumnData(new ColumnWeightData(weight));
- final TableColumn tc = new TableColumn(table, style);
- tc.setResizable(true);
- tc.setText(title);
- return tc;
- }
-
- /**
- * {@inheritDoc}
- */
- @Override
- protected void configureShell(Shell shell) {
- super.configureShell(shell);
- setShellStyle(getShellStyle() | SWT.RESIZE);
- shell.setText("Profile Definition"); //$NON-NLS-1$
- }
-
- /**
- * Content provider for table that displays information about Definition History
- */
- public class DefinitionHistoryContentProvider implements IStructuredContentProvider {
-
- /**
- * {@inheritDoc}
- */
- public Object[] getElements(Object inputElement) {
- if(inputElement instanceof Profile) {
- // retrieve all definitions
- EAnnotation eAnnotation = ((Profile)inputElement).getEAnnotation("http://www.eclipse.org/uml2/2.0.0/UML");
- if(eAnnotation != null) {
- EList<EObject> definitions = eAnnotation.getContents();
- List<Object> elements = new ArrayList<Object>();
- // convert Papyrus Upgraded Annotation if possible (annotation with PapyrusVersion source added to the definition)
- Iterator<EObject> it = definitions.listIterator();
- while(it.hasNext()) {
- EPackage object = (EPackage)it.next();
- EAnnotation annotation = object.getEAnnotation(IPapyrusVersionConstants.PAPYRUS_EANNOTATION_SOURCE);
- if(annotation == null) {
- elements.add(0, PapyrusDefinitionAnnotation.UNDEFINED_ANNOTATION);
- } else {
- elements.add(0, PapyrusDefinitionAnnotation.parseEAnnotation(annotation));
- }
- }
- return elements.toArray();
- }
- return new Object[]{};
- }
- return new Object[]{};
- }
-
- /**
- * {@inheritDoc}
- */
- public void dispose() {
- }
-
- /**
- * {@inheritDoc}
- */
- public void inputChanged(Viewer viewer, Object oldInput, Object newInput) {
- }
- }
-
- /**
- * Label provider for table that displays information about Definition History
- */
- public class DefinitionHistoryTableLabelProvider implements ITableLabelProvider {
-
- /**
- * {@inheritDoc}
- */
- public Image getColumnImage(Object element, int columnIndex) {
- return null;
- }
-
- /**
- * {@inheritDoc}
- */
- public String getColumnText(Object element, int columnIndex) {
- if(element instanceof PapyrusDefinitionAnnotation) {
- return getColumnText((PapyrusDefinitionAnnotation)element, columnIndex);
- }
- // should never append
- return "naa";
- }
-
- /**
- * Returns the label text for the given column index
- *
- * @param annotation
- * the annotation representing the entire row (should never be <code>null</code>)
- * @param columnIndex
- * the zero-based index of the column in which the label appears
- * @return
- */
- public String getColumnText(PapyrusDefinitionAnnotation annotation, int columnIndex) {
- switch(columnIndex) {
- case 0:
- return annotation.getVersion().toString();
- case 1:
- return annotation.getAuthor();
- case 2:
- return annotation.getDate();
- case 3:
- return annotation.getComment();
- case 4:
- return annotation.getCopyright();
- default:
- return "unknown";
- }
- }
-
- /**
- * {@inheritDoc}
- */
- public void addListener(ILabelProviderListener listener) {
- }
-
- /**
- * {@inheritDoc}
- */
- public void dispose() {
- }
-
- /**
- * {@inheritDoc}
- */
- public boolean isLabelProperty(Object element, String property) {
- return false;
- }
-
- /**
- * {@inheritDoc}
- */
- public void removeListener(ILabelProviderListener listener) {
- }
- }
-}
diff --git a/plugins/uml/org.eclipse.papyrus.uml.profile/src/org/eclipse/papyrus/uml/profile/ui/dialogs/ElementList.java b/plugins/uml/org.eclipse.papyrus.uml.profile/src/org/eclipse/papyrus/uml/profile/ui/dialogs/ElementList.java
index c5b76bc5728..d13faab326a 100644
--- a/plugins/uml/org.eclipse.papyrus.uml.profile/src/org/eclipse/papyrus/uml/profile/ui/dialogs/ElementList.java
+++ b/plugins/uml/org.eclipse.papyrus.uml.profile/src/org/eclipse/papyrus/uml/profile/ui/dialogs/ElementList.java
@@ -69,8 +69,9 @@ public class ElementList {
public void addElement(Object element) {
elements.add(elements.size(), element);
Iterator iterator = changeListeners.iterator();
- while(iterator.hasNext())
+ while(iterator.hasNext()) {
((IListViewer)iterator.next()).addElement(element);
+ }
}
@@ -83,8 +84,9 @@ public class ElementList {
public void removeElement(Object element) {
elements.remove(element);
Iterator iterator = changeListeners.iterator();
- while(iterator.hasNext())
+ while(iterator.hasNext()) {
((IListViewer)iterator.next()).removeElement(element);
+ }
}
/**
@@ -102,8 +104,9 @@ public class ElementList {
}
Iterator iterator = changeListeners.iterator();
- while(iterator.hasNext())
+ while(iterator.hasNext()) {
((IListViewer)iterator.next()).updateElement(element);
+ }
}
@@ -122,8 +125,9 @@ public class ElementList {
}
Iterator iterator = changeListeners.iterator();
- while(iterator.hasNext())
+ while(iterator.hasNext()) {
((IListViewer)iterator.next()).updateElement(element);
+ }
}
@@ -135,8 +139,9 @@ public class ElementList {
*/
public void elementChanged(Object element) {
Iterator iterator = changeListeners.iterator();
- while(iterator.hasNext())
+ while(iterator.hasNext()) {
((IListViewer)iterator.next()).updateElement(element);
+ }
}
/**
diff --git a/plugins/uml/org.eclipse.papyrus.uml.profile/src/org/eclipse/papyrus/uml/profile/ui/dialogs/LabelEditorDialog.java b/plugins/uml/org.eclipse.papyrus.uml.profile/src/org/eclipse/papyrus/uml/profile/ui/dialogs/LabelEditorDialog.java
deleted file mode 100644
index 44293c17ba5..00000000000
--- a/plugins/uml/org.eclipse.papyrus.uml.profile/src/org/eclipse/papyrus/uml/profile/ui/dialogs/LabelEditorDialog.java
+++ /dev/null
@@ -1,193 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2008 CEA LIST.
- *
- *
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Chokri Mraidha (CEA LIST) Chokri.Mraidha@cea.fr - Initial API and implementation
- * Patrick Tessier (CEA LIST) Patrick.Tessier@cea.fr - modification
- *
- *****************************************************************************/
-
-package org.eclipse.papyrus.uml.profile.ui.dialogs;
-
-import org.eclipse.jface.dialogs.Dialog;
-import org.eclipse.jface.dialogs.IDialogConstants;
-import org.eclipse.jface.dialogs.IInputValidator;
-import org.eclipse.jface.text.source.SourceViewer;
-import org.eclipse.swt.widgets.Button;
-import org.eclipse.swt.widgets.Control;
-import org.eclipse.swt.widgets.Shell;
-import org.eclipse.swt.widgets.Text;
-
-
-// equivalent au inputDialog (code recopie) mais donne un sourceviewer a la place du label
-public class LabelEditorDialog extends Dialog {
-
- /**
- * The title of the dialog.
- */
- protected String title;
-
- /**
- * The input value; the empty string by default.
- */
- protected String value = "";//$NON-NLS-1$
-
- /**
- * The input validator, or <code>null</code> if none.
- */
- protected IInputValidator validator;
-
- /**
- * Ok button widget.
- */
- protected Button okButton;
-
- /**
- * Error message label widget.
- */
- protected Text errorMessageText;
-
- /**
- * Error message string.
- */
- protected String errorMessage;
-
- /**
- * SourceViewer : area that displays text
- */
- protected SourceViewer viewer;
-
- /**
- * Creates a dialog with OK and Cancel buttons. Note that the dialog
- * will have no visual representation (no widgets) until it is told to open.
- * <p>
- * Note that the <code>open</code> method blocks for input dialogs.
- * </p>
- *
- * @param parentShell
- * the parent shell, or <code>null</code> to create a top-level shell
- * @param dialogTitle
- * the dialog title, or <code>null</code> if none
- * @param initialValue
- * the initial input value, or <code>null</code> if none (equivalent to the empty string)
- * @param validator
- * an input validator, or <code>null</code> if none
- */
- public LabelEditorDialog(Shell parentShell, String dialogTitle, String initialValue, IInputValidator validator) {
- super(parentShell);
- this.title = dialogTitle;
- if(initialValue == null) {
- value = "";//$NON-NLS-1$
- } else {
- value = initialValue;
- }
- this.validator = validator;
- }
-
- /*
- * (non-Javadoc) Method declared on Dialog.
- */
- protected void buttonPressed(int buttonId) {
- if(buttonId == IDialogConstants.OK_ID) {
- value = viewer.getDocument().get();
- } else {
- value = null;
- }
- super.buttonPressed(buttonId);
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.jface.window.Window#configureShell(org.eclipse.swt.widgets.Shell)
- */
- protected void configureShell(Shell shell) {
- super.configureShell(shell);
- if(title != null) {
- shell.setText(title);
- }
- }
-
- /**
- * Returns the ok button.
- *
- * @return the ok button
- */
- protected Button getOkButton() {
- return okButton;
- }
-
- /**
- * Returns the text area.
- *
- * @return the text area
- */
- protected SourceViewer getSourceViewer() {
- return viewer;
- }
-
- /**
- * Returns the validator.
- *
- * @return the validator
- */
- protected IInputValidator getValidator() {
- return validator;
- }
-
- /**
- * Returns the string typed into this input dialog.
- *
- * @return the input string
- */
- public String getValue() {
- return value;
- }
-
- /**
- * Validates the input.
- * <p>
- * The default implementation of this framework method delegates the request to the supplied input validator object; if it finds the input
- * invalid, the error message is displayed in the dialog's message line. This hook method is called whenever the text changes in the input field.
- * </p>
- */
- protected void validateInput() {
- String errorMessage = null;
- if(validator != null) {
- // errorMessage = validator.isValid(viewer.getDocument().get());
- }
- // Bug 16256: important not to treat "" (blank error) the same as null
- // (no error)
-
- //setErrorMessage(errorMessage);
- }
-
- /**
- * Sets or clears the error message.
- * If not <code>null</code>, the OK button is disabled.
- *
- * @param errorMessage
- * the error message, or <code>null</code> to clear
- * @since 3.0
- */
- public void setErrorMessage(String errorMessage) {
- this.errorMessage = errorMessage;
- if(errorMessageText != null && !errorMessageText.isDisposed()) {
- errorMessageText.setText(errorMessage == null ? "" : errorMessage); //$NON-NLS-1$
- errorMessageText.getParent().update();
- // Access the ok button by id, in case clients have overridden button creation.
- // See https://bugs.eclipse.org/bugs/show_bug.cgi?id=113643
- Control button = getButton(IDialogConstants.OK_ID);
- if(button != null) {
- button.setEnabled(errorMessage.equals(""));
- }
- }
- }
-
-}
diff --git a/plugins/uml/org.eclipse.papyrus.uml.profile/src/org/eclipse/papyrus/uml/profile/ui/dialogs/PackageImportTreeSelectionDialog.java b/plugins/uml/org.eclipse.papyrus.uml.profile/src/org/eclipse/papyrus/uml/profile/ui/dialogs/PackageImportTreeSelectionDialog.java
index a6d1f38340d..c422b380960 100644
--- a/plugins/uml/org.eclipse.papyrus.uml.profile/src/org/eclipse/papyrus/uml/profile/ui/dialogs/PackageImportTreeSelectionDialog.java
+++ b/plugins/uml/org.eclipse.papyrus.uml.profile/src/org/eclipse/papyrus/uml/profile/ui/dialogs/PackageImportTreeSelectionDialog.java
@@ -50,6 +50,7 @@ public class PackageImportTreeSelectionDialog extends ElementImportTreeSelection
* @param _package
* @param elemTree
*/
+ @Override
protected void buildImportTreeList(TreeItem elemTree, Package _package) {
Iterator elemIter = _package.getPackagedElements().iterator();
while(elemIter.hasNext()) {
diff --git a/plugins/uml/org.eclipse.papyrus.uml.profile/src/org/eclipse/papyrus/uml/profile/utils/UmlElementFilter.java b/plugins/uml/org.eclipse.papyrus.uml.profile/src/org/eclipse/papyrus/uml/profile/utils/UmlElementFilter.java
deleted file mode 100644
index f51f10541c0..00000000000
--- a/plugins/uml/org.eclipse.papyrus.uml.profile/src/org/eclipse/papyrus/uml/profile/utils/UmlElementFilter.java
+++ /dev/null
@@ -1,38 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009 CEA LIST.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * CEA LIST - initial API and implementation
- *******************************************************************************/
-package org.eclipse.papyrus.uml.profile.utils;
-
-import org.eclipse.gmf.runtime.diagram.ui.editparts.IGraphicalEditPart;
-import org.eclipse.jface.viewers.IFilter;
-import org.eclipse.uml2.uml.Element;
-
-/**
- * Filter that returns <code>true</code> if the element associated to the object is a UML {@link Element}.
- */
-public class UmlElementFilter implements IFilter {
-
- /**
- * {@inheritDoc}
- */
- public boolean select(Object object) {
- // test element is a node edit part and its controlled element has an associated UML element
- if(object instanceof IGraphicalEditPart
- && ((IGraphicalEditPart)object).getNotationView().getElement() instanceof Element)
- return true;
-
- if(object instanceof Element) {
- return true;
- }
-
- return false;
- }
-
-}
diff --git a/plugins/uml/properties/org.eclipse.papyrus.uml.properties.tabbedproperties.comments/plugin.xml b/plugins/uml/properties/org.eclipse.papyrus.uml.properties.tabbedproperties.comments/plugin.xml
index 37f61e50dd6..ec7ae22e328 100644
--- a/plugins/uml/properties/org.eclipse.papyrus.uml.properties.tabbedproperties.comments/plugin.xml
+++ b/plugins/uml/properties/org.eclipse.papyrus.uml.properties.tabbedproperties.comments/plugin.xml
@@ -31,5 +31,4 @@
</advancededitor>
</DirectEditor>
</extension>
-
</plugin>
diff --git a/plugins/uml/properties/org.eclipse.papyrus.uml.properties/.project b/plugins/uml/properties/org.eclipse.papyrus.uml.properties/.project
index 46d1b9bcd82..c85ee05189b 100644
--- a/plugins/uml/properties/org.eclipse.papyrus.uml.properties/.project
+++ b/plugins/uml/properties/org.eclipse.papyrus.uml.properties/.project
@@ -21,13 +21,13 @@
</arguments>
</buildCommand>
<buildCommand>
- <name>org.eclipse.gmt.modisco.common.core.builder</name>
+ <name>org.eclipse.emf.facet.common.core.builder</name>
<arguments>
</arguments>
</buildCommand>
</buildSpec>
<natures>
- <nature>org.eclipse.gmt.modisco.common.ProjectNature</nature>
+ <nature>org.eclipse.emf.facet.common.ProjectNature</nature>
<nature>org.eclipse.pde.PluginNature</nature>
<nature>org.eclipse.jdt.core.javanature</nature>
</natures>
diff --git a/plugins/uml/properties/org.eclipse.papyrus.uml.properties/META-INF/MANIFEST.MF b/plugins/uml/properties/org.eclipse.papyrus.uml.properties/META-INF/MANIFEST.MF
index 4671b6a3d66..19ac22af265 100644
--- a/plugins/uml/properties/org.eclipse.papyrus.uml.properties/META-INF/MANIFEST.MF
+++ b/plugins/uml/properties/org.eclipse.papyrus.uml.properties/META-INF/MANIFEST.MF
@@ -3,7 +3,6 @@ Require-Bundle: org.eclipse.core.runtime,
org.eclipse.papyrus.views.properties.model;bundle-version="0.9.0",
org.eclipse.papyrus.views.properties;bundle-version="0.9.0",
org.eclipse.papyrus.infra.widgets;bundle-version="0.9.0",
- org.eclipse.papyrus.uml.diagram.common;bundle-version="0.9.0",
org.eclipse.papyrus.infra.services.edit;bundle-version="0.9.0",
org.eclipse.gmf.runtime.emf.core,
org.eclipse.emf.databinding;bundle-version="1.2.0",
@@ -12,25 +11,40 @@ Require-Bundle: org.eclipse.core.runtime,
org.eclipse.papyrus.infra.core.log;bundle-version="0.9.0",
org.eclipse.ui;bundle-version="3.6.1",
org.eclipse.papyrus.uml.profile;bundle-version="0.9.0",
- org.eclipse.papyrus.uml.modelexplorer.widgets;bundle-version="0.9.0",
org.eclipse.emf.facet.infra.query.core;bundle-version="0.1.0",
- org.eclipse.papyrus.uml.service.types;bundle-version="0.9.0",
- org.eclipse.ui.views.properties.tabbed;bundle-version="3.5.200",
- org.eclipse.gmf.runtime.notation;bundle-version="1.5.0",
- org.eclipse.gef;bundle-version="3.7.1",
- org.eclipse.gmf.runtime.diagram.ui;bundle-version="1.5.0",
org.eclipse.papyrus.uml.tools;bundle-version="0.9.0",
org.eclipse.papyrus.infra.emf;bundle-version="0.9.0",
org.eclipse.papyrus.infra.tools;bundle-version="0.9.0",
org.eclipse.papyrus.infra.constraints;bundle-version="0.9.0",
- org.eclipse.papyrus.infra.gmfdiag.properties;bundle-version="0.9.0"
+ org.eclipse.papyrus.infra.gmfdiag.properties;bundle-version="0.9.0",
+ org.eclipse.papyrus.uml.tools.utils;bundle-version="0.9.0",
+ org.eclipse.papyrus.infra.gmfdiag.common;bundle-version="0.9.0",
+ org.eclipse.papyrus.uml.extensionpoints;bundle-version="0.9.0",
+ org.eclipse.uml2.uml;bundle-version="4.0.0",
+ org.eclipse.uml2.common.edit;bundle-version="1.6.0",
+ org.eclipse.ui.views.properties.tabbed;bundle-version="3.5.200",
+ org.eclipse.papyrus.infra.emf.appearance;bundle-version="0.9.0",
+ org.eclipse.papyrus.uml.appearance;bundle-version="0.9.0",
+ org.eclipse.papyrus.uml.diagram.common;bundle-version="0.9.0",
+ org.eclipse.gmf.runtime.notation;bundle-version="1.5.0",
+ org.eclipse.gmf.runtime.diagram.ui;bundle-version="1.5.0"
Export-Package: org.eclipse.papyrus.uml.properties.constraints,
org.eclipse.papyrus.uml.properties.creation,
org.eclipse.papyrus.uml.properties.databinding,
org.eclipse.papyrus.uml.properties.datatype,
org.eclipse.papyrus.uml.properties.modelelement,
+ org.eclipse.papyrus.uml.properties.profile.ui.actions,
+ org.eclipse.papyrus.uml.properties.profile.ui.compositeforview,
+ org.eclipse.papyrus.uml.properties.profile.ui.compositesformodel,
+ org.eclipse.papyrus.uml.properties.profile.ui.dialogs,
+ org.eclipse.papyrus.uml.properties.profile.ui.items,
+ org.eclipse.papyrus.uml.properties.profile.ui.listeners,
+ org.eclipse.papyrus.uml.properties.profile.ui.panels,
+ org.eclipse.papyrus.uml.properties.profile.ui.section,
+ org.eclipse.papyrus.uml.properties.profile.ui.views,
org.eclipse.papyrus.uml.properties.providers,
- org.eclipse.papyrus.uml.properties.util
+ org.eclipse.papyrus.uml.properties.util,
+ org.eclipse.papyrus.uml.properties.widgets
Bundle-Vendor: %Bundle-Vendor
Bundle-ActivationPolicy: lazy
Bundle-Version: 0.9.0.qualifier
diff --git a/plugins/uml/properties/org.eclipse.papyrus.uml.properties/plugin.xml b/plugins/uml/properties/org.eclipse.papyrus.uml.properties/plugin.xml
index 4edf079b329..02e46b63930 100644
--- a/plugins/uml/properties/org.eclipse.papyrus.uml.properties/plugin.xml
+++ b/plugins/uml/properties/org.eclipse.papyrus.uml.properties/plugin.xml
@@ -37,8 +37,6 @@
</editor>
<editor editor="org.eclipse.papyrus.uml.properties.widgets.NaturalLanguageEditor" language="Natural language">
</editor>
- <editor editor="org.eclipse.papyrus.uml.properties.widgets.NaturalLanguageEditor" language="OCL">
- </editor>
</extension>
<extension point="org.eclipse.papyrus.views.properties.context">
<context contextModel="Model/UMLNotation/UMLNotation.ctx">
@@ -58,4 +56,13 @@
priority="50">
</labelProvider>
</extension>
+
+ <extension point="org.eclipse.ui.views.properties.tabbed.propertyTabs">
+ <propertyTabs
+ contributorId="TreeOutlinePage">
+ <propertyTab id="Base" label="General" category="org.eclipse.papyrus" afterTab=""/>
+ <propertyTab id="Comments" label="Comments" category="org.eclipse.papyrus" afterTab="Base"/>
+ <propertyTab id="advanced" label="Advanced" category="org.eclipse.papyrus" afterTab="Comments"/>
+ </propertyTabs>
+ </extension>
</plugin>
diff --git a/plugins/uml/properties/org.eclipse.papyrus.uml.properties/src/org/eclipse/papyrus/uml/properties/databinding/ElementCustomizationObservableValue.java b/plugins/uml/properties/org.eclipse.papyrus.uml.properties/src/org/eclipse/papyrus/uml/properties/databinding/ElementCustomizationObservableValue.java
index 7dc6d9f3c9c..d78334728a3 100644
--- a/plugins/uml/properties/org.eclipse.papyrus.uml.properties/src/org/eclipse/papyrus/uml/properties/databinding/ElementCustomizationObservableValue.java
+++ b/plugins/uml/properties/org.eclipse.papyrus.uml.properties/src/org/eclipse/papyrus/uml/properties/databinding/ElementCustomizationObservableValue.java
@@ -16,19 +16,19 @@ import org.eclipse.emf.common.command.UnexecutableCommand;
import org.eclipse.emf.transaction.TransactionalEditingDomain;
import org.eclipse.gef.EditPart;
import org.eclipse.gmf.runtime.notation.View;
+import org.eclipse.papyrus.infra.emf.appearance.commands.AddMaskManagedLabelDisplayCommand;
+import org.eclipse.papyrus.infra.emf.appearance.commands.SetNameLabelIconCommand;
+import org.eclipse.papyrus.infra.emf.appearance.commands.SetQualifiedNameDepthCommand;
+import org.eclipse.papyrus.infra.emf.appearance.commands.SetShadowFigureCommand;
+import org.eclipse.papyrus.infra.emf.appearance.helper.NameLabelIconHelper;
+import org.eclipse.papyrus.infra.emf.appearance.helper.QualifiedNameHelper;
+import org.eclipse.papyrus.infra.emf.appearance.helper.ShadowFigureHelper;
+import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IMaskManagedLabelEditPolicy;
import org.eclipse.papyrus.infra.tools.databinding.AggregatedObservable;
-import org.eclipse.papyrus.uml.diagram.common.editpolicies.IMaskManagedLabelEditPolicy;
import org.eclipse.papyrus.uml.properties.Activator;
import org.eclipse.papyrus.uml.tools.databinding.AbstractUMLAggregatedObservableValue;
import org.eclipse.papyrus.uml.tools.databinding.CommandBasedObservableValue;
import org.eclipse.papyrus.uml.tools.utils.UMLUtil;
-import org.eclipse.papyrus.uml.tools.utils.ui.command.AddMaskManagedLabelDisplayCommand;
-import org.eclipse.papyrus.uml.tools.utils.ui.command.SetNameLabelIconCommand;
-import org.eclipse.papyrus.uml.tools.utils.ui.command.SetQualifiedNameDepthCommand;
-import org.eclipse.papyrus.uml.tools.utils.ui.command.SetShadowFigureCommand;
-import org.eclipse.papyrus.uml.tools.utils.ui.helper.NameLabelIconHelper;
-import org.eclipse.papyrus.uml.tools.utils.ui.helper.QualifiedNameHelper;
-import org.eclipse.papyrus.uml.tools.utils.ui.helper.ShadowFigureHelper;
import org.eclipse.uml2.uml.Element;
/**
diff --git a/plugins/uml/properties/org.eclipse.papyrus.uml.properties/src/org/eclipse/papyrus/uml/properties/databinding/StereotypeAppearanceObservableValue.java b/plugins/uml/properties/org.eclipse.papyrus.uml.properties/src/org/eclipse/papyrus/uml/properties/databinding/StereotypeAppearanceObservableValue.java
index 34867c970c6..76d47f59542 100644
--- a/plugins/uml/properties/org.eclipse.papyrus.uml.properties/src/org/eclipse/papyrus/uml/properties/databinding/StereotypeAppearanceObservableValue.java
+++ b/plugins/uml/properties/org.eclipse.papyrus.uml.properties/src/org/eclipse/papyrus/uml/properties/databinding/StereotypeAppearanceObservableValue.java
@@ -27,10 +27,10 @@ import org.eclipse.emf.edit.domain.EditingDomain;
import org.eclipse.emf.transaction.RecordingCommand;
import org.eclipse.emf.transaction.TransactionalEditingDomain;
import org.eclipse.gmf.runtime.notation.View;
+import org.eclipse.papyrus.uml.appearance.helper.AppliedStereotypeHelper;
+import org.eclipse.papyrus.uml.appearance.helper.UMLVisualInformationPapyrusConstant;
import org.eclipse.papyrus.uml.properties.Activator;
import org.eclipse.papyrus.uml.tools.utils.ElementUtil;
-import org.eclipse.papyrus.uml.tools.utils.ui.VisualInformationPapyrusConstant;
-import org.eclipse.papyrus.uml.tools.utils.ui.helper.AppliedStereotypeHelper;
import org.eclipse.uml2.uml.Element;
import org.eclipse.uml2.uml.Stereotype;
@@ -110,11 +110,11 @@ public class StereotypeAppearanceObservableValue extends AbstractObservableValue
boolean hasIcons = ElementUtil.hasIcons(element, stereotype);
boolean hasShapes = ElementUtil.hasShapes(element, stereotype);
- if(stereotypePresentation.equals(VisualInformationPapyrusConstant.ICON_STEREOTYPE_PRESENTATION) && hasIcons) {
+ if(stereotypePresentation.equals(UMLVisualInformationPapyrusConstant.ICON_STEREOTYPE_PRESENTATION) && hasIcons) {
return ICON;
- } else if(stereotypePresentation.equals(VisualInformationPapyrusConstant.TEXT_ICON_STEREOTYPE_PRESENTATION) && hasIcons) {
+ } else if(stereotypePresentation.equals(UMLVisualInformationPapyrusConstant.TEXT_ICON_STEREOTYPE_PRESENTATION) && hasIcons) {
return TEXT_AND_ICON;
- } else if(stereotypePresentation.equals(VisualInformationPapyrusConstant.IMAGE_STEREOTYPE_PRESENTATION) && hasShapes) {
+ } else if(stereotypePresentation.equals(UMLVisualInformationPapyrusConstant.IMAGE_STEREOTYPE_PRESENTATION) && hasShapes) {
return SHAPE;
} else {
return TEXT;
@@ -129,9 +129,9 @@ public class StereotypeAppearanceObservableValue extends AbstractObservableValue
final String stereotypePresentation = AppliedStereotypeHelper.getAppliedStereotypePresentationKind(diagramElement);
if(stereotypePresentation != null) {
- if(stereotypePresentation.equals(VisualInformationPapyrusConstant.STEREOTYPE_TEXT_HORIZONTAL_PRESENTATION)) {
+ if(stereotypePresentation.equals(UMLVisualInformationPapyrusConstant.STEREOTYPE_TEXT_HORIZONTAL_PRESENTATION)) {
return HORIZONTAL;
- } else if(stereotypePresentation.equals(VisualInformationPapyrusConstant.STEREOTYPE_TEXT_VERTICAL_PRESENTATION)) {
+ } else if(stereotypePresentation.equals(UMLVisualInformationPapyrusConstant.STEREOTYPE_TEXT_VERTICAL_PRESENTATION)) {
return VERTICAL;
} else {
return HORIZONTAL;
@@ -172,16 +172,16 @@ public class StereotypeAppearanceObservableValue extends AbstractObservableValue
Stereotype stereotype = AppliedStereotypeHelper.getFirstDisplayedStereotype(diagramElement, element);
boolean hasIcons = ElementUtil.hasIcons(element, stereotype);
boolean hasShapes = ElementUtil.hasShapes(element, stereotype);
- String appliedStereotypeKind = VisualInformationPapyrusConstant.STEREOTYPE_TEXT_HORIZONTAL_PRESENTATION;
+ String appliedStereotypeKind = UMLVisualInformationPapyrusConstant.STEREOTYPE_TEXT_HORIZONTAL_PRESENTATION;
if(stereotypeAppearance.equals(TEXT)) {
- appliedStereotypeKind = VisualInformationPapyrusConstant.STEREOTYPE_TEXT_HORIZONTAL_PRESENTATION;
+ appliedStereotypeKind = UMLVisualInformationPapyrusConstant.STEREOTYPE_TEXT_HORIZONTAL_PRESENTATION;
} else if(stereotypeAppearance.equals(ICON) && hasIcons) {
- appliedStereotypeKind = VisualInformationPapyrusConstant.ICON_STEREOTYPE_PRESENTATION;
+ appliedStereotypeKind = UMLVisualInformationPapyrusConstant.ICON_STEREOTYPE_PRESENTATION;
} else if(stereotypeAppearance.equals(TEXT_AND_ICON) && hasIcons) {
- appliedStereotypeKind = VisualInformationPapyrusConstant.TEXT_ICON_STEREOTYPE_PRESENTATION;
+ appliedStereotypeKind = UMLVisualInformationPapyrusConstant.TEXT_ICON_STEREOTYPE_PRESENTATION;
} else if(stereotypeAppearance.equals(SHAPE) && hasShapes) {
- appliedStereotypeKind = VisualInformationPapyrusConstant.IMAGE_STEREOTYPE_PRESENTATION;
+ appliedStereotypeKind = UMLVisualInformationPapyrusConstant.IMAGE_STEREOTYPE_PRESENTATION;
}
@@ -192,11 +192,11 @@ public class StereotypeAppearanceObservableValue extends AbstractObservableValue
}
private void setTextAlignmentValue(String alignment) {
- String appliedStereotypeKind = VisualInformationPapyrusConstant.STEREOTYPE_TEXT_HORIZONTAL_PRESENTATION;
+ String appliedStereotypeKind = UMLVisualInformationPapyrusConstant.STEREOTYPE_TEXT_HORIZONTAL_PRESENTATION;
if(alignment.equals(HORIZONTAL)) {
- appliedStereotypeKind = VisualInformationPapyrusConstant.STEREOTYPE_TEXT_HORIZONTAL_PRESENTATION;
+ appliedStereotypeKind = UMLVisualInformationPapyrusConstant.STEREOTYPE_TEXT_HORIZONTAL_PRESENTATION;
} else if(alignment.equals(VERTICAL)) {
- appliedStereotypeKind = VisualInformationPapyrusConstant.STEREOTYPE_TEXT_VERTICAL_PRESENTATION;
+ appliedStereotypeKind = UMLVisualInformationPapyrusConstant.STEREOTYPE_TEXT_VERTICAL_PRESENTATION;
}
diff --git a/plugins/uml/properties/org.eclipse.papyrus.uml.properties/src/org/eclipse/papyrus/uml/properties/extensionpoint/LanguageEditorExtensionPoint.java b/plugins/uml/properties/org.eclipse.papyrus.uml.properties/src/org/eclipse/papyrus/uml/properties/extensionpoint/LanguageEditorExtensionPoint.java
index 4ea041d6572..32d627a2df6 100644
--- a/plugins/uml/properties/org.eclipse.papyrus.uml.properties/src/org/eclipse/papyrus/uml/properties/extensionpoint/LanguageEditorExtensionPoint.java
+++ b/plugins/uml/properties/org.eclipse.papyrus.uml.properties/src/org/eclipse/papyrus/uml/properties/extensionpoint/LanguageEditorExtensionPoint.java
@@ -43,7 +43,6 @@ public class LanguageEditorExtensionPoint {
String languageName = e.getAttribute("language"); //$NON-NLS-1$
String editorClassName = e.getAttribute("editor"); //$NON-NLS-1$
-
Editor editor = languagepreferencesFactory.eINSTANCE.createEditor();
editor.setClass(editorClassName);
LanguageRegistry.instance.registerEditor(languageName, editor);
diff --git a/plugins/uml/properties/org.eclipse.papyrus.uml.properties/src/org/eclipse/papyrus/uml/properties/modelelement/StereotypeAppearanceModelElement.java b/plugins/uml/properties/org.eclipse.papyrus.uml.properties/src/org/eclipse/papyrus/uml/properties/modelelement/StereotypeAppearanceModelElement.java
index fff0974d0c0..5da9abffbb4 100644
--- a/plugins/uml/properties/org.eclipse.papyrus.uml.properties/src/org/eclipse/papyrus/uml/properties/modelelement/StereotypeAppearanceModelElement.java
+++ b/plugins/uml/properties/org.eclipse.papyrus.uml.properties/src/org/eclipse/papyrus/uml/properties/modelelement/StereotypeAppearanceModelElement.java
@@ -11,6 +11,9 @@
*****************************************************************************/
package org.eclipse.papyrus.uml.properties.modelelement;
+import static org.eclipse.papyrus.uml.appearance.helper.UMLVisualInformationPapyrusConstant.STEREOTYPE_BRACE_LOCATION;
+import static org.eclipse.papyrus.uml.appearance.helper.UMLVisualInformationPapyrusConstant.STEREOTYPE_COMMENT_LOCATION;
+import static org.eclipse.papyrus.uml.appearance.helper.UMLVisualInformationPapyrusConstant.STEREOTYPE_COMPARTMENT_LOCATION;
import static org.eclipse.papyrus.uml.properties.util.StereotypeAppearanceConstants.DISPLAY_PLACE;
import static org.eclipse.papyrus.uml.properties.util.StereotypeAppearanceConstants.HORIZONTAL;
import static org.eclipse.papyrus.uml.properties.util.StereotypeAppearanceConstants.ICON;
@@ -20,9 +23,6 @@ import static org.eclipse.papyrus.uml.properties.util.StereotypeAppearanceConsta
import static org.eclipse.papyrus.uml.properties.util.StereotypeAppearanceConstants.TEXT_ALIGNMENT;
import static org.eclipse.papyrus.uml.properties.util.StereotypeAppearanceConstants.TEXT_AND_ICON;
import static org.eclipse.papyrus.uml.properties.util.StereotypeAppearanceConstants.VERTICAL;
-import static org.eclipse.papyrus.uml.tools.utils.ui.VisualInformationPapyrusConstant.STEREOTYPE_BRACE_LOCATION;
-import static org.eclipse.papyrus.uml.tools.utils.ui.VisualInformationPapyrusConstant.STEREOTYPE_COMMENT_LOCATION;
-import static org.eclipse.papyrus.uml.tools.utils.ui.VisualInformationPapyrusConstant.STEREOTYPE_COMPARTMENT_LOCATION;
import org.eclipse.core.databinding.observable.IObservable;
import org.eclipse.emf.ecore.EModelElement;
diff --git a/plugins/uml/properties/org.eclipse.papyrus.uml.properties/src/org/eclipse/papyrus/uml/properties/preferences/LanguageRegistry.java b/plugins/uml/properties/org.eclipse.papyrus.uml.properties/src/org/eclipse/papyrus/uml/properties/preferences/LanguageRegistry.java
index 3eda876dbbd..c16c68ac90a 100644
--- a/plugins/uml/properties/org.eclipse.papyrus.uml.properties/src/org/eclipse/papyrus/uml/properties/preferences/LanguageRegistry.java
+++ b/plugins/uml/properties/org.eclipse.papyrus.uml.properties/src/org/eclipse/papyrus/uml/properties/preferences/LanguageRegistry.java
@@ -54,7 +54,12 @@ public class LanguageRegistry {
try {
ResourceSet resourceSet = new ResourceSetImpl();
- preferences = (Preferences)EMFHelper.loadEMFModel(resourceSet, preferencesURI);
+ Object preferencesObject = EMFHelper.loadEMFModel(resourceSet, preferencesURI);
+ if(preferencesObject instanceof Preferences) {
+ preferences = (Preferences)preferencesObject;
+ } else {
+ createPreferences(preferencesURI);
+ }
} catch (IOException e) {
createPreferences(preferencesURI);
}
diff --git a/plugins/uml/org.eclipse.papyrus.uml.profile/src/org/eclipse/papyrus/uml/profile/ui/actions/AbstractPackageImportAction.java b/plugins/uml/properties/org.eclipse.papyrus.uml.properties/src/org/eclipse/papyrus/uml/properties/profile/ui/actions/AbstractPackageImportAction.java
index f91328809b5..597468bb384 100644
--- a/plugins/uml/org.eclipse.papyrus.uml.profile/src/org/eclipse/papyrus/uml/profile/ui/actions/AbstractPackageImportAction.java
+++ b/plugins/uml/properties/org.eclipse.papyrus.uml.properties/src/org/eclipse/papyrus/uml/properties/profile/ui/actions/AbstractPackageImportAction.java
@@ -13,7 +13,7 @@
* Ansgar Radermacher (CEA LIST) Ansgar.Radermacher@cea.fr - minor modifications
*
*****************************************************************************/
-package org.eclipse.papyrus.uml.profile.ui.actions;
+package org.eclipse.papyrus.uml.properties.profile.ui.actions;
import org.eclipse.emf.common.command.CommandStack;
import org.eclipse.emf.edit.domain.EditingDomain;
diff --git a/plugins/uml/org.eclipse.papyrus.uml.profile/src/org/eclipse/papyrus/uml/profile/ui/actions/AbstractViewActionDelegate.java b/plugins/uml/properties/org.eclipse.papyrus.uml.properties/src/org/eclipse/papyrus/uml/properties/profile/ui/actions/AbstractViewActionDelegate.java
index 9c18040619f..5f42b4f6d64 100644
--- a/plugins/uml/org.eclipse.papyrus.uml.profile/src/org/eclipse/papyrus/uml/profile/ui/actions/AbstractViewActionDelegate.java
+++ b/plugins/uml/properties/org.eclipse.papyrus.uml.properties/src/org/eclipse/papyrus/uml/properties/profile/ui/actions/AbstractViewActionDelegate.java
@@ -12,7 +12,7 @@
* Patrick Tessier (CEA LIST) Patrick.Tessier@cea.fr - modification
*
*****************************************************************************/
-package org.eclipse.papyrus.uml.profile.ui.actions;
+package org.eclipse.papyrus.uml.properties.profile.ui.actions;
import java.util.Iterator;
diff --git a/plugins/uml/org.eclipse.papyrus.uml.profile/src/org/eclipse/papyrus/uml/profile/ui/actions/ImportFromFile.java b/plugins/uml/properties/org.eclipse.papyrus.uml.properties/src/org/eclipse/papyrus/uml/properties/profile/ui/actions/ImportFromFile.java
index 2e460e6d31c..58818b01bff 100644
--- a/plugins/uml/org.eclipse.papyrus.uml.profile/src/org/eclipse/papyrus/uml/profile/ui/actions/ImportFromFile.java
+++ b/plugins/uml/properties/org.eclipse.papyrus.uml.properties/src/org/eclipse/papyrus/uml/properties/profile/ui/actions/ImportFromFile.java
@@ -12,7 +12,7 @@
* Patrick Tessier (CEA LIST) Patrick.Tessier@cea.fr - modification
*
*****************************************************************************/
-package org.eclipse.papyrus.uml.profile.ui.actions;
+package org.eclipse.papyrus.uml.properties.profile.ui.actions;
import java.util.ArrayList;
import java.util.Iterator;
@@ -24,7 +24,6 @@ import org.eclipse.emf.ecore.resource.Resource;
import org.eclipse.emf.ecore.resource.ResourceSet;
import org.eclipse.emf.edit.domain.EditingDomain;
import org.eclipse.jface.window.Window;
-import org.eclipse.papyrus.uml.extensionpoints.utils.Util;
import org.eclipse.papyrus.uml.profile.ui.dialogs.PackageImportTreeSelectionDialog;
import org.eclipse.swt.widgets.Shell;
import org.eclipse.ui.PlatformUI;
@@ -54,7 +53,7 @@ public class ImportFromFile extends AbstractPackageImportAction {
}
return command;
}
-
+
/**
* Specific {@link ChangeCommand} that imports libraries from repository
*/
@@ -76,7 +75,7 @@ public class ImportFromFile extends AbstractPackageImportAction {
super(editingDomain, new Runnable() {
public void run() {
-
+
// Retrieve shell instance
Shell shell = PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell();
@@ -92,7 +91,8 @@ public class ImportFromFile extends AbstractPackageImportAction {
return;
}
- ResourceSet resourceSet = Util.getResourceSet(selectedElement);
+ ResourceSet resourceSet = selectedElement.eResource().getResourceSet();
+
// Parse selection and add ModelLibrary files
for(int i = 0; i < selection.length; i++) {
@@ -103,8 +103,7 @@ public class ImportFromFile extends AbstractPackageImportAction {
URI modelUri = URI.createURI("platform:/resource" + currentFile.getFullPath());
Resource modelResource = resourceSet.getResource(modelUri, true);
- PackageImportTreeSelectionDialog eisd = new PackageImportTreeSelectionDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), ((Package)modelResource.getContents()
- .get(0)));
+ PackageImportTreeSelectionDialog eisd = new PackageImportTreeSelectionDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), ((Package)modelResource.getContents().get(0)));
int ret = eisd.open();
if(ret == Window.OK) {
@@ -114,7 +113,7 @@ public class ImportFromFile extends AbstractPackageImportAction {
Element element = (Element)resultIter.next();
PackageImport ei = UMLFactory.eINSTANCE.createPackageImport();
ei.setImportedPackage((Package)element);
- ((Package)selectedElement).getPackageImports().add(ei);
+ selectedElement.getPackageImports().add(ei);
}
}
diff --git a/plugins/uml/org.eclipse.papyrus.uml.profile/src/org/eclipse/papyrus/uml/profile/ui/actions/ImportLibrariesFromRepositoryAction.java b/plugins/uml/properties/org.eclipse.papyrus.uml.properties/src/org/eclipse/papyrus/uml/properties/profile/ui/actions/ImportLibrariesFromRepositoryAction.java
index bac57d49d37..f3981eed302 100644
--- a/plugins/uml/org.eclipse.papyrus.uml.profile/src/org/eclipse/papyrus/uml/profile/ui/actions/ImportLibrariesFromRepositoryAction.java
+++ b/plugins/uml/properties/org.eclipse.papyrus.uml.properties/src/org/eclipse/papyrus/uml/properties/profile/ui/actions/ImportLibrariesFromRepositoryAction.java
@@ -12,7 +12,7 @@
* Patrick Tessier (CEA LIST) Patrick.Tessier@cea.fr - modification
*
*****************************************************************************/
-package org.eclipse.papyrus.uml.profile.ui.actions;
+package org.eclipse.papyrus.uml.properties.profile.ui.actions;
import java.util.ArrayList;
import java.util.Arrays;
diff --git a/plugins/uml/org.eclipse.papyrus.uml.profile/src/org/eclipse/papyrus/uml/profile/ui/actions/ImportProfileAction.java b/plugins/uml/properties/org.eclipse.papyrus.uml.properties/src/org/eclipse/papyrus/uml/properties/profile/ui/actions/ImportProfileAction.java
index aaaf4f6699b..4748c02c005 100644
--- a/plugins/uml/org.eclipse.papyrus.uml.profile/src/org/eclipse/papyrus/uml/profile/ui/actions/ImportProfileAction.java
+++ b/plugins/uml/properties/org.eclipse.papyrus.uml.properties/src/org/eclipse/papyrus/uml/properties/profile/ui/actions/ImportProfileAction.java
@@ -11,7 +11,7 @@
* Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation
*
*****************************************************************************/
-package org.eclipse.papyrus.uml.profile.ui.actions;
+package org.eclipse.papyrus.uml.properties.profile.ui.actions;
import java.util.ArrayList;
import java.util.Arrays;
@@ -48,7 +48,7 @@ public class ImportProfileAction extends AbstractPackageImportAction {
/**
*
- * @see org.eclipse.papyrus.uml.profile.ui.actions.AbstractPackageImportAction#getCommand(org.eclipse.emf.edit.domain.EditingDomain)
+ * @see org.eclipse.papyrus.uml.properties.profile.ui.actions.AbstractPackageImportAction#getCommand(org.eclipse.emf.edit.domain.EditingDomain)
*
* @param domain
* @return
diff --git a/plugins/uml/org.eclipse.papyrus.uml.profile/src/org/eclipse/papyrus/uml/profile/ui/actions/ImportProfilesAsLibraryFromRepositoryAction.java b/plugins/uml/properties/org.eclipse.papyrus.uml.properties/src/org/eclipse/papyrus/uml/properties/profile/ui/actions/ImportProfilesAsLibraryFromRepositoryAction.java
index cd6d44a108d..5f7ed4cc549 100644
--- a/plugins/uml/org.eclipse.papyrus.uml.profile/src/org/eclipse/papyrus/uml/profile/ui/actions/ImportProfilesAsLibraryFromRepositoryAction.java
+++ b/plugins/uml/properties/org.eclipse.papyrus.uml.properties/src/org/eclipse/papyrus/uml/properties/profile/ui/actions/ImportProfilesAsLibraryFromRepositoryAction.java
@@ -12,7 +12,7 @@
* Patrick Tessier (CEA LIST) Patrick.Tessier@cea.fr - modification
*
*****************************************************************************/
-package org.eclipse.papyrus.uml.profile.ui.actions;
+package org.eclipse.papyrus.uml.properties.profile.ui.actions;
import java.util.ArrayList;
import java.util.Arrays;
diff --git a/plugins/uml/org.eclipse.papyrus.uml.profile/src/org/eclipse/papyrus/uml/profile/ui/actions/ReApplyProfiles.java b/plugins/uml/properties/org.eclipse.papyrus.uml.properties/src/org/eclipse/papyrus/uml/properties/profile/ui/actions/ReApplyProfiles.java
index c7593f5c0b9..35687274fc7 100644
--- a/plugins/uml/org.eclipse.papyrus.uml.profile/src/org/eclipse/papyrus/uml/profile/ui/actions/ReApplyProfiles.java
+++ b/plugins/uml/properties/org.eclipse.papyrus.uml.properties/src/org/eclipse/papyrus/uml/properties/profile/ui/actions/ReApplyProfiles.java
@@ -12,7 +12,7 @@
* Patrick Tessier (CEA LIST) Patrick.Tessier@cea.fr - modification
*
*****************************************************************************/
-package org.eclipse.papyrus.uml.profile.ui.actions;
+package org.eclipse.papyrus.uml.properties.profile.ui.actions;
import java.util.Iterator;
diff --git a/plugins/uml/org.eclipse.papyrus.uml.profile/src/org/eclipse/papyrus/uml/profile/ui/compositeforview/AppearanceForAppliedStereotypeComposite.java b/plugins/uml/properties/org.eclipse.papyrus.uml.properties/src/org/eclipse/papyrus/uml/properties/profile/ui/compositeforview/AppearanceForAppliedStereotypeComposite.java
index efcee6c4427..69fd13c0997 100644
--- a/plugins/uml/org.eclipse.papyrus.uml.profile/src/org/eclipse/papyrus/uml/profile/ui/compositeforview/AppearanceForAppliedStereotypeComposite.java
+++ b/plugins/uml/properties/org.eclipse.papyrus.uml.properties/src/org/eclipse/papyrus/uml/properties/profile/ui/compositeforview/AppearanceForAppliedStereotypeComposite.java
@@ -12,7 +12,7 @@
* Patrick Tessier (CEA LIST) Patrick.Tessier@cea.fr - modification
*
*****************************************************************************/
-package org.eclipse.papyrus.uml.profile.ui.compositeforview;
+package org.eclipse.papyrus.uml.properties.profile.ui.compositeforview;
import org.eclipse.emf.ecore.EModelElement;
import org.eclipse.emf.transaction.RecordingCommand;
@@ -22,13 +22,14 @@ import org.eclipse.jface.viewers.ISelection;
import org.eclipse.jface.viewers.IStructuredSelection;
import org.eclipse.jface.viewers.SelectionChangedEvent;
import org.eclipse.papyrus.infra.core.utils.EditorUtils;
+import org.eclipse.papyrus.uml.appearance.helper.AppliedStereotypeHelper;
import org.eclipse.papyrus.uml.profile.Activator;
import org.eclipse.papyrus.uml.profile.ImageManager;
import org.eclipse.papyrus.uml.profile.tree.DisplayedProfileElementLabelProvider;
import org.eclipse.papyrus.uml.profile.tree.objects.AppliedStereotypePropertyTreeObject;
import org.eclipse.papyrus.uml.profile.tree.objects.AppliedStereotypeTreeObject;
+import org.eclipse.papyrus.uml.properties.profile.ui.compositesformodel.DecoratedTreeComposite;
import org.eclipse.papyrus.uml.tools.utils.UMLUtil;
-import org.eclipse.papyrus.uml.tools.utils.ui.helper.AppliedStereotypeHelper;
import org.eclipse.swt.SWT;
import org.eclipse.swt.events.MouseEvent;
import org.eclipse.swt.events.MouseListener;
@@ -50,7 +51,7 @@ import org.eclipse.uml2.uml.Stereotype;
*
* when {@link TreeViewer#setSelection(ISelection)} runs the code could be changed
*/
-public class AppearanceForAppliedStereotypeComposite extends org.eclipse.papyrus.uml.profile.ui.compositeforview.AppliedStereotypeDisplayComposite implements IViewComposite {
+public class AppearanceForAppliedStereotypeComposite extends org.eclipse.papyrus.uml.properties.profile.ui.compositeforview.AppliedStereotypeDisplayComposite implements IViewComposite {
DisplayedProfileElementLabelProvider displayedProfileElementLabelProvider = new DisplayedProfileElementLabelProvider();
@@ -143,6 +144,7 @@ public class AppearanceForAppliedStereotypeComposite extends org.eclipse.papyrus
*
* {@inheritDoc}
*/
+ @Override
public Composite createContent(Composite parent, TabbedPropertySheetWidgetFactory factory) {
super.createContent(parent, factory);
@@ -242,8 +244,7 @@ public class AppearanceForAppliedStereotypeComposite extends org.eclipse.papyrus
if(treeSelection[i].getImage().equals(ImageManager.IMG_DISPLAYEDPROPERTY)) {
// removeStereotypePropertyDisplay(prop, ((StereotypeTreeObject) (treeSelection[i].getParentItem().getData())).getStereotype());
- removeStereotypeProperty(((AppliedStereotypeTreeObject)(treeSelection[i].getParentItem().getData())).getStereotype(), ((AppliedStereotypePropertyTreeObject)treeSelection[i]
- .getData()).getProperty());
+ removeStereotypeProperty(((AppliedStereotypeTreeObject)(treeSelection[i].getParentItem().getData())).getStereotype(), ((AppliedStereotypePropertyTreeObject)treeSelection[i].getData()).getProperty());
treeSelection[i].setImage(ImageManager.IMG_PROPERTY);
}
@@ -295,8 +296,9 @@ public class AppearanceForAppliedStereotypeComposite extends org.eclipse.papyrus
* {@inheritDoc}
*/
public void disposeListeners() {
- if(displayButton != null && !displayButton.isDisposed())
+ if(displayButton != null && !displayButton.isDisposed()) {
displayButton.removeMouseListener(displayButtonListener);
+ }
}
/**
@@ -315,6 +317,7 @@ public class AppearanceForAppliedStereotypeComposite extends org.eclipse.papyrus
/**
* {@inheritDoc}
*/
+ @Override
public Element getSelected() {
Object input = ((IStructuredSelection)selection).getFirstElement();
return UMLUtil.resolveUMLElement(input);
@@ -339,6 +342,7 @@ public class AppearanceForAppliedStereotypeComposite extends org.eclipse.papyrus
/**
* {@inheritDoc}
*/
+ @Override
public void refresh() {
if(diagramElement != null) {
displayedProfileElementLabelProvider.setDisplayedStereotype(AppliedStereotypeHelper.getStereotypesToDisplay(diagramElement));
@@ -348,8 +352,7 @@ public class AppearanceForAppliedStereotypeComposite extends org.eclipse.papyrus
super.refresh();
if((diagramElement == null) && (!displayButton.isDisposed())) {
displayButton.setEnabled(false);
- displayButton.setToolTipText("Stereotypes can only be displayed for elements with graphical representation. " + "Currently edited element is a non graphical element. "
- + "(example: an element selected in the outline is not a graphical element)");
+ displayButton.setToolTipText("Stereotypes can only be displayed for elements with graphical representation. " + "Currently edited element is a non graphical element. " + "(example: an element selected in the outline is not a graphical element)");
} else {
// button should be enabled only if a stereotype is selected, but it requires a listener on the tree selection
displayButton.setEnabled(true);
@@ -374,6 +377,7 @@ public class AppearanceForAppliedStereotypeComposite extends org.eclipse.papyrus
/**
* {@inheritDoc}
*/
+ @Override
public void selectionChanged(SelectionChangedEvent event) {
if(event == null) {
return;
diff --git a/plugins/uml/org.eclipse.papyrus.uml.profile/src/org/eclipse/papyrus/uml/profile/ui/compositeforview/AppliedProfileCompositeWithView.java b/plugins/uml/properties/org.eclipse.papyrus.uml.properties/src/org/eclipse/papyrus/uml/properties/profile/ui/compositeforview/AppliedProfileCompositeWithView.java
index 7354ad6a67e..2dd35c762eb 100644
--- a/plugins/uml/org.eclipse.papyrus.uml.profile/src/org/eclipse/papyrus/uml/profile/ui/compositeforview/AppliedProfileCompositeWithView.java
+++ b/plugins/uml/properties/org.eclipse.papyrus.uml.properties/src/org/eclipse/papyrus/uml/properties/profile/ui/compositeforview/AppliedProfileCompositeWithView.java
@@ -12,7 +12,7 @@
* Patrick Tessier (CEA LIST) Patrick.Tessier@cea.fr - modification
*
*****************************************************************************/
-package org.eclipse.papyrus.uml.profile.ui.compositeforview;
+package org.eclipse.papyrus.uml.properties.profile.ui.compositeforview;
import org.eclipse.emf.ecore.EModelElement;
import org.eclipse.jface.resource.JFaceColors;
@@ -24,7 +24,7 @@ import org.eclipse.uml2.uml.Profile;
/**
* The Class ProfileComposite to apply or unapply profile only on model element withou view.
*/
-public class AppliedProfileCompositeWithView extends org.eclipse.papyrus.uml.profile.ui.compositesformodel.AppliedProfileCompositeOnModel implements IViewComposite {
+public class AppliedProfileCompositeWithView extends org.eclipse.papyrus.uml.properties.profile.ui.compositesformodel.AppliedProfileCompositeOnModel implements IViewComposite {
/**
* The Constructor.
diff --git a/plugins/uml/org.eclipse.papyrus.uml.profile/src/org/eclipse/papyrus/uml/profile/ui/compositeforview/AppliedStereotypeCompositeWithView.java b/plugins/uml/properties/org.eclipse.papyrus.uml.properties/src/org/eclipse/papyrus/uml/properties/profile/ui/compositeforview/AppliedStereotypeCompositeWithView.java
index ce77687786f..816b4e9a0eb 100644
--- a/plugins/uml/org.eclipse.papyrus.uml.profile/src/org/eclipse/papyrus/uml/profile/ui/compositeforview/AppliedStereotypeCompositeWithView.java
+++ b/plugins/uml/properties/org.eclipse.papyrus.uml.properties/src/org/eclipse/papyrus/uml/properties/profile/ui/compositeforview/AppliedStereotypeCompositeWithView.java
@@ -12,7 +12,7 @@
* Patrick Tessier (CEA LIST) Patrick.Tessier@cea.fr - modification
*
*****************************************************************************/
-package org.eclipse.papyrus.uml.profile.ui.compositeforview;
+package org.eclipse.papyrus.uml.properties.profile.ui.compositeforview;
import org.eclipse.emf.ecore.EModelElement;
import org.eclipse.emf.transaction.RecordingCommand;
@@ -20,8 +20,8 @@ import org.eclipse.jface.resource.JFaceColors;
import org.eclipse.jface.viewers.ISelection;
import org.eclipse.jface.viewers.IStructuredSelection;
import org.eclipse.jface.viewers.SelectionChangedEvent;
+import org.eclipse.papyrus.uml.appearance.helper.AppliedStereotypeHelper;
import org.eclipse.papyrus.uml.profile.tree.objects.AppliedStereotypePropertyTreeObject;
-import org.eclipse.papyrus.uml.tools.utils.ui.helper.AppliedStereotypeHelper;
import org.eclipse.swt.widgets.Composite;
import org.eclipse.swt.widgets.Display;
import org.eclipse.ui.views.properties.tabbed.TabbedPropertySheetWidgetFactory;
@@ -31,7 +31,7 @@ import org.eclipse.uml2.uml.Stereotype;
/**
* This Composite allows displaying applied stereotypes from the model, but allows also displaying it in the associated view.
*/
-public class AppliedStereotypeCompositeWithView extends org.eclipse.papyrus.uml.profile.ui.compositesformodel.AppliedStereotypeCompositeOnModel implements IViewComposite {
+public class AppliedStereotypeCompositeWithView extends org.eclipse.papyrus.uml.properties.profile.ui.compositesformodel.AppliedStereotypeCompositeOnModel implements IViewComposite {
/**
* The selection.
diff --git a/plugins/uml/org.eclipse.papyrus.uml.profile/src/org/eclipse/papyrus/uml/profile/ui/compositeforview/AppliedStereotypeDisplayComposite.java b/plugins/uml/properties/org.eclipse.papyrus.uml.properties/src/org/eclipse/papyrus/uml/properties/profile/ui/compositeforview/AppliedStereotypeDisplayComposite.java
index 2eaf3ffc1a8..41425847664 100644
--- a/plugins/uml/org.eclipse.papyrus.uml.profile/src/org/eclipse/papyrus/uml/profile/ui/compositeforview/AppliedStereotypeDisplayComposite.java
+++ b/plugins/uml/properties/org.eclipse.papyrus.uml.properties/src/org/eclipse/papyrus/uml/properties/profile/ui/compositeforview/AppliedStereotypeDisplayComposite.java
@@ -12,7 +12,7 @@
* Patrick Tessier (CEA LIST) Patrick.Tessier@cea.fr - modification
*
*****************************************************************************/
-package org.eclipse.papyrus.uml.profile.ui.compositeforview;
+package org.eclipse.papyrus.uml.properties.profile.ui.compositeforview;
import org.eclipse.jface.viewers.ISelectionChangedListener;
import org.eclipse.jface.viewers.IStructuredSelection;
@@ -24,8 +24,8 @@ import org.eclipse.papyrus.uml.profile.tree.ProfileElementLabelProvider;
import org.eclipse.papyrus.uml.profile.tree.ProfileElementTreeViewerFilter;
import org.eclipse.papyrus.uml.profile.tree.objects.AppliedStereotypePropertyTreeObject;
import org.eclipse.papyrus.uml.profile.tree.objects.StereotypedElementTreeObject;
-import org.eclipse.papyrus.uml.profile.ui.compositesformodel.AppearanceDecoratedTreeComposite;
-import org.eclipse.papyrus.uml.profile.ui.panels.AppliedStereotypePanel;
+import org.eclipse.papyrus.uml.properties.profile.ui.compositesformodel.AppearanceDecoratedTreeComposite;
+import org.eclipse.papyrus.uml.properties.profile.ui.panels.AppliedStereotypePanel;
import org.eclipse.swt.SWT;
import org.eclipse.swt.custom.CLabel;
import org.eclipse.swt.widgets.Composite;
diff --git a/plugins/uml/org.eclipse.papyrus.uml.profile/src/org/eclipse/papyrus/uml/profile/ui/compositeforview/AppliedStereotypePropertyCompositeWithView.java b/plugins/uml/properties/org.eclipse.papyrus.uml.properties/src/org/eclipse/papyrus/uml/properties/profile/ui/compositeforview/AppliedStereotypePropertyCompositeWithView.java
index e435918b88b..d103b330db5 100644
--- a/plugins/uml/org.eclipse.papyrus.uml.profile/src/org/eclipse/papyrus/uml/profile/ui/compositeforview/AppliedStereotypePropertyCompositeWithView.java
+++ b/plugins/uml/properties/org.eclipse.papyrus.uml.properties/src/org/eclipse/papyrus/uml/properties/profile/ui/compositeforview/AppliedStereotypePropertyCompositeWithView.java
@@ -12,12 +12,12 @@
* Patrick Tessier (CEA LIST) Patrick.Tessier@cea.fr - modification
*
*****************************************************************************/
-package org.eclipse.papyrus.uml.profile.ui.compositeforview;
+package org.eclipse.papyrus.uml.properties.profile.ui.compositeforview;
import org.eclipse.emf.ecore.EModelElement;
import org.eclipse.emf.transaction.RecordingCommand;
import org.eclipse.jface.resource.JFaceColors;
-import org.eclipse.papyrus.uml.tools.utils.ui.helper.AppliedStereotypeHelper;
+import org.eclipse.papyrus.uml.appearance.helper.AppliedStereotypeHelper;
import org.eclipse.swt.SWT;
import org.eclipse.swt.widgets.Composite;
import org.eclipse.swt.widgets.Display;
@@ -26,7 +26,7 @@ import org.eclipse.swt.widgets.Display;
/**
* The Class PropertyComposite.
*/
-public class AppliedStereotypePropertyCompositeWithView extends org.eclipse.papyrus.uml.profile.ui.compositesformodel.PropertyComposite implements IViewComposite {
+public class AppliedStereotypePropertyCompositeWithView extends org.eclipse.papyrus.uml.properties.profile.ui.compositesformodel.PropertyComposite implements IViewComposite {
/**
* the current view
diff --git a/plugins/uml/org.eclipse.papyrus.uml.profile/src/org/eclipse/papyrus/uml/profile/ui/compositeforview/IViewComposite.java b/plugins/uml/properties/org.eclipse.papyrus.uml.properties/src/org/eclipse/papyrus/uml/properties/profile/ui/compositeforview/IViewComposite.java
index c66edc980cb..e4139e68e51 100644
--- a/plugins/uml/org.eclipse.papyrus.uml.profile/src/org/eclipse/papyrus/uml/profile/ui/compositeforview/IViewComposite.java
+++ b/plugins/uml/properties/org.eclipse.papyrus.uml.properties/src/org/eclipse/papyrus/uml/properties/profile/ui/compositeforview/IViewComposite.java
@@ -12,7 +12,7 @@
* Patrick Tessier (CEA LIST) Patrick.Tessier@cea.fr - modification
*
*****************************************************************************/
-package org.eclipse.papyrus.uml.profile.ui.compositeforview;
+package org.eclipse.papyrus.uml.properties.profile.ui.compositeforview;
import org.eclipse.emf.ecore.EModelElement;
diff --git a/plugins/uml/org.eclipse.papyrus.uml.profile/src/org/eclipse/papyrus/uml/profile/ui/compositeforview/ProfileElementWithDisplayContentProvider.java b/plugins/uml/properties/org.eclipse.papyrus.uml.properties/src/org/eclipse/papyrus/uml/properties/profile/ui/compositeforview/ProfileElementWithDisplayContentProvider.java
index b441ed600bf..a11ed35f120 100644
--- a/plugins/uml/org.eclipse.papyrus.uml.profile/src/org/eclipse/papyrus/uml/profile/ui/compositeforview/ProfileElementWithDisplayContentProvider.java
+++ b/plugins/uml/properties/org.eclipse.papyrus.uml.properties/src/org/eclipse/papyrus/uml/properties/profile/ui/compositeforview/ProfileElementWithDisplayContentProvider.java
@@ -12,7 +12,7 @@
* Patrick Tessier (CEA LIST) Patrick.Tessier@cea.fr - modification
*
*****************************************************************************/
-package org.eclipse.papyrus.uml.profile.ui.compositeforview;
+package org.eclipse.papyrus.uml.properties.profile.ui.compositeforview;
import org.eclipse.emf.ecore.EModelElement;
import org.eclipse.papyrus.uml.profile.tree.ProfileElementContentProvider;
diff --git a/plugins/uml/org.eclipse.papyrus.uml.profile/src/org/eclipse/papyrus/uml/profile/ui/compositeforview/ProfileElementWithDisplayLabelProvider.java b/plugins/uml/properties/org.eclipse.papyrus.uml.properties/src/org/eclipse/papyrus/uml/properties/profile/ui/compositeforview/ProfileElementWithDisplayLabelProvider.java
index 85e49b1cd77..94e2dbefc52 100644
--- a/plugins/uml/org.eclipse.papyrus.uml.profile/src/org/eclipse/papyrus/uml/profile/ui/compositeforview/ProfileElementWithDisplayLabelProvider.java
+++ b/plugins/uml/properties/org.eclipse.papyrus.uml.properties/src/org/eclipse/papyrus/uml/properties/profile/ui/compositeforview/ProfileElementWithDisplayLabelProvider.java
@@ -12,7 +12,7 @@
* Patrick Tessier (CEA LIST) Patrick.Tessier@cea.fr - modification
*
*****************************************************************************/
-package org.eclipse.papyrus.uml.profile.ui.compositeforview;
+package org.eclipse.papyrus.uml.properties.profile.ui.compositeforview;
import org.eclipse.papyrus.uml.profile.ImageManager;
import org.eclipse.papyrus.uml.profile.tree.ProfileElementLabelProvider;
diff --git a/plugins/uml/org.eclipse.papyrus.uml.profile/src/org/eclipse/papyrus/uml/profile/ui/compositeforview/StereotypePropertiesDoubleClickListener.java b/plugins/uml/properties/org.eclipse.papyrus.uml.properties/src/org/eclipse/papyrus/uml/properties/profile/ui/compositeforview/StereotypePropertiesDoubleClickListener.java
index 0c7db40fcea..2c90b1511c2 100644
--- a/plugins/uml/org.eclipse.papyrus.uml.profile/src/org/eclipse/papyrus/uml/profile/ui/compositeforview/StereotypePropertiesDoubleClickListener.java
+++ b/plugins/uml/properties/org.eclipse.papyrus.uml.properties/src/org/eclipse/papyrus/uml/properties/profile/ui/compositeforview/StereotypePropertiesDoubleClickListener.java
@@ -12,10 +12,10 @@
* Patrick Tessier (CEA LIST) Patrick.Tessier@cea.fr - modification
*
*****************************************************************************/
-package org.eclipse.papyrus.uml.profile.ui.compositeforview;
+package org.eclipse.papyrus.uml.properties.profile.ui.compositeforview;
import org.eclipse.jface.viewers.TreeViewer;
-import org.eclipse.papyrus.uml.profile.ui.listeners.DoubleClickListener;
+import org.eclipse.papyrus.uml.properties.profile.ui.listeners.DoubleClickListener;
import org.eclipse.swt.widgets.TreeItem;
// TODO: Auto-generated Javadoc
diff --git a/plugins/uml/org.eclipse.papyrus.uml.profile/src/org/eclipse/papyrus/uml/profile/ui/compositesformodel/AppearanceDecoratedTreeComposite.java b/plugins/uml/properties/org.eclipse.papyrus.uml.properties/src/org/eclipse/papyrus/uml/properties/profile/ui/compositesformodel/AppearanceDecoratedTreeComposite.java
index 06444c8ef20..ae973dd0084 100644
--- a/plugins/uml/org.eclipse.papyrus.uml.profile/src/org/eclipse/papyrus/uml/profile/ui/compositesformodel/AppearanceDecoratedTreeComposite.java
+++ b/plugins/uml/properties/org.eclipse.papyrus.uml.properties/src/org/eclipse/papyrus/uml/properties/profile/ui/compositesformodel/AppearanceDecoratedTreeComposite.java
@@ -12,7 +12,7 @@
* Patrick Tessier (CEA LIST) Patrick.Tessier@cea.fr - modification
*
*****************************************************************************/
-package org.eclipse.papyrus.uml.profile.ui.compositesformodel;
+package org.eclipse.papyrus.uml.properties.profile.ui.compositesformodel;
import org.eclipse.gef.commands.CommandStack;
import org.eclipse.jface.viewers.TreeViewer;
diff --git a/plugins/uml/org.eclipse.papyrus.uml.profile/src/org/eclipse/papyrus/uml/profile/ui/compositesformodel/AppliedProfileCompositeOnModel.java b/plugins/uml/properties/org.eclipse.papyrus.uml.properties/src/org/eclipse/papyrus/uml/properties/profile/ui/compositesformodel/AppliedProfileCompositeOnModel.java
index c36cda5b40c..dabbc8218d0 100644
--- a/plugins/uml/org.eclipse.papyrus.uml.profile/src/org/eclipse/papyrus/uml/profile/ui/compositesformodel/AppliedProfileCompositeOnModel.java
+++ b/plugins/uml/properties/org.eclipse.papyrus.uml.properties/src/org/eclipse/papyrus/uml/properties/profile/ui/compositesformodel/AppliedProfileCompositeOnModel.java
@@ -13,7 +13,7 @@
* Emilien Perico (Atos Origin) - fix bug on refresh
*
*****************************************************************************/
-package org.eclipse.papyrus.uml.profile.ui.compositesformodel;
+package org.eclipse.papyrus.uml.properties.profile.ui.compositesformodel;
import java.util.ArrayList;
import java.util.Iterator;
@@ -38,11 +38,11 @@ import org.eclipse.jface.viewers.ITreeContentProvider;
import org.eclipse.papyrus.infra.core.utils.EditorUtils;
import org.eclipse.papyrus.uml.profile.Activator;
import org.eclipse.papyrus.uml.profile.ImageManager;
-import org.eclipse.papyrus.uml.profile.ui.dialogs.FileSelectionFilter;
-import org.eclipse.papyrus.uml.profile.ui.dialogs.Message;
import org.eclipse.papyrus.uml.profile.ui.dialogs.ProfileTreeSelectionDialog;
-import org.eclipse.papyrus.uml.profile.ui.dialogs.RegisteredProfileSelectionDialog;
-import org.eclipse.papyrus.uml.profile.ui.panels.AppliedProfilePanel;
+import org.eclipse.papyrus.uml.properties.profile.ui.dialogs.FileSelectionFilter;
+import org.eclipse.papyrus.uml.properties.profile.ui.dialogs.Message;
+import org.eclipse.papyrus.uml.properties.profile.ui.dialogs.RegisteredProfileSelectionDialog;
+import org.eclipse.papyrus.uml.properties.profile.ui.panels.AppliedProfilePanel;
import org.eclipse.papyrus.uml.tools.utils.PackageUtil;
import org.eclipse.papyrus.uml.tools.utils.UMLUtil;
import org.eclipse.swt.SWT;
@@ -198,7 +198,7 @@ public class AppliedProfileCompositeOnModel extends Composite {
dialog.setMessage("Choose profiles to apply");
dialog.setInput(ResourcesPlugin.getWorkspace().getRoot());
dialog.addFilter(new FileSelectionFilter(filetypes));
- dialog.setValidator(new org.eclipse.papyrus.uml.profile.ui.dialogs.FileSelectionValidator());
+ dialog.setValidator(new org.eclipse.papyrus.uml.properties.profile.ui.dialogs.FileSelectionValidator());
dialog.setDoubleClickSelects(true);
dialog.setHelpAvailable(false);
dialog.setAllowMultiple(true);
diff --git a/plugins/uml/org.eclipse.papyrus.uml.profile/src/org/eclipse/papyrus/uml/profile/ui/compositesformodel/AppliedStereotypeCompositeOnModel.java b/plugins/uml/properties/org.eclipse.papyrus.uml.properties/src/org/eclipse/papyrus/uml/properties/profile/ui/compositesformodel/AppliedStereotypeCompositeOnModel.java
index cab9dd1d92d..989dd6ba598 100644
--- a/plugins/uml/org.eclipse.papyrus.uml.profile/src/org/eclipse/papyrus/uml/profile/ui/compositesformodel/AppliedStereotypeCompositeOnModel.java
+++ b/plugins/uml/properties/org.eclipse.papyrus.uml.properties/src/org/eclipse/papyrus/uml/properties/profile/ui/compositesformodel/AppliedStereotypeCompositeOnModel.java
@@ -12,7 +12,7 @@
* Patrick Tessier (CEA LIST) Patrick.Tessier@cea.fr - modification
*
*****************************************************************************/
-package org.eclipse.papyrus.uml.profile.ui.compositesformodel;
+package org.eclipse.papyrus.uml.properties.profile.ui.compositesformodel;
import java.util.ArrayList;
import java.util.Iterator;
@@ -35,9 +35,9 @@ import org.eclipse.papyrus.uml.profile.tree.ProfileElementTreeViewerFilter;
import org.eclipse.papyrus.uml.profile.tree.objects.AppliedStereotypePropertyTreeObject;
import org.eclipse.papyrus.uml.profile.tree.objects.AppliedStereotypeTreeObject;
import org.eclipse.papyrus.uml.profile.tree.objects.StereotypedElementTreeObject;
-import org.eclipse.papyrus.uml.profile.ui.dialogs.ChooseSetStereotypeDialog;
-import org.eclipse.papyrus.uml.profile.ui.panels.AppliedStereotypePanel;
import org.eclipse.papyrus.uml.profile.utils.Util;
+import org.eclipse.papyrus.uml.properties.profile.ui.dialogs.ChooseSetStereotypeDialog;
+import org.eclipse.papyrus.uml.properties.profile.ui.panels.AppliedStereotypePanel;
import org.eclipse.swt.SWT;
import org.eclipse.swt.custom.CLabel;
import org.eclipse.swt.widgets.Composite;
diff --git a/plugins/uml/org.eclipse.papyrus.uml.profile/src/org/eclipse/papyrus/uml/profile/ui/compositesformodel/DecoratedTreeComposite.java b/plugins/uml/properties/org.eclipse.papyrus.uml.properties/src/org/eclipse/papyrus/uml/properties/profile/ui/compositesformodel/DecoratedTreeComposite.java
index f0e8cbb1c26..608c1f9f3fd 100644
--- a/plugins/uml/org.eclipse.papyrus.uml.profile/src/org/eclipse/papyrus/uml/profile/ui/compositesformodel/DecoratedTreeComposite.java
+++ b/plugins/uml/properties/org.eclipse.papyrus.uml.properties/src/org/eclipse/papyrus/uml/properties/profile/ui/compositesformodel/DecoratedTreeComposite.java
@@ -12,7 +12,7 @@
* Patrick Tessier (CEA LIST) Patrick.Tessier@cea.fr - modification
*
*****************************************************************************/
-package org.eclipse.papyrus.uml.profile.ui.compositesformodel;
+package org.eclipse.papyrus.uml.properties.profile.ui.compositesformodel;
import org.eclipse.gef.commands.CommandStack;
import org.eclipse.jface.viewers.TreeViewer;
diff --git a/plugins/uml/org.eclipse.papyrus.uml.profile/src/org/eclipse/papyrus/uml/profile/ui/compositesformodel/ISectionComposite.java b/plugins/uml/properties/org.eclipse.papyrus.uml.properties/src/org/eclipse/papyrus/uml/properties/profile/ui/compositesformodel/ISectionComposite.java
index bb21f86352d..60f6628ad49 100644
--- a/plugins/uml/org.eclipse.papyrus.uml.profile/src/org/eclipse/papyrus/uml/profile/ui/compositesformodel/ISectionComposite.java
+++ b/plugins/uml/properties/org.eclipse.papyrus.uml.properties/src/org/eclipse/papyrus/uml/properties/profile/ui/compositesformodel/ISectionComposite.java
@@ -12,7 +12,7 @@
* Patrick Tessier (CEA LIST) Patrick.Tessier@cea.fr - modification
*
*****************************************************************************/
-package org.eclipse.papyrus.uml.profile.ui.compositesformodel;
+package org.eclipse.papyrus.uml.properties.profile.ui.compositesformodel;
import org.eclipse.swt.widgets.Composite;
import org.eclipse.ui.views.properties.tabbed.TabbedPropertySheetWidgetFactory;
diff --git a/plugins/uml/org.eclipse.papyrus.uml.profile/src/org/eclipse/papyrus/uml/profile/ui/compositesformodel/PropertyComposite.java b/plugins/uml/properties/org.eclipse.papyrus.uml.properties/src/org/eclipse/papyrus/uml/properties/profile/ui/compositesformodel/PropertyComposite.java
index 4ac1fd784e4..37ca929d9b6 100644
--- a/plugins/uml/org.eclipse.papyrus.uml.profile/src/org/eclipse/papyrus/uml/profile/ui/compositesformodel/PropertyComposite.java
+++ b/plugins/uml/properties/org.eclipse.papyrus.uml.properties/src/org/eclipse/papyrus/uml/properties/profile/ui/compositesformodel/PropertyComposite.java
@@ -13,7 +13,7 @@
* Ansgar Radermacher (CEA LIST) Ansgar.Radermacher@cea.fr - modification, clean-up
*
*****************************************************************************/
-package org.eclipse.papyrus.uml.profile.ui.compositesformodel;
+package org.eclipse.papyrus.uml.properties.profile.ui.compositesformodel;
import java.util.ArrayList;
diff --git a/plugins/uml/org.eclipse.papyrus.uml.profile/src/org/eclipse/papyrus/uml/profile/ui/dialogs/ChooseSetStereotypeDialog.java b/plugins/uml/properties/org.eclipse.papyrus.uml.properties/src/org/eclipse/papyrus/uml/properties/profile/ui/dialogs/ChooseSetStereotypeDialog.java
index 969ee3ee19a..7f2308d5b7d 100644
--- a/plugins/uml/org.eclipse.papyrus.uml.profile/src/org/eclipse/papyrus/uml/profile/ui/dialogs/ChooseSetStereotypeDialog.java
+++ b/plugins/uml/properties/org.eclipse.papyrus.uml.properties/src/org/eclipse/papyrus/uml/properties/profile/ui/dialogs/ChooseSetStereotypeDialog.java
@@ -12,12 +12,15 @@
* Patrick Tessier (CEA LIST) Patrick.Tessier@cea.fr - modification
*
*****************************************************************************/
-package org.eclipse.papyrus.uml.profile.ui.dialogs;
+package org.eclipse.papyrus.uml.properties.profile.ui.dialogs;
import java.util.ArrayList;
import java.util.Collections;
import java.util.Iterator;
+import org.eclipse.papyrus.uml.profile.ui.dialogs.AlphabeticalViewerSorter;
+import org.eclipse.papyrus.uml.profile.ui.dialogs.ChooseSetAssistedDialog;
+import org.eclipse.papyrus.uml.profile.ui.dialogs.IChooseDialog;
import org.eclipse.swt.SWT;
import org.eclipse.swt.events.SelectionAdapter;
import org.eclipse.swt.events.SelectionEvent;
diff --git a/plugins/uml/org.eclipse.papyrus.uml.profile/src/org/eclipse/papyrus/uml/profile/ui/dialogs/FileSelectionFilter.java b/plugins/uml/properties/org.eclipse.papyrus.uml.properties/src/org/eclipse/papyrus/uml/properties/profile/ui/dialogs/FileSelectionFilter.java
index b46f6f005e8..18684fade1a 100644
--- a/plugins/uml/org.eclipse.papyrus.uml.profile/src/org/eclipse/papyrus/uml/profile/ui/dialogs/FileSelectionFilter.java
+++ b/plugins/uml/properties/org.eclipse.papyrus.uml.properties/src/org/eclipse/papyrus/uml/properties/profile/ui/dialogs/FileSelectionFilter.java
@@ -12,7 +12,7 @@
* Patrick Tessier (CEA LIST) Patrick.Tessier@cea.fr - modification
*
*****************************************************************************/
-package org.eclipse.papyrus.uml.profile.ui.dialogs;
+package org.eclipse.papyrus.uml.properties.profile.ui.dialogs;
import java.util.List;
diff --git a/plugins/uml/org.eclipse.papyrus.uml.profile/src/org/eclipse/papyrus/uml/profile/ui/dialogs/FileSelectionValidator.java b/plugins/uml/properties/org.eclipse.papyrus.uml.properties/src/org/eclipse/papyrus/uml/properties/profile/ui/dialogs/FileSelectionValidator.java
index 4d3e989d580..53f1ad640d6 100644
--- a/plugins/uml/org.eclipse.papyrus.uml.profile/src/org/eclipse/papyrus/uml/profile/ui/dialogs/FileSelectionValidator.java
+++ b/plugins/uml/properties/org.eclipse.papyrus.uml.properties/src/org/eclipse/papyrus/uml/properties/profile/ui/dialogs/FileSelectionValidator.java
@@ -12,7 +12,7 @@
* Patrick Tessier (CEA LIST) Patrick.Tessier@cea.fr - modification
*
*****************************************************************************/
-package org.eclipse.papyrus.uml.profile.ui.dialogs;
+package org.eclipse.papyrus.uml.properties.profile.ui.dialogs;
import org.eclipse.core.resources.IFile;
import org.eclipse.core.runtime.IStatus;
diff --git a/plugins/uml/org.eclipse.papyrus.uml.profile/src/org/eclipse/papyrus/uml/profile/ui/dialogs/Message.java b/plugins/uml/properties/org.eclipse.papyrus.uml.properties/src/org/eclipse/papyrus/uml/properties/profile/ui/dialogs/Message.java
index ac66b4c4c7c..3d740d4e6fe 100644
--- a/plugins/uml/org.eclipse.papyrus.uml.profile/src/org/eclipse/papyrus/uml/profile/ui/dialogs/Message.java
+++ b/plugins/uml/properties/org.eclipse.papyrus.uml.properties/src/org/eclipse/papyrus/uml/properties/profile/ui/dialogs/Message.java
@@ -12,7 +12,7 @@
* Patrick Tessier (CEA LIST) Patrick.Tessier@cea.fr - modification
*
*****************************************************************************/
-package org.eclipse.papyrus.uml.profile.ui.dialogs;
+package org.eclipse.papyrus.uml.properties.profile.ui.dialogs;
import org.eclipse.swt.SWT;
import org.eclipse.swt.widgets.Label;
diff --git a/plugins/uml/org.eclipse.papyrus.uml.profile/src/org/eclipse/papyrus/uml/profile/ui/dialogs/RegisteredProfileSelectionDialog.java b/plugins/uml/properties/org.eclipse.papyrus.uml.properties/src/org/eclipse/papyrus/uml/properties/profile/ui/dialogs/RegisteredProfileSelectionDialog.java
index c34f760533d..3c41342c1a4 100644
--- a/plugins/uml/org.eclipse.papyrus.uml.profile/src/org/eclipse/papyrus/uml/profile/ui/dialogs/RegisteredProfileSelectionDialog.java
+++ b/plugins/uml/properties/org.eclipse.papyrus.uml.properties/src/org/eclipse/papyrus/uml/properties/profile/ui/dialogs/RegisteredProfileSelectionDialog.java
@@ -12,7 +12,7 @@
* Patrick Tessier (CEA LIST) Patrick.Tessier@cea.fr - modification
*
*****************************************************************************/
-package org.eclipse.papyrus.uml.profile.ui.dialogs;
+package org.eclipse.papyrus.uml.properties.profile.ui.dialogs;
import java.util.ArrayList;
import java.util.List;
@@ -24,6 +24,7 @@ import org.eclipse.jface.dialogs.Dialog;
import org.eclipse.papyrus.uml.extensionpoints.profile.RegisteredProfile;
import org.eclipse.papyrus.uml.extensionpoints.standard.FilteredRegisteredElementsSelectionDialog;
import org.eclipse.papyrus.uml.extensionpoints.utils.Util;
+import org.eclipse.papyrus.uml.profile.ui.dialogs.ProfileTreeSelectionDialog;
import org.eclipse.swt.widgets.Composite;
import org.eclipse.uml2.uml.Package;
import org.eclipse.uml2.uml.Profile;
diff --git a/plugins/uml/org.eclipse.papyrus.uml.profile/src/org/eclipse/papyrus/uml/profile/ui/dialogs/StereotypeLabelProvider.java b/plugins/uml/properties/org.eclipse.papyrus.uml.properties/src/org/eclipse/papyrus/uml/properties/profile/ui/dialogs/StereotypeLabelProvider.java
index 83c61898cfc..2af9fbf1dac 100644
--- a/plugins/uml/org.eclipse.papyrus.uml.profile/src/org/eclipse/papyrus/uml/profile/ui/dialogs/StereotypeLabelProvider.java
+++ b/plugins/uml/properties/org.eclipse.papyrus.uml.properties/src/org/eclipse/papyrus/uml/properties/profile/ui/dialogs/StereotypeLabelProvider.java
@@ -12,7 +12,7 @@
* Patrick Tessier (CEA LIST) Patrick.Tessier@cea.fr - modification
*
*****************************************************************************/
-package org.eclipse.papyrus.uml.profile.ui.dialogs;
+package org.eclipse.papyrus.uml.properties.profile.ui.dialogs;
import org.eclipse.jface.viewers.ITableLabelProvider;
import org.eclipse.jface.viewers.LabelProvider;
diff --git a/plugins/uml/org.eclipse.papyrus.uml.profile/src/org/eclipse/papyrus/uml/profile/ui/dialogs/StereotypeQualifiedLabelProvider.java b/plugins/uml/properties/org.eclipse.papyrus.uml.properties/src/org/eclipse/papyrus/uml/properties/profile/ui/dialogs/StereotypeQualifiedLabelProvider.java
index 4ab6c4986c1..c642b62afb2 100644
--- a/plugins/uml/org.eclipse.papyrus.uml.profile/src/org/eclipse/papyrus/uml/profile/ui/dialogs/StereotypeQualifiedLabelProvider.java
+++ b/plugins/uml/properties/org.eclipse.papyrus.uml.properties/src/org/eclipse/papyrus/uml/properties/profile/ui/dialogs/StereotypeQualifiedLabelProvider.java
@@ -12,7 +12,7 @@
* Patrick Tessier (CEA LIST) Patrick.Tessier@cea.fr - modification
*
*****************************************************************************/
-package org.eclipse.papyrus.uml.profile.ui.dialogs;
+package org.eclipse.papyrus.uml.properties.profile.ui.dialogs;
import org.eclipse.uml2.uml.Stereotype;
diff --git a/plugins/uml/properties/org.eclipse.papyrus.uml.properties/src/org/eclipse/papyrus/uml/properties/profile/ui/items/CompositeItems.java b/plugins/uml/properties/org.eclipse.papyrus.uml.properties/src/org/eclipse/papyrus/uml/properties/profile/ui/items/CompositeItems.java
new file mode 100644
index 00000000000..429e2432dc9
--- /dev/null
+++ b/plugins/uml/properties/org.eclipse.papyrus.uml.properties/src/org/eclipse/papyrus/uml/properties/profile/ui/items/CompositeItems.java
@@ -0,0 +1,98 @@
+/*****************************************************************************
+ * Copyright (c) 2008 CEA LIST.
+ *
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * Chokri Mraidha (CEA LIST) Chokri.Mraidha@cea.fr - Initial API and implementation
+ * Patrick Tessier (CEA LIST) Patrick.Tessier@cea.fr - modification
+ *
+ *****************************************************************************/
+package org.eclipse.papyrus.uml.properties.profile.ui.items;
+
+import java.util.List;
+
+import org.eclipse.emf.ecore.EObject;
+import org.eclipse.papyrus.uml.profile.Message;
+import org.eclipse.swt.SWT;
+import org.eclipse.swt.widgets.Table;
+import org.eclipse.swt.widgets.TableItem;
+import org.eclipse.uml2.uml.Property;
+
+
+// TODO: Auto-generated Javadoc
+/**
+ * The Class CompositeItems.
+ */
+public class CompositeItems {
+
+ /**
+ * The Constructor.
+ *
+ * @param table
+ * the table
+ * @param value
+ * the value
+ * @param property
+ * the property
+ */
+ public CompositeItems(Table table, Property property, Object value) {
+
+ // Checking rule
+ if(property.getLower() > 0) {
+ Message.error(
+ "Property of type Stereotype and multiplicity lower value != 0.\n"
+ + " The profile is ill formed !");
+ }
+
+ if(property.isMultivalued()) { // property is multivalued
+ final List propValues = (List)value;
+
+ for(int i = 0; i < propValues.size(); i++) {
+ createItem(table, property, propValues.get(i));
+ }
+
+ } else { // property is not multivalued
+
+ // if the property has a value
+ if(value != null) {
+ createItem(table, property, value);
+ }
+ }
+ }
+
+ /**
+ * Creates a new item for current objet int the table.
+ *
+ * @param table
+ * the table
+ * @param object
+ * the object
+ * @param property
+ * the property
+ */
+ private void createItem(Table table, Property property, Object object) {
+
+ EObject eObject = null;
+
+ // Prepare Item data
+ if(object instanceof EObject) {
+ eObject = (EObject)object;
+
+ } else { // Error
+ String err = "Type " + object.toString() + " of Property " + property.getName() + " is not an EObject.";
+ Message.error(err);
+ }
+
+ if(eObject != null) {
+ // Prepare Item label
+ TableItem propValueItem = new TableItem(table, SWT.NONE);
+ propValueItem.setText(eObject.getClass().getName());
+ propValueItem.setData(eObject);
+ }
+ }
+}
diff --git a/plugins/uml/properties/org.eclipse.papyrus.uml.properties/src/org/eclipse/papyrus/uml/properties/profile/ui/items/DataTypeItems.java b/plugins/uml/properties/org.eclipse.papyrus.uml.properties/src/org/eclipse/papyrus/uml/properties/profile/ui/items/DataTypeItems.java
new file mode 100644
index 00000000000..641bd33a3aa
--- /dev/null
+++ b/plugins/uml/properties/org.eclipse.papyrus.uml.properties/src/org/eclipse/papyrus/uml/properties/profile/ui/items/DataTypeItems.java
@@ -0,0 +1,58 @@
+/*****************************************************************************
+ * Copyright (c) 2008 CEA LIST.
+ *
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * Chokri Mraidha (CEA LIST) Chokri.Mraidha@cea.fr - Initial API and implementation
+ * Patrick Tessier (CEA LIST) Patrick.Tessier@cea.fr - modification
+ *
+ *****************************************************************************/
+package org.eclipse.papyrus.uml.properties.profile.ui.items;
+
+import java.util.List;
+
+import org.eclipse.swt.SWT;
+import org.eclipse.swt.widgets.Table;
+import org.eclipse.swt.widgets.TableItem;
+import org.eclipse.uml2.uml.Property;
+
+public class DataTypeItems {
+
+ /**
+ * Creates new DataType items in the property table.
+ *
+ * @param table
+ * the table
+ * @param value
+ * current value of the property
+ * @param property
+ * currently selected property
+ */
+ public DataTypeItems(Table table, Property property, Object value) {
+ if(property.isMultivalued()) {
+ // property is multivalued
+ final List propValues = (List)value;
+
+ for(int i = 0; i < propValues.size(); i++) {
+ // Create item in property table
+ TableItem propValueItem = new TableItem(table, SWT.NONE);
+ propValueItem.setText(propValues.get(i).toString());
+ propValueItem.setData(propValues.get(i));
+ }
+
+ } else { // property is not multivalued
+
+ // if the property has a value
+ if(value != null) {
+ TableItem propValueItem = new TableItem(table, SWT.NONE);
+ propValueItem.setText(value.toString());
+ }
+ }
+ }
+
+}
diff --git a/plugins/uml/properties/org.eclipse.papyrus.uml.properties/src/org/eclipse/papyrus/uml/properties/profile/ui/items/EnumerationItems.java b/plugins/uml/properties/org.eclipse.papyrus.uml.properties/src/org/eclipse/papyrus/uml/properties/profile/ui/items/EnumerationItems.java
new file mode 100644
index 00000000000..b39e38eb06c
--- /dev/null
+++ b/plugins/uml/properties/org.eclipse.papyrus.uml.properties/src/org/eclipse/papyrus/uml/properties/profile/ui/items/EnumerationItems.java
@@ -0,0 +1,104 @@
+/*****************************************************************************
+ * Copyright (c) 2008 CEA LIST.
+ *
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * Chokri Mraidha (CEA LIST) Chokri.Mraidha@cea.fr - Initial API and implementation
+ * Patrick Tessier (CEA LIST) Patrick.Tessier@cea.fr - modification
+ *
+ *****************************************************************************/
+package org.eclipse.papyrus.uml.properties.profile.ui.items;
+
+import java.util.List;
+
+import org.eclipse.emf.ecore.EEnumLiteral;
+import org.eclipse.papyrus.uml.profile.Message;
+import org.eclipse.papyrus.uml.profile.utils.Util;
+import org.eclipse.swt.SWT;
+import org.eclipse.swt.widgets.Table;
+import org.eclipse.swt.widgets.TableItem;
+import org.eclipse.uml2.uml.EnumerationLiteral;
+import org.eclipse.uml2.uml.Property;
+
+
+// TODO: Auto-generated Javadoc
+/**
+ * The Class EnumerationItems.
+ */
+public class EnumerationItems {
+
+ /**
+ * The Constructor.
+ *
+ * @param table
+ * the table
+ * @param value
+ * the value
+ * @param property
+ * the property
+ */
+ public EnumerationItems(Table table, Property property, Object value) {
+
+
+ if(property.isMultivalued()) {
+ // property is multivalued
+ final List propValues = (List)value;
+
+ for(int i = 0; i < propValues.size(); i++) {
+ createItem(table, property, propValues.get(i));
+ }
+
+ } else { // property is not multivalued
+
+ // if the property has a value
+ if(value != null) {
+ createItem(table, property, value);
+ }
+ }
+ }
+
+ /**
+ * Creates a new item for current objet int the table.
+ *
+ * @param table
+ * the table
+ * @param object
+ * the object
+ * @param property
+ * the property
+ */
+ private void createItem(Table table, Property property, Object object) {
+
+ EnumerationLiteral eLiteral = null;
+ // Prepare Item data
+ if(object instanceof EnumerationLiteral) {
+ eLiteral = (EnumerationLiteral)object;
+
+ } else if(object instanceof EEnumLiteral) {
+ EEnumLiteral eEnumLiteral = (EEnumLiteral)object;
+ Object tmp = Util.getValueObjectFromString(eEnumLiteral.getName(), property.getType());
+ eLiteral = ((EnumerationLiteral)tmp);
+
+ } else if(object instanceof String) {
+ String literalString = (String)object;
+ Object tmp = Util.getValueObjectFromString(literalString, property.getType());
+ eLiteral = ((EnumerationLiteral)tmp);
+
+ } else { // Error
+ String err = "Value " + object.toString() + " of Property " + property.getName() + " is not an EnumerationLiteral.";
+ Message.error(err);
+ }
+
+ if(eLiteral != null) {
+ // Prepare Item label
+ TableItem propValueItem = new TableItem(table, SWT.NONE);
+ propValueItem.setText(eLiteral.getName());
+ propValueItem.setData(eLiteral);
+ }
+ }
+}
diff --git a/plugins/uml/properties/org.eclipse.papyrus.uml.properties/src/org/eclipse/papyrus/uml/properties/profile/ui/items/MetaclassItems.java b/plugins/uml/properties/org.eclipse.papyrus.uml.properties/src/org/eclipse/papyrus/uml/properties/profile/ui/items/MetaclassItems.java
new file mode 100644
index 00000000000..2425e83c5e7
--- /dev/null
+++ b/plugins/uml/properties/org.eclipse.papyrus.uml.properties/src/org/eclipse/papyrus/uml/properties/profile/ui/items/MetaclassItems.java
@@ -0,0 +1,96 @@
+/*****************************************************************************
+ * Copyright (c) 2008 CEA LIST.
+ *
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * Chokri Mraidha (CEA LIST) Chokri.Mraidha@cea.fr - Initial API and implementation
+ * Patrick Tessier (CEA LIST) Patrick.Tessier@cea.fr - modification
+ *
+ *****************************************************************************/
+package org.eclipse.papyrus.uml.properties.profile.ui.items;
+
+import java.util.List;
+
+import org.eclipse.papyrus.uml.profile.Message;
+import org.eclipse.swt.SWT;
+import org.eclipse.swt.widgets.Table;
+import org.eclipse.swt.widgets.TableItem;
+import org.eclipse.uml2.uml.NamedElement;
+import org.eclipse.uml2.uml.Property;
+
+
+// TODO: Auto-generated Javadoc
+/**
+ * The Class MetaclassItems.
+ */
+public class MetaclassItems {
+
+ /**
+ * The Constructor.
+ *
+ * @param table
+ * the table
+ * @param value
+ * the value
+ * @param property
+ * the property
+ */
+ public MetaclassItems(Table table, Property property, Object value) {
+
+ // Checking rule
+ if(property.getLower() > 0) {
+ // Lower must be != 0 because the value of the property is an element in the model
+ // no default value may be entered in the profile
+ Message.warning(
+ "Property of type Metaclass and multiplicity lower value != 0.\n" +
+ "The profile is ill formed !");
+ }
+
+ if(property.isMultivalued()) {
+ // property is multivalued
+ final List propValues = (List)value;
+ for(int i = 0; i < propValues.size(); i++) {
+ createItem(table, property, propValues.get(i));
+ }
+
+ } else { // property is not multivalued
+
+ // if the property has a value
+ if(value != null) {
+ createItem(table, property, value);
+ }
+ }
+ }
+
+ /**
+ * Creates a new item for current objet int the table.
+ *
+ * @param table
+ * the table
+ * @param object
+ * the object
+ * @param property
+ * the property
+ */
+ private void createItem(Table table, Property property, Object object) {
+
+ if(object != null) {
+ // Prepare Item label
+ TableItem propValueItem = new TableItem(table, SWT.NONE);
+ String label = object.toString();
+ if(object instanceof NamedElement) {
+ NamedElement baseNamedElement = (NamedElement)object;
+ if(baseNamedElement.isSetName()) {
+ label = baseNamedElement.getQualifiedName();
+ }
+ }
+ propValueItem.setText(label);
+ propValueItem.setData(object);
+ }
+ }
+}
diff --git a/plugins/uml/properties/org.eclipse.papyrus.uml.properties/src/org/eclipse/papyrus/uml/properties/profile/ui/items/PrimitiveTypeItems.java b/plugins/uml/properties/org.eclipse.papyrus.uml.properties/src/org/eclipse/papyrus/uml/properties/profile/ui/items/PrimitiveTypeItems.java
new file mode 100644
index 00000000000..d79fc28d7af
--- /dev/null
+++ b/plugins/uml/properties/org.eclipse.papyrus.uml.properties/src/org/eclipse/papyrus/uml/properties/profile/ui/items/PrimitiveTypeItems.java
@@ -0,0 +1,61 @@
+/*****************************************************************************
+ * Copyright (c) 2008 CEA LIST.
+ *
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * Chokri Mraidha (CEA LIST) Chokri.Mraidha@cea.fr - Initial API and implementation
+ * Patrick Tessier (CEA LIST) Patrick.Tessier@cea.fr - modification
+ *
+ *****************************************************************************/
+package org.eclipse.papyrus.uml.properties.profile.ui.items;
+
+import java.util.List;
+
+import org.eclipse.swt.SWT;
+import org.eclipse.swt.widgets.Table;
+import org.eclipse.swt.widgets.TableItem;
+import org.eclipse.uml2.uml.Property;
+
+// TODO: Auto-generated Javadoc
+/**
+ * The Class PrimitiveTypeItems.
+ */
+public class PrimitiveTypeItems {
+
+ /**
+ * Creates new PrimitiveType items in the property table.
+ *
+ * @param table
+ * the table
+ * @param value
+ * current value of the property
+ * @param property
+ * currently selected property
+ */
+ public PrimitiveTypeItems(Table table, Property property, Object value) {
+ if(property.isMultivalued()) {
+ // property is multivalued
+ final List propValues = (List)value;
+
+ for(int i = 0; i < propValues.size(); i++) {
+ // Create item in property table
+ TableItem propValueItem = new TableItem(table, SWT.NONE);
+ propValueItem.setText(propValues.get(i).toString());
+ propValueItem.setData(propValues.get(i));
+ }
+
+ } else { // property is not multivalued
+
+ // if the property has a value
+ if(value != null) {
+ TableItem propValueItem = new TableItem(table, SWT.NONE);
+ propValueItem.setText(value.toString());
+ }
+ }
+ }
+}
diff --git a/plugins/uml/properties/org.eclipse.papyrus.uml.properties/src/org/eclipse/papyrus/uml/properties/profile/ui/items/StereotypeItems.java b/plugins/uml/properties/org.eclipse.papyrus.uml.properties/src/org/eclipse/papyrus/uml/properties/profile/ui/items/StereotypeItems.java
new file mode 100644
index 00000000000..b63a5f0d426
--- /dev/null
+++ b/plugins/uml/properties/org.eclipse.papyrus.uml.properties/src/org/eclipse/papyrus/uml/properties/profile/ui/items/StereotypeItems.java
@@ -0,0 +1,109 @@
+/*****************************************************************************
+ * Copyright (c) 2008 CEA LIST.
+ *
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * Chokri Mraidha (CEA LIST) Chokri.Mraidha@cea.fr - Initial API and implementation
+ * Patrick Tessier (CEA LIST) Patrick.Tessier@cea.fr - modification
+ *
+ *****************************************************************************/
+package org.eclipse.papyrus.uml.properties.profile.ui.items;
+
+import java.util.List;
+
+import org.eclipse.emf.ecore.EObject;
+import org.eclipse.papyrus.uml.profile.Message;
+import org.eclipse.swt.SWT;
+import org.eclipse.swt.widgets.Table;
+import org.eclipse.swt.widgets.TableItem;
+import org.eclipse.uml2.uml.Element;
+import org.eclipse.uml2.uml.NamedElement;
+import org.eclipse.uml2.uml.Property;
+import org.eclipse.uml2.uml.util.UMLUtil;
+
+
+// TODO: Auto-generated Javadoc
+/**
+ * The Class StereotypeItems.
+ */
+public class StereotypeItems {
+
+ /**
+ * The Constructor.
+ *
+ * @param table
+ * the table
+ * @param value
+ * the value
+ * @param property
+ * the property
+ */
+ public StereotypeItems(Table table, Property property, Object value) {
+
+ // Checking rule
+ if(property.getLower() > 0) {
+ Message.error(
+ "Property of type Stereotype and multiplicity lower value != 0.\n"
+ + " The profile is ill formed !");
+ }
+
+ if(property.isMultivalued()) {
+ // property is multivalued
+ final List propValues = (List)value;
+
+ for(int i = 0; i < propValues.size(); i++) {
+ createItem(table, property, propValues.get(i));
+ }
+
+ } else { // property is not multivalued
+
+ // if the property has a value
+ if(value != null) {
+ createItem(table, property, value);
+ }
+ }
+ }
+
+ /**
+ * Creates a new item for current objet int the table.
+ *
+ * @param table
+ * the table
+ * @param object
+ * the object
+ * @param property
+ * the property
+ */
+ private void createItem(Table table, Property property, Object object) {
+
+ Element baseElement = null;
+ // Prepare Item data
+ if(object instanceof EObject) {
+ // retrieve the base element from the stereotype application
+ baseElement = (Element)UMLUtil.getBaseElement((EObject)object);
+
+ } else { // Error
+ String err = "Type " + object.toString() + " of Property " + property.getName() + " is not an EObject.";
+ Message.error(err);
+ }
+
+ if(baseElement != null) {
+ // Prepare Item label
+ TableItem propValueItem = new TableItem(table, SWT.NONE);
+ String label = baseElement.toString();
+ if(baseElement instanceof NamedElement) {
+ NamedElement baseNamedElement = (NamedElement)baseElement;
+ if(baseNamedElement.isSetName()) {
+ label = baseNamedElement.getQualifiedName();
+ }
+ }
+ propValueItem.setText(label);
+ propValueItem.setData(baseElement);
+ }
+ }
+}
diff --git a/plugins/uml/org.eclipse.papyrus.uml.profile/src/org/eclipse/papyrus/uml/profile/ui/listeners/DoubleClickListener.java b/plugins/uml/properties/org.eclipse.papyrus.uml.properties/src/org/eclipse/papyrus/uml/properties/profile/ui/listeners/DoubleClickListener.java
index f485a526c9c..0ac9d9ce0a1 100644
--- a/plugins/uml/org.eclipse.papyrus.uml.profile/src/org/eclipse/papyrus/uml/profile/ui/listeners/DoubleClickListener.java
+++ b/plugins/uml/properties/org.eclipse.papyrus.uml.properties/src/org/eclipse/papyrus/uml/properties/profile/ui/listeners/DoubleClickListener.java
@@ -12,7 +12,7 @@
* Patrick Tessier (CEA LIST) Patrick.Tessier@cea.fr - modification
*
*****************************************************************************/
-package org.eclipse.papyrus.uml.profile.ui.listeners;
+package org.eclipse.papyrus.uml.properties.profile.ui.listeners;
import org.eclipse.jface.viewers.TreeViewer;
import org.eclipse.papyrus.uml.profile.tree.objects.AppliedStereotypePropertyTreeObject;
diff --git a/plugins/uml/org.eclipse.papyrus.uml.profile/src/org/eclipse/papyrus/uml/profile/ui/listeners/NoValueException.java b/plugins/uml/properties/org.eclipse.papyrus.uml.properties/src/org/eclipse/papyrus/uml/properties/profile/ui/listeners/NoValueException.java
index 94c410d4ea1..c3c2b3b34c4 100644
--- a/plugins/uml/org.eclipse.papyrus.uml.profile/src/org/eclipse/papyrus/uml/profile/ui/listeners/NoValueException.java
+++ b/plugins/uml/properties/org.eclipse.papyrus.uml.properties/src/org/eclipse/papyrus/uml/properties/profile/ui/listeners/NoValueException.java
@@ -12,7 +12,7 @@
* Patrick Tessier (CEA LIST) Patrick.Tessier@cea.fr - modification
*
*****************************************************************************/
-package org.eclipse.papyrus.uml.profile.ui.listeners;
+package org.eclipse.papyrus.uml.properties.profile.ui.listeners;
// TODO: Auto-generated Javadoc
/**
diff --git a/plugins/uml/org.eclipse.papyrus.uml.profile/src/org/eclipse/papyrus/uml/profile/ui/panels/AbstractPanel.java b/plugins/uml/properties/org.eclipse.papyrus.uml.properties/src/org/eclipse/papyrus/uml/properties/profile/ui/panels/AbstractPanel.java
index b28f6c224c6..9158b1b82b4 100644
--- a/plugins/uml/org.eclipse.papyrus.uml.profile/src/org/eclipse/papyrus/uml/profile/ui/panels/AbstractPanel.java
+++ b/plugins/uml/properties/org.eclipse.papyrus.uml.properties/src/org/eclipse/papyrus/uml/properties/profile/ui/panels/AbstractPanel.java
@@ -12,7 +12,7 @@
* Patrick Tessier (CEA LIST) Patrick.Tessier@cea.fr - modification
*
*****************************************************************************/
-package org.eclipse.papyrus.uml.profile.ui.panels;
+package org.eclipse.papyrus.uml.properties.profile.ui.panels;
import org.eclipse.swt.widgets.Composite;
import org.eclipse.swt.widgets.Control;
diff --git a/plugins/uml/org.eclipse.papyrus.uml.profile/src/org/eclipse/papyrus/uml/profile/ui/panels/AppliedProfilePanel.java b/plugins/uml/properties/org.eclipse.papyrus.uml.properties/src/org/eclipse/papyrus/uml/properties/profile/ui/panels/AppliedProfilePanel.java
index 5935673db68..a9dc878a8aa 100644
--- a/plugins/uml/org.eclipse.papyrus.uml.profile/src/org/eclipse/papyrus/uml/profile/ui/panels/AppliedProfilePanel.java
+++ b/plugins/uml/properties/org.eclipse.papyrus.uml.properties/src/org/eclipse/papyrus/uml/properties/profile/ui/panels/AppliedProfilePanel.java
@@ -12,11 +12,11 @@
* Patrick Tessier (CEA LIST) Patrick.Tessier@cea.fr - modification
*
*****************************************************************************/
-package org.eclipse.papyrus.uml.profile.ui.panels;
+package org.eclipse.papyrus.uml.properties.profile.ui.panels;
-import org.eclipse.papyrus.uml.profile.ui.compositesformodel.AppliedProfileCompositeOnModel;
-import org.eclipse.papyrus.uml.profile.ui.compositesformodel.AppliedStereotypeCompositeOnModel;
-import org.eclipse.papyrus.uml.profile.ui.compositesformodel.PropertyComposite;
+import org.eclipse.papyrus.uml.properties.profile.ui.compositesformodel.AppliedProfileCompositeOnModel;
+import org.eclipse.papyrus.uml.properties.profile.ui.compositesformodel.AppliedStereotypeCompositeOnModel;
+import org.eclipse.papyrus.uml.properties.profile.ui.compositesformodel.PropertyComposite;
import org.eclipse.swt.layout.FormAttachment;
import org.eclipse.swt.layout.FormData;
import org.eclipse.swt.layout.FormLayout;
diff --git a/plugins/uml/org.eclipse.papyrus.uml.profile/src/org/eclipse/papyrus/uml/profile/ui/panels/AppliedStereotypePanel.java b/plugins/uml/properties/org.eclipse.papyrus.uml.properties/src/org/eclipse/papyrus/uml/properties/profile/ui/panels/AppliedStereotypePanel.java
index 1ddd72763f3..fd68d557332 100644
--- a/plugins/uml/org.eclipse.papyrus.uml.profile/src/org/eclipse/papyrus/uml/profile/ui/panels/AppliedStereotypePanel.java
+++ b/plugins/uml/properties/org.eclipse.papyrus.uml.properties/src/org/eclipse/papyrus/uml/properties/profile/ui/panels/AppliedStereotypePanel.java
@@ -12,12 +12,12 @@
* Patrick Tessier (CEA LIST) Patrick.Tessier@cea.fr - modification
*
*****************************************************************************/
-package org.eclipse.papyrus.uml.profile.ui.panels;
+package org.eclipse.papyrus.uml.properties.profile.ui.panels;
import org.eclipse.papyrus.uml.profile.tree.objects.AppliedStereotypePropertyTreeObject;
import org.eclipse.papyrus.uml.profile.tree.objects.StereotypedElementTreeObject;
-import org.eclipse.papyrus.uml.profile.ui.compositesformodel.AppliedStereotypeCompositeOnModel;
-import org.eclipse.papyrus.uml.profile.ui.compositesformodel.PropertyComposite;
+import org.eclipse.papyrus.uml.properties.profile.ui.compositesformodel.AppliedStereotypeCompositeOnModel;
+import org.eclipse.papyrus.uml.properties.profile.ui.compositesformodel.PropertyComposite;
import org.eclipse.swt.layout.FormAttachment;
import org.eclipse.swt.layout.FormData;
import org.eclipse.swt.layout.FormLayout;
diff --git a/plugins/uml/org.eclipse.papyrus.uml.profile/src/org/eclipse/papyrus/uml/profile/ui/panels/DefaultPanel.java b/plugins/uml/properties/org.eclipse.papyrus.uml.properties/src/org/eclipse/papyrus/uml/properties/profile/ui/panels/DefaultPanel.java
index ffae87ca821..82f6bc7630a 100644
--- a/plugins/uml/org.eclipse.papyrus.uml.profile/src/org/eclipse/papyrus/uml/profile/ui/panels/DefaultPanel.java
+++ b/plugins/uml/properties/org.eclipse.papyrus.uml.properties/src/org/eclipse/papyrus/uml/properties/profile/ui/panels/DefaultPanel.java
@@ -12,7 +12,7 @@
* Patrick Tessier (CEA LIST) Patrick.Tessier@cea.fr - modification
*
*****************************************************************************/
-package org.eclipse.papyrus.uml.profile.ui.panels;
+package org.eclipse.papyrus.uml.properties.profile.ui.panels;
import org.eclipse.swt.SWT;
import org.eclipse.swt.layout.GridData;
diff --git a/plugins/uml/org.eclipse.papyrus.uml.profile/src/org/eclipse/papyrus/uml/profile/ui/section/AppliedProfileSection.java b/plugins/uml/properties/org.eclipse.papyrus.uml.properties/src/org/eclipse/papyrus/uml/properties/profile/ui/section/AppliedProfileSection.java
index 7d433ce321e..7cfb418a0e6 100644
--- a/plugins/uml/org.eclipse.papyrus.uml.profile/src/org/eclipse/papyrus/uml/profile/ui/section/AppliedProfileSection.java
+++ b/plugins/uml/properties/org.eclipse.papyrus.uml.properties/src/org/eclipse/papyrus/uml/properties/profile/ui/section/AppliedProfileSection.java
@@ -13,7 +13,7 @@
* Jerome BENOIS (Obeo) jerome.benois@obeo.fr - improve to deal with EEF based properties view and model explorer
*
*****************************************************************************/
-package org.eclipse.papyrus.uml.profile.ui.section;
+package org.eclipse.papyrus.uml.properties.profile.ui.section;
import org.eclipse.core.runtime.IAdaptable;
import org.eclipse.emf.ecore.EObject;
@@ -22,7 +22,7 @@ import org.eclipse.gmf.runtime.notation.View;
import org.eclipse.jface.viewers.ISelection;
import org.eclipse.jface.viewers.IStructuredSelection;
import org.eclipse.papyrus.infra.core.utils.EditorUtils;
-import org.eclipse.papyrus.uml.profile.ui.compositeforview.AppliedProfileCompositeWithView;
+import org.eclipse.papyrus.uml.properties.profile.ui.compositeforview.AppliedProfileCompositeWithView;
import org.eclipse.swt.widgets.Composite;
import org.eclipse.ui.IWorkbenchPart;
import org.eclipse.ui.views.properties.tabbed.AbstractPropertySection;
diff --git a/plugins/uml/org.eclipse.papyrus.uml.profile/src/org/eclipse/papyrus/uml/profile/ui/section/AppliedStereotypeDisplaySection.java b/plugins/uml/properties/org.eclipse.papyrus.uml.properties/src/org/eclipse/papyrus/uml/properties/profile/ui/section/AppliedStereotypeDisplaySection.java
index 4cc8ea982b1..e95a7bd29ca 100644
--- a/plugins/uml/org.eclipse.papyrus.uml.profile/src/org/eclipse/papyrus/uml/profile/ui/section/AppliedStereotypeDisplaySection.java
+++ b/plugins/uml/properties/org.eclipse.papyrus.uml.properties/src/org/eclipse/papyrus/uml/properties/profile/ui/section/AppliedStereotypeDisplaySection.java
@@ -12,16 +12,16 @@
* Patrick Tessier (CEA LIST) Patrick.Tessier@cea.fr - modification
*
*****************************************************************************/
-package org.eclipse.papyrus.uml.profile.ui.section;
+package org.eclipse.papyrus.uml.properties.profile.ui.section;
import org.eclipse.emf.ecore.EModelElement;
-import org.eclipse.gef.GraphicalEditPart;
import org.eclipse.gef.editparts.AbstractGraphicalEditPart;
+import org.eclipse.gmf.runtime.diagram.ui.editparts.IGraphicalEditPart;
import org.eclipse.gmf.runtime.notation.View;
import org.eclipse.jface.viewers.ISelection;
import org.eclipse.jface.viewers.IStructuredSelection;
import org.eclipse.papyrus.uml.profile.tree.objects.StereotypedElementTreeObject;
-import org.eclipse.papyrus.uml.profile.ui.compositeforview.AppearanceForAppliedStereotypeComposite;
+import org.eclipse.papyrus.uml.properties.profile.ui.compositeforview.AppearanceForAppliedStereotypeComposite;
import org.eclipse.swt.widgets.Composite;
import org.eclipse.ui.IWorkbenchPart;
import org.eclipse.ui.part.IContributedContentsView;
@@ -43,6 +43,7 @@ public class AppliedStereotypeDisplaySection extends AbstractPropertySection {
*
* {@inheritDoc}
*/
+ @Override
public void createControls(Composite parent, TabbedPropertySheetPage tabbedPropertySheetPage) {
super.createControls(parent, tabbedPropertySheetPage);
appearanceForAppliedStereotype = new AppearanceForAppliedStereotypeComposite(parent);
@@ -54,6 +55,7 @@ public class AppliedStereotypeDisplaySection extends AbstractPropertySection {
*
* {@inheritDoc}
*/
+ @Override
public void refresh() {
appearanceForAppliedStereotype.refresh();
}
@@ -62,12 +64,13 @@ public class AppliedStereotypeDisplaySection extends AbstractPropertySection {
*
* {@inheritDoc}
*/
+ @Override
public void setInput(IWorkbenchPart part, ISelection selection) {
super.setInput(part, selection);
if(selection instanceof IStructuredSelection) {
Object input = ((IStructuredSelection)selection).getFirstElement();
- if(input instanceof GraphicalEditPart && ((GraphicalEditPart)input).getModel() instanceof View) {
+ if(input instanceof IGraphicalEditPart && ((IGraphicalEditPart)input).getModel() instanceof View) {
appearanceForAppliedStereotype.setSelection(selection);
diagramElement = (EModelElement)((AbstractGraphicalEditPart)input).getModel();
@@ -88,7 +91,7 @@ public class AppliedStereotypeDisplaySection extends AbstractPropertySection {
if(part instanceof ContentOutline) {
IContributedContentsView contributedView = ((IContributedContentsView)((ContentOutline)part).getAdapter(IContributedContentsView.class));
if(contributedView != null) {
- part = (IWorkbenchPart)contributedView.getContributingPart();
+ part = contributedView.getContributingPart();
}
}
}
@@ -103,9 +106,11 @@ public class AppliedStereotypeDisplaySection extends AbstractPropertySection {
/**
*
*/
+ @Override
public void dispose() {
super.dispose();
- if(appearanceForAppliedStereotype != null)
+ if(appearanceForAppliedStereotype != null) {
appearanceForAppliedStereotype.disposeListeners();
+ }
}
}
diff --git a/plugins/uml/org.eclipse.papyrus.uml.profile/src/org/eclipse/papyrus/uml/profile/ui/section/AppliedStereotypeKindAppearanceSection.java b/plugins/uml/properties/org.eclipse.papyrus.uml.properties/src/org/eclipse/papyrus/uml/properties/profile/ui/section/AppliedStereotypeKindAppearanceSection.java
index d639ad82cd1..c73fee5ce42 100644
--- a/plugins/uml/org.eclipse.papyrus.uml.profile/src/org/eclipse/papyrus/uml/profile/ui/section/AppliedStereotypeKindAppearanceSection.java
+++ b/plugins/uml/properties/org.eclipse.papyrus.uml.properties/src/org/eclipse/papyrus/uml/properties/profile/ui/section/AppliedStereotypeKindAppearanceSection.java
@@ -12,7 +12,7 @@
* Patrick Tessier (CEA LIST) Patrick.Tessier@cea.fr - modification
*
*****************************************************************************/
-package org.eclipse.papyrus.uml.profile.ui.section;
+package org.eclipse.papyrus.uml.properties.profile.ui.section;
import org.eclipse.emf.ecore.EModelElement;
import org.eclipse.emf.transaction.RecordingCommand;
@@ -23,9 +23,9 @@ import org.eclipse.jface.viewers.ISelection;
import org.eclipse.jface.viewers.IStructuredSelection;
import org.eclipse.papyrus.infra.core.editor.IMultiDiagramEditor;
import org.eclipse.papyrus.infra.core.utils.EditorUtils;
+import org.eclipse.papyrus.uml.appearance.helper.AppliedStereotypeHelper;
+import org.eclipse.papyrus.uml.appearance.helper.UMLVisualInformationPapyrusConstant;
import org.eclipse.papyrus.uml.tools.utils.ElementUtil;
-import org.eclipse.papyrus.uml.tools.utils.ui.VisualInformationPapyrusConstant;
-import org.eclipse.papyrus.uml.tools.utils.ui.helper.AppliedStereotypeHelper;
import org.eclipse.swt.SWT;
import org.eclipse.swt.custom.CCombo;
import org.eclipse.swt.custom.CLabel;
@@ -63,7 +63,7 @@ public class AppliedStereotypeKindAppearanceSection extends AbstractPropertySect
private static final String TEXT = "Text";
/** current presentation for stereotype */
- private String stereotypePlacePresentation = VisualInformationPapyrusConstant.STEREOTYPE_COMPARTMENT_LOCATION;
+ private String stereotypePlacePresentation = UMLVisualInformationPapyrusConstant.STEREOTYPE_COMPARTMENT_LOCATION;
private EModelElement diagramElement;
@@ -147,16 +147,16 @@ public class AppliedStereotypeKindAppearanceSection extends AbstractPropertySect
boolean hasIcons = ElementUtil.hasIcons(elt, stereotype);
boolean hasShapes = ElementUtil.hasShapes(elt, stereotype);
- String appliedStereotypeKind = VisualInformationPapyrusConstant.STEREOTYPE_TEXT_HORIZONTAL_PRESENTATION;
+ String appliedStereotypeKind = UMLVisualInformationPapyrusConstant.STEREOTYPE_TEXT_HORIZONTAL_PRESENTATION;
String stereotypeAppearance = comboStereotypeAppearance.getText();
if(stereotypeAppearance.equals(TEXT)) {
- appliedStereotypeKind = VisualInformationPapyrusConstant.STEREOTYPE_TEXT_HORIZONTAL_PRESENTATION;
+ appliedStereotypeKind = UMLVisualInformationPapyrusConstant.STEREOTYPE_TEXT_HORIZONTAL_PRESENTATION;
} else if(stereotypeAppearance.equals(ICON) && hasIcons) {
- appliedStereotypeKind = VisualInformationPapyrusConstant.ICON_STEREOTYPE_PRESENTATION;
+ appliedStereotypeKind = UMLVisualInformationPapyrusConstant.ICON_STEREOTYPE_PRESENTATION;
} else if(stereotypeAppearance.equals(TEXT_AND_ICON) && hasIcons) {
- appliedStereotypeKind = VisualInformationPapyrusConstant.TEXT_ICON_STEREOTYPE_PRESENTATION;
+ appliedStereotypeKind = UMLVisualInformationPapyrusConstant.TEXT_ICON_STEREOTYPE_PRESENTATION;
} else if(stereotypeAppearance.equals(SHAPE) && hasShapes) {
- appliedStereotypeKind = VisualInformationPapyrusConstant.IMAGE_STEREOTYPE_PRESENTATION;
+ appliedStereotypeKind = UMLVisualInformationPapyrusConstant.IMAGE_STEREOTYPE_PRESENTATION;
}
String stereotypetoDisplay = AppliedStereotypeHelper.getStereotypesToDisplay(diagramElement);
RecordingCommand command = AppliedStereotypeHelper.getAppliedStereotypeToDisplayCommand(domain, diagramElement, stereotypetoDisplay, appliedStereotypeKind);
@@ -191,11 +191,11 @@ public class AppliedStereotypeKindAppearanceSection extends AbstractPropertySect
if(diagramElement != null) {
if(((View)(diagramElement)).getElement() != null) {
- String appliedStereotypeKind = VisualInformationPapyrusConstant.STEREOTYPE_TEXT_HORIZONTAL_PRESENTATION;
+ String appliedStereotypeKind = UMLVisualInformationPapyrusConstant.STEREOTYPE_TEXT_HORIZONTAL_PRESENTATION;
if(comboStereotypeAlignement.getText().equals(HORIZONTAL)) {
- appliedStereotypeKind = VisualInformationPapyrusConstant.STEREOTYPE_TEXT_HORIZONTAL_PRESENTATION;
+ appliedStereotypeKind = UMLVisualInformationPapyrusConstant.STEREOTYPE_TEXT_HORIZONTAL_PRESENTATION;
} else if(comboStereotypeAlignement.getText().equals(VERTICAL)) {
- appliedStereotypeKind = VisualInformationPapyrusConstant.STEREOTYPE_TEXT_VERTICAL_PRESENTATION;
+ appliedStereotypeKind = UMLVisualInformationPapyrusConstant.STEREOTYPE_TEXT_VERTICAL_PRESENTATION;
}
String stereotypetoDisplay = AppliedStereotypeHelper.getStereotypesToDisplay(diagramElement);
RecordingCommand command = AppliedStereotypeHelper.getAppliedStereotypeToDisplayCommand(domain, diagramElement, stereotypetoDisplay, appliedStereotypeKind);
@@ -218,9 +218,9 @@ public class AppliedStereotypeKindAppearanceSection extends AbstractPropertySect
stereotypeDisplayPlace.setLayoutData(data);
comboStereotypeDisplayPlace = getWidgetFactory().createCCombo(composite, SWT.BORDER | SWT.READ_ONLY);
- comboStereotypeDisplayPlace.add(VisualInformationPapyrusConstant.STEREOTYPE_COMMENT_LOCATION);
- comboStereotypeDisplayPlace.add(VisualInformationPapyrusConstant.STEREOTYPE_COMPARTMENT_LOCATION);
- comboStereotypeDisplayPlace.add(VisualInformationPapyrusConstant.STEREOTYPE_BRACE_LOCATION);
+ comboStereotypeDisplayPlace.add(UMLVisualInformationPapyrusConstant.STEREOTYPE_COMMENT_LOCATION);
+ comboStereotypeDisplayPlace.add(UMLVisualInformationPapyrusConstant.STEREOTYPE_COMPARTMENT_LOCATION);
+ comboStereotypeDisplayPlace.add(UMLVisualInformationPapyrusConstant.STEREOTYPE_BRACE_LOCATION);
data = new FormData();
data.left = new FormAttachment(stereotypeDisplayPlace, 0);
@@ -339,19 +339,19 @@ public class AppliedStereotypeKindAppearanceSection extends AbstractPropertySect
boolean hasIcons = ElementUtil.hasIcons(elt, stereotype);
boolean hasShapes = ElementUtil.hasShapes(elt, stereotype);
- if(stereotypePresentation.equals(VisualInformationPapyrusConstant.ICON_STEREOTYPE_PRESENTATION) && hasIcons) {
+ if(stereotypePresentation.equals(UMLVisualInformationPapyrusConstant.ICON_STEREOTYPE_PRESENTATION) && hasIcons) {
comboStereotypeAlignement.setEnabled(false);
- } else if(stereotypePresentation.equals(VisualInformationPapyrusConstant.TEXT_ICON_STEREOTYPE_PRESENTATION) && hasIcons) {
+ } else if(stereotypePresentation.equals(UMLVisualInformationPapyrusConstant.TEXT_ICON_STEREOTYPE_PRESENTATION) && hasIcons) {
comboStereotypeAlignement.setEnabled(true);
- } else if(stereotypePresentation.equals(VisualInformationPapyrusConstant.IMAGE_STEREOTYPE_PRESENTATION) && hasShapes) {
+ } else if(stereotypePresentation.equals(UMLVisualInformationPapyrusConstant.IMAGE_STEREOTYPE_PRESENTATION) && hasShapes) {
comboStereotypeAlignement.setEnabled(false);
} else {
comboStereotypeAlignement.setEnabled(true);
}
- if(stereotypePresentation.equals(VisualInformationPapyrusConstant.STEREOTYPE_TEXT_HORIZONTAL_PRESENTATION)) {
+ if(stereotypePresentation.equals(UMLVisualInformationPapyrusConstant.STEREOTYPE_TEXT_HORIZONTAL_PRESENTATION)) {
comboStereotypeAlignement.setText(HORIZONTAL);
- } else if(stereotypePresentation.equals(VisualInformationPapyrusConstant.STEREOTYPE_TEXT_VERTICAL_PRESENTATION)) {
+ } else if(stereotypePresentation.equals(UMLVisualInformationPapyrusConstant.STEREOTYPE_TEXT_VERTICAL_PRESENTATION)) {
comboStereotypeAlignement.setText(VERTICAL);
} else {
comboStereotypeAlignement.setText(HORIZONTAL);
@@ -391,11 +391,11 @@ public class AppliedStereotypeKindAppearanceSection extends AbstractPropertySect
boolean hasIcons = ElementUtil.hasIcons(elt, stereotype);
boolean hasShapes = ElementUtil.hasShapes(elt, stereotype);
- if(stereotypePresentation.equals(VisualInformationPapyrusConstant.ICON_STEREOTYPE_PRESENTATION) && hasIcons) {
+ if(stereotypePresentation.equals(UMLVisualInformationPapyrusConstant.ICON_STEREOTYPE_PRESENTATION) && hasIcons) {
comboStereotypeAppearance.setText(ICON);
- } else if(stereotypePresentation.equals(VisualInformationPapyrusConstant.TEXT_ICON_STEREOTYPE_PRESENTATION) && hasIcons) {
+ } else if(stereotypePresentation.equals(UMLVisualInformationPapyrusConstant.TEXT_ICON_STEREOTYPE_PRESENTATION) && hasIcons) {
comboStereotypeAppearance.setText(TEXT_AND_ICON);
- } else if(stereotypePresentation.equals(VisualInformationPapyrusConstant.IMAGE_STEREOTYPE_PRESENTATION) && hasShapes) {
+ } else if(stereotypePresentation.equals(UMLVisualInformationPapyrusConstant.IMAGE_STEREOTYPE_PRESENTATION) && hasShapes) {
comboStereotypeAppearance.setText(SHAPE);
} else {
comboStereotypeAppearance.setText(TEXT);
diff --git a/plugins/uml/org.eclipse.papyrus.uml.profile/src/org/eclipse/papyrus/uml/profile/ui/section/AppliedStereotypePropertiesPlaceSection.java b/plugins/uml/properties/org.eclipse.papyrus.uml.properties/src/org/eclipse/papyrus/uml/properties/profile/ui/section/AppliedStereotypePropertiesPlaceSection.java
index ef90a3105ca..d4c6bf43a3f 100644
--- a/plugins/uml/org.eclipse.papyrus.uml.profile/src/org/eclipse/papyrus/uml/profile/ui/section/AppliedStereotypePropertiesPlaceSection.java
+++ b/plugins/uml/properties/org.eclipse.papyrus.uml.properties/src/org/eclipse/papyrus/uml/properties/profile/ui/section/AppliedStereotypePropertiesPlaceSection.java
@@ -1,4 +1,4 @@
-package org.eclipse.papyrus.uml.profile.ui.section;
+package org.eclipse.papyrus.uml.properties.profile.ui.section;
import org.eclipse.emf.common.notify.Adapter;
import org.eclipse.emf.common.notify.Notification;
@@ -12,8 +12,8 @@ import org.eclipse.jface.viewers.ISelection;
import org.eclipse.jface.viewers.IStructuredSelection;
import org.eclipse.papyrus.infra.core.editor.IMultiDiagramEditor;
import org.eclipse.papyrus.infra.core.utils.EditorUtils;
-import org.eclipse.papyrus.uml.tools.utils.ui.VisualInformationPapyrusConstant;
-import org.eclipse.papyrus.uml.tools.utils.ui.helper.AppliedStereotypeHelper;
+import org.eclipse.papyrus.uml.appearance.helper.AppliedStereotypeHelper;
+import org.eclipse.papyrus.uml.appearance.helper.UMLVisualInformationPapyrusConstant;
import org.eclipse.swt.SWT;
import org.eclipse.swt.custom.CCombo;
import org.eclipse.swt.custom.CLabel;
@@ -50,7 +50,7 @@ public class AppliedStereotypePropertiesPlaceSection extends AbstractPropertySec
*/
private SelectionListener comboStereotypePropertiesPlaceListener;
- private String stereotypePlacePresentation = VisualInformationPapyrusConstant.STEREOTYPE_COMPARTMENT_LOCATION;
+ private String stereotypePlacePresentation = UMLVisualInformationPapyrusConstant.STEREOTYPE_COMPARTMENT_LOCATION;
private EModelElement diagramElement;
@@ -71,9 +71,9 @@ public class AppliedStereotypePropertiesPlaceSection extends AbstractPropertySec
FormData data;
comboStereotypePropertiesPlace = getWidgetFactory().createCCombo(composite, SWT.BORDER);
- comboStereotypePropertiesPlace.add(VisualInformationPapyrusConstant.STEREOTYPE_COMMENT_LOCATION);
- comboStereotypePropertiesPlace.add(VisualInformationPapyrusConstant.STEREOTYPE_COMPARTMENT_LOCATION);
- comboStereotypePropertiesPlace.add(VisualInformationPapyrusConstant.STEREOTYPE_BRACE_LOCATION);
+ comboStereotypePropertiesPlace.add(UMLVisualInformationPapyrusConstant.STEREOTYPE_COMMENT_LOCATION);
+ comboStereotypePropertiesPlace.add(UMLVisualInformationPapyrusConstant.STEREOTYPE_COMPARTMENT_LOCATION);
+ comboStereotypePropertiesPlace.add(UMLVisualInformationPapyrusConstant.STEREOTYPE_BRACE_LOCATION);
data = new FormData();
data.left = new FormAttachment(0, 200);
diff --git a/plugins/uml/org.eclipse.papyrus.uml.profile/src/org/eclipse/papyrus/uml/profile/ui/section/AppliedStereotypeSectionWithView.java b/plugins/uml/properties/org.eclipse.papyrus.uml.properties/src/org/eclipse/papyrus/uml/properties/profile/ui/section/AppliedStereotypeSectionWithView.java
index 78a95187585..70dd123ea0c 100644
--- a/plugins/uml/org.eclipse.papyrus.uml.profile/src/org/eclipse/papyrus/uml/profile/ui/section/AppliedStereotypeSectionWithView.java
+++ b/plugins/uml/properties/org.eclipse.papyrus.uml.properties/src/org/eclipse/papyrus/uml/properties/profile/ui/section/AppliedStereotypeSectionWithView.java
@@ -12,7 +12,7 @@
* Patrick Tessier (CEA LIST) Patrick.Tessier@cea.fr - modification
*
*****************************************************************************/
-package org.eclipse.papyrus.uml.profile.ui.section;
+package org.eclipse.papyrus.uml.properties.profile.ui.section;
import org.eclipse.core.runtime.IAdaptable;
import org.eclipse.emf.ecore.EObject;
@@ -21,8 +21,8 @@ import org.eclipse.gmf.runtime.notation.View;
import org.eclipse.jface.viewers.ISelection;
import org.eclipse.jface.viewers.IStructuredSelection;
import org.eclipse.papyrus.uml.profile.tree.objects.StereotypedElementTreeObject;
-import org.eclipse.papyrus.uml.profile.ui.compositeforview.AppliedStereotypeCompositeWithView;
-import org.eclipse.papyrus.uml.profile.ui.compositeforview.AppliedStereotypePropertyCompositeWithView;
+import org.eclipse.papyrus.uml.properties.profile.ui.compositeforview.AppliedStereotypeCompositeWithView;
+import org.eclipse.papyrus.uml.properties.profile.ui.compositeforview.AppliedStereotypePropertyCompositeWithView;
import org.eclipse.swt.widgets.Composite;
import org.eclipse.ui.IWorkbenchPart;
import org.eclipse.ui.views.properties.tabbed.AbstractPropertySection;
diff --git a/plugins/uml/org.eclipse.papyrus.uml.profile/src/org/eclipse/papyrus/uml/profile/ui/views/ProfilePanelView.java b/plugins/uml/properties/org.eclipse.papyrus.uml.properties/src/org/eclipse/papyrus/uml/properties/profile/ui/views/ProfilePanelView.java
index 7e4b84ab2fe..06380cbd564 100644
--- a/plugins/uml/org.eclipse.papyrus.uml.profile/src/org/eclipse/papyrus/uml/profile/ui/views/ProfilePanelView.java
+++ b/plugins/uml/properties/org.eclipse.papyrus.uml.properties/src/org/eclipse/papyrus/uml/properties/profile/ui/views/ProfilePanelView.java
@@ -12,14 +12,14 @@
* Patrick Tessier (CEA LIST) Patrick.Tessier@cea.fr - modification
*
*****************************************************************************/
-package org.eclipse.papyrus.uml.profile.ui.views;
+package org.eclipse.papyrus.uml.properties.profile.ui.views;
import org.eclipse.jface.viewers.ISelection;
import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.papyrus.uml.profile.ui.panels.AbstractPanel;
-import org.eclipse.papyrus.uml.profile.ui.panels.AppliedProfilePanel;
-import org.eclipse.papyrus.uml.profile.ui.panels.AppliedStereotypePanel;
-import org.eclipse.papyrus.uml.profile.ui.panels.DefaultPanel;
+import org.eclipse.papyrus.uml.properties.profile.ui.panels.AbstractPanel;
+import org.eclipse.papyrus.uml.properties.profile.ui.panels.AppliedProfilePanel;
+import org.eclipse.papyrus.uml.properties.profile.ui.panels.AppliedStereotypePanel;
+import org.eclipse.papyrus.uml.properties.profile.ui.panels.DefaultPanel;
import org.eclipse.swt.widgets.Composite;
import org.eclipse.ui.IPartListener;
import org.eclipse.ui.ISelectionListener;
diff --git a/plugins/uml/properties/org.eclipse.papyrus.uml.properties/src/org/eclipse/papyrus/uml/properties/util/StereotypeAppearanceConstants.java b/plugins/uml/properties/org.eclipse.papyrus.uml.properties/src/org/eclipse/papyrus/uml/properties/util/StereotypeAppearanceConstants.java
index 82f23fe45e2..654c366f829 100644
--- a/plugins/uml/properties/org.eclipse.papyrus.uml.properties/src/org/eclipse/papyrus/uml/properties/util/StereotypeAppearanceConstants.java
+++ b/plugins/uml/properties/org.eclipse.papyrus.uml.properties/src/org/eclipse/papyrus/uml/properties/util/StereotypeAppearanceConstants.java
@@ -15,7 +15,9 @@ package org.eclipse.papyrus.uml.properties.util;
* A list of constants for Stereotype appearance
*
* @author Camille Letavernier
+ *
*/
+//TODO : Move this interface to UML Tools or UML Utils
public interface StereotypeAppearanceConstants {
/** constant for stereotype text alignement */
diff --git a/plugins/uml/properties/org.eclipse.papyrus.uml.properties/src/org/eclipse/papyrus/uml/properties/widgets/LabelCustomizationMaskProvider.java b/plugins/uml/properties/org.eclipse.papyrus.uml.properties/src/org/eclipse/papyrus/uml/properties/widgets/LabelCustomizationMaskProvider.java
index 7665b36204c..3eace32199e 100644
--- a/plugins/uml/properties/org.eclipse.papyrus.uml.properties/src/org/eclipse/papyrus/uml/properties/widgets/LabelCustomizationMaskProvider.java
+++ b/plugins/uml/properties/org.eclipse.papyrus.uml.properties/src/org/eclipse/papyrus/uml/properties/widgets/LabelCustomizationMaskProvider.java
@@ -15,7 +15,7 @@ import java.util.HashSet;
import java.util.Map;
import java.util.Set;
-import org.eclipse.papyrus.uml.diagram.common.editpolicies.IMaskManagedLabelEditPolicy;
+import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IMaskManagedLabelEditPolicy;
import org.eclipse.papyrus.uml.properties.modelelement.UMLNotationModelElement;
import org.eclipse.papyrus.views.properties.modelelement.CompositeModelElement;
import org.eclipse.papyrus.views.properties.modelelement.DataSource;
diff --git a/plugins/uml/properties/org.eclipse.papyrus.uml.properties/src/org/eclipse/papyrus/uml/properties/widgets/ProfileApplicationEditor.java b/plugins/uml/properties/org.eclipse.papyrus.uml.properties/src/org/eclipse/papyrus/uml/properties/widgets/ProfileApplicationEditor.java
index 9ad0d58d53b..c049b141992 100644
--- a/plugins/uml/properties/org.eclipse.papyrus.uml.properties/src/org/eclipse/papyrus/uml/properties/widgets/ProfileApplicationEditor.java
+++ b/plugins/uml/properties/org.eclipse.papyrus.uml.properties/src/org/eclipse/papyrus/uml/properties/widgets/ProfileApplicationEditor.java
@@ -22,12 +22,12 @@ import org.eclipse.emf.ecore.resource.ResourceSet;
import org.eclipse.jface.viewers.ILabelProvider;
import org.eclipse.jface.viewers.ITreeContentProvider;
import org.eclipse.papyrus.infra.widgets.editors.MultipleReferenceEditor;
-import org.eclipse.papyrus.uml.profile.ui.dialogs.FileSelectionFilter;
-import org.eclipse.papyrus.uml.profile.ui.dialogs.Message;
import org.eclipse.papyrus.uml.profile.ui.dialogs.ProfileTreeSelectionDialog;
-import org.eclipse.papyrus.uml.profile.ui.dialogs.RegisteredProfileSelectionDialog;
import org.eclipse.papyrus.uml.properties.Activator;
import org.eclipse.papyrus.uml.properties.messages.Messages;
+import org.eclipse.papyrus.uml.properties.profile.ui.dialogs.FileSelectionFilter;
+import org.eclipse.papyrus.uml.properties.profile.ui.dialogs.Message;
+import org.eclipse.papyrus.uml.properties.profile.ui.dialogs.RegisteredProfileSelectionDialog;
import org.eclipse.swt.events.SelectionEvent;
import org.eclipse.swt.widgets.Button;
import org.eclipse.swt.widgets.Composite;
@@ -103,7 +103,7 @@ public class ProfileApplicationEditor extends MultipleReferenceEditor {
dialog.setMessage(Messages.ProfileApplicationEditor_ApplyProfilesDialogDescription);
dialog.setInput(ResourcesPlugin.getWorkspace().getRoot());
dialog.addFilter(new FileSelectionFilter(filetypes));
- dialog.setValidator(new org.eclipse.papyrus.uml.profile.ui.dialogs.FileSelectionValidator());
+ dialog.setValidator(new org.eclipse.papyrus.uml.properties.profile.ui.dialogs.FileSelectionValidator());
dialog.setDoubleClickSelects(true);
dialog.setHelpAvailable(false);
dialog.setAllowMultiple(true);
diff --git a/plugins/uml/properties/org.eclipse.papyrus.uml.properties/src/org/eclipse/papyrus/uml/properties/widgets/StereotypeApplication.java b/plugins/uml/properties/org.eclipse.papyrus.uml.properties/src/org/eclipse/papyrus/uml/properties/widgets/StereotypeApplication.java
index e776a8b89f2..baa9f3cf694 100644
--- a/plugins/uml/properties/org.eclipse.papyrus.uml.properties/src/org/eclipse/papyrus/uml/properties/widgets/StereotypeApplication.java
+++ b/plugins/uml/properties/org.eclipse.papyrus.uml.properties/src/org/eclipse/papyrus/uml/properties/widgets/StereotypeApplication.java
@@ -16,9 +16,9 @@ import org.eclipse.core.databinding.observable.IChangeListener;
import org.eclipse.gmf.runtime.notation.View;
import org.eclipse.papyrus.infra.widgets.editors.AbstractEditor;
import org.eclipse.papyrus.uml.profile.tree.objects.StereotypedElementTreeObject;
-import org.eclipse.papyrus.uml.profile.ui.compositeforview.AppliedStereotypeCompositeWithView;
-import org.eclipse.papyrus.uml.profile.ui.compositeforview.AppliedStereotypePropertyCompositeWithView;
import org.eclipse.papyrus.uml.properties.modelelement.StereotypeApplicationModelElement;
+import org.eclipse.papyrus.uml.properties.profile.ui.compositeforview.AppliedStereotypeCompositeWithView;
+import org.eclipse.papyrus.uml.properties.profile.ui.compositeforview.AppliedStereotypePropertyCompositeWithView;
import org.eclipse.papyrus.views.properties.modelelement.ModelElement;
import org.eclipse.papyrus.views.properties.widgets.AbstractPropertyEditor;
import org.eclipse.papyrus.views.properties.widgets.layout.PropertiesLayout;
diff --git a/plugins/uml/properties/org.eclipse.papyrus.uml.properties/src/org/eclipse/papyrus/uml/properties/widgets/StereotypeDisplay.java b/plugins/uml/properties/org.eclipse.papyrus.uml.properties/src/org/eclipse/papyrus/uml/properties/widgets/StereotypeDisplay.java
index 16de4e0c9f7..3db00ea9d94 100644
--- a/plugins/uml/properties/org.eclipse.papyrus.uml.properties/src/org/eclipse/papyrus/uml/properties/widgets/StereotypeDisplay.java
+++ b/plugins/uml/properties/org.eclipse.papyrus.uml.properties/src/org/eclipse/papyrus/uml/properties/widgets/StereotypeDisplay.java
@@ -18,8 +18,8 @@ import org.eclipse.gmf.runtime.notation.View;
import org.eclipse.jface.viewers.StructuredSelection;
import org.eclipse.papyrus.infra.widgets.editors.AbstractEditor;
import org.eclipse.papyrus.uml.profile.tree.objects.StereotypedElementTreeObject;
-import org.eclipse.papyrus.uml.profile.ui.compositeforview.AppearanceForAppliedStereotypeComposite;
import org.eclipse.papyrus.uml.properties.modelelement.UMLNotationModelElement;
+import org.eclipse.papyrus.uml.properties.profile.ui.compositeforview.AppearanceForAppliedStereotypeComposite;
import org.eclipse.papyrus.views.properties.modelelement.ModelElement;
import org.eclipse.papyrus.views.properties.widgets.AbstractPropertyEditor;
import org.eclipse.swt.widgets.Composite;
diff --git a/plugins/uml/tools/org.eclipse.papyrus.uml.tools/src/org/eclipse/papyrus/uml/tools/util/UMLProviderHelper.java b/plugins/uml/tools/org.eclipse.papyrus.uml.tools/src/org/eclipse/papyrus/uml/tools/util/UMLProviderHelper.java
index 095f707f500..55837cb1981 100644
--- a/plugins/uml/tools/org.eclipse.papyrus.uml.tools/src/org/eclipse/papyrus/uml/tools/util/UMLProviderHelper.java
+++ b/plugins/uml/tools/org.eclipse.papyrus.uml.tools/src/org/eclipse/papyrus/uml/tools/util/UMLProviderHelper.java
@@ -46,6 +46,7 @@ public class UMLProviderHelper {
contentProvider = provider;
}
+ //FIXME : The editedEObject might not be contained in a Resource
EMFGraphicalContentProvider graphicalProvider = new EMFGraphicalContentProvider(contentProvider, editedEObject.eResource().getResourceSet(), historyId);
return graphicalProvider;
diff --git a/plugins/views/modelexplorer/org.eclipse.papyrus.views.modelexplorer/src/org/eclipse/papyrus/views/modelexplorer/MoDiscoLabelProvider.java b/plugins/views/modelexplorer/org.eclipse.papyrus.views.modelexplorer/src/org/eclipse/papyrus/views/modelexplorer/MoDiscoLabelProvider.java
index 775dc3dd706..6374f05ca47 100644
--- a/plugins/views/modelexplorer/org.eclipse.papyrus.views.modelexplorer/src/org/eclipse/papyrus/views/modelexplorer/MoDiscoLabelProvider.java
+++ b/plugins/views/modelexplorer/org.eclipse.papyrus.views.modelexplorer/src/org/eclipse/papyrus/views/modelexplorer/MoDiscoLabelProvider.java
@@ -94,9 +94,13 @@ public class MoDiscoLabelProvider extends CustomizableModelLabelProvider {
}
//Set the decoration with default position
- IDecoration decoration = decorationService.getDecoration(element, true);
- decoration.setDecorationImage(getImageDescriptor(decoration.getSeverity()));
- adapter.setDecoration(decoration.getDecorationImage(), PreferedPosition.DEFAULT);
+ if(element != null) {
+ if(element instanceof EObject || (element instanceof IAdaptable && ((IAdaptable)element).getAdapter(EObject.class) != null)) {
+ IDecoration decoration = decorationService.getDecoration(element, true);
+ decoration.setDecorationImage(getImageDescriptor(decoration.getSeverity()));
+ adapter.setDecoration(decoration.getDecorationImage(), PreferedPosition.DEFAULT);
+ }
+ }
//return the target decorated
return adapter.getDecoratedImage();
diff --git a/plugins/views/properties/org.eclipse.papyrus.views.properties/schema/context.exsd b/plugins/views/properties/org.eclipse.papyrus.views.properties/schema/context.exsd
index 68da6518ef0..d86ae99edb6 100644
--- a/plugins/views/properties/org.eclipse.papyrus.views.properties/schema/context.exsd
+++ b/plugins/views/properties/org.eclipse.papyrus.views.properties/schema/context.exsd
@@ -59,18 +59,6 @@
</appInfo>
</annotation>
</attribute>
- <attribute name="loadDefault" type="boolean" use="default" value="true">
- <annotation>
- <documentation>
- If set to true, this context will be activated by default. Otherwise, the user will need to activate it manually through the preferences page (Preferences -&gt; Papyrus -&gt; Property views)
-
-Default is true.
- </documentation>
- <appInfo>
- <meta.attribute deprecated="true"/>
- </appInfo>
- </annotation>
- </attribute>
</complexType>
</element>
diff --git a/sandbox/org.eclipse.papyrus.uml.tools.utils_css/META-INF/MANIFEST.MF b/sandbox/org.eclipse.papyrus.uml.tools.utils_css/META-INF/MANIFEST.MF
index dcfddf39ce2..536e021eb14 100644
--- a/sandbox/org.eclipse.papyrus.uml.tools.utils_css/META-INF/MANIFEST.MF
+++ b/sandbox/org.eclipse.papyrus.uml.tools.utils_css/META-INF/MANIFEST.MF
@@ -5,11 +5,8 @@ Require-Bundle: org.eclipse.uml2.uml,
org.eclipse.papyrus.infra.services.edit;bundle-version="0.9.0",
org.eclipse.gmf.runtime.emf.type.core;bundle-version="1.4.0",
org.eclipse.papyrus.infra.emf;bundle-version="0.9.0",
- org.eclipse.papyrus.prototype.infra.gmfdiag.css;bundle-version="0.9.0"
-Export-Package: org.eclipse.papyrus.uml.tools.utils,
- org.eclipse.papyrus.uml.tools.utils.ui,
- org.eclipse.papyrus.uml.tools.utils.ui.command,
- org.eclipse.papyrus.uml.tools.utils.ui.helper
+ org.eclipse.gmf.runtime.notation;bundle-version="1.5.0"
+Export-Package: org.eclipse.papyrus.uml.tools.utils
Bundle-Vendor: %pluginProvider
Bundle-ActivationPolicy: lazy
Bundle-Version: 0.9.0.qualifier
diff --git a/sandbox/org.eclipse.papyrus.uml.tools.utils_css/src/org/eclipse/papyrus/uml/tools/utils/ui/VisualInformationPapyrusConstant.java b/sandbox/org.eclipse.papyrus.uml.tools.utils_css/src/org/eclipse/papyrus/uml/tools/utils/ui/VisualInformationPapyrusConstant.java
deleted file mode 100644
index 7ee8d0d9cb0..00000000000
--- a/sandbox/org.eclipse.papyrus.uml.tools.utils_css/src/org/eclipse/papyrus/uml/tools/utils/ui/VisualInformationPapyrusConstant.java
+++ /dev/null
@@ -1,188 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2008 CEA LIST.
- *
- *
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Patrick Tessier (CEA LIST) Patrick.tessier@cea.fr - Initial API and implementation
- *
- *****************************************************************************/
-package org.eclipse.papyrus.uml.tools.utils.ui;
-
-public interface VisualInformationPapyrusConstant {
-
- public static String STEREOTYPE_ANNOTATION = "Stereotype_Annotation";
-
- /**
- * the kind of presentation for stereotype
- */
- public static String STEREOTYPE_PRESENTATION_KIND = "Stereotype_Presentation_Kind";
-
- /**
- * the list of stereotype to display
- */
- public static String STEREOTYPE_LIST = "StereotypeList";
-
- /**
- * the list of stereotype to display
- */
- public static String STEREOTYPE_WITHQN_LIST = "StereotypeWithQualifiedNameList";
-
- /**
- *
- */
- public static String TEXT_ICON_STEREOTYPE_PRESENTATION = "TextIconStereotype";
-
- /**
- *
- */
- public static String ICON_STEREOTYPE_PRESENTATION = "IconStereotype";
-
- /**
- *
- */
- public static String IMAGE_STEREOTYPE_PRESENTATION = "ImageStereotype";
-
- /**
- *
- */
- public static String STEREOTYPE_TEXT_HORIZONTAL_PRESENTATION = "HorizontalStereo";
-
- /**
- *
- */
- public static String STEREOTYPE_TEXT_VERTICAL_PRESENTATION = "VerticalStereo";
-
- /**
- *
- */
- public static String PROPERTY_STEREOTYPE_DISPLAY = "PropStereoDisplay";
-
- /**
- *
- */
- // @unused
- public static String PROPERTY_STEREOTYPE_PROPERTY_VALUES_DISPLAY = "PropStereoPropValuesDisplay";
-
- /**
- *
- */
- // @unused
- public static String OPAQUE_EXPRESSION_BODY_DISPLAY = "OpaqueExpressionBodyDisplay";
-
- /**
- * String represent the location of stereotype properties within a comment
- */
- public static String STEREOTYPE_COMMENT_LOCATION = "Comment";
-
- /**
- * String represent the location of stereotype properties within a compartment of a graph node
- */
- public static String STEREOTYPE_COMPARTMENT_LOCATION = "Compartment";
-
- /**
- * properties of applied stereotypes are enclose in braces
- */
- public static String STEREOTYPE_BRACE_LOCATION = "With brace";
-
- /** The qualified name. */
- public static String QUALIFIED_NAME = "QualifiedName";
-
- /** The qualified name depth. */
- public static String QUALIFIED_NAME_DEPTH = "QualifiedNameDepth";
-
- /**
- * The GRADIENT.
- *
- * @deprecated
- */
- @Deprecated
- public static String GRADIENT = "Gradient";
-
- /** The GRADIEN t_ value. */
- /**
- * @deprecated
- */
- @Deprecated
- public static String GRADIENT_VALUE = "GradientValue";
-
- public static String SHADOWFIGURE = "ShadowFigure";
-
- public static String SHADOWFIGURE_VALUE = "ShadowFigure_Value";
-
- public static String DISPLAY_NAMELABELICON = "displayNameLabelIcon";
-
- public static String DISPLAY_NAMELABELICON_VALUE = "displayNameLabelIcon_value";
-
- public static String LAYOUTFIGURE = "layoutFigure";
-
- public static String LAYOUTFIGURE_VALUE = "layoutFigure_value";
-
- public static String STEREOTYPE_PROPERTY_LOCATION = "StereotypePropertyLocation";
-
- /**
- * The Constant P_STEREOTYPE_NAME_DISPLAY_USER_CONTROLLED.
- */
- public final static String P_STEREOTYPE_NAME_DISPLAY_USER_CONTROLLED = "User Controlled";
-
- /**
- * The Constant P_STEREOTYPE_NAME_DISPLAY_UML_CONFORM.
- */
- public final static String P_STEREOTYPE_NAME_DISPLAY_UML_CONFORM = "UML Compatibility (lower case first letter - default)";
-
- /**
- * The Constant P_STEREOTYPE_NAME_APPEARANCE.
- */
- public static final String P_STEREOTYPE_NAME_APPEARANCE = "ProfileApplicationPreferenceConstants.stereotype.name.appearance";
-
- /**
- * Separator for stereotype properties list, i.e. the separator between each properties in the
- * list. It is set to "<code>,</code>" by default
- */
- public static final String STEREOTYPE_PROPERTIES_LIST_SEPARATOR = ",";
-
- /** key for the appearance of properties or other specific display */
- public static final String CUSTOM_APPEARENCE_ANNOTATION = "CustomAppearance_Annotation";
-
- /**
- * this is a key of eAnnnotation that contains hypertext link or referenced document
- **/
- public static final String HYPERLINK_DIAGRAM = "PapyrusHyperLink_Diagram";
-
- /**
- * this is a value of a eAnnnotation detail that explain the kind of the link
- **/
- /**
- * @deprecated : use the constants declared into oep.infra.hyperlink.HyperLinkConstants.java
- */
- public static final String HYPERLINK_DOCUMENT = "PapyrusHyperLink_Document";
- /**
- * @deprecated : use the constants declared into oep.infra.hyperlink.HyperLinkConstants.java
- */
- public static final String HYPERLINK_WEB = "PapyrusHyperLink_web";
- /**
- * @deprecated : use the constants declared into oep.infra.hyperlink.HyperLinkConstants.java
- */
- public static final String HYPERLINK_TOOLTYPE_TEXT = "tooltip_text";
-
- public static final String HYPERLINK_DIAGRAM_NAME = "diagram_name";
- /**
- * @deprecated : use the constants declared into oep.infra.hyperlink.HyperLinkConstants.java
- */
- public static final String HYPERLINK_IS_DEFAULT_NAVIGATION = "is_default_navigation";
- /**
- * @deprecated : use the constants declared into oep.infra.hyperlink.HyperLinkConstants.java
- */
- public static final String HYPERLINK_DOCUMENT_LOCALIZATION = "localization";
- /**
- * @deprecated : use the constants declared into oep.infra.hyperlink.HyperLinkConstants.java
- */
- public static final String HYPERLINK_WEB_LINK = "link";
-
- /** key for the appearance of properties or other specific display */
- public static final String CUSTOM_APPEARANCE_MASK_VALUE = "CustomAppearance_MaskValue";
-}
diff --git a/sandbox/org.eclipse.papyrus.uml.tools.utils_css/src/org/eclipse/papyrus/uml/tools/utils/ui/command/AddAppliedQNStereotypeToDisplayCommand.java b/sandbox/org.eclipse.papyrus.uml.tools.utils_css/src/org/eclipse/papyrus/uml/tools/utils/ui/command/AddAppliedQNStereotypeToDisplayCommand.java
deleted file mode 100644
index 315c063102e..00000000000
--- a/sandbox/org.eclipse.papyrus.uml.tools.utils_css/src/org/eclipse/papyrus/uml/tools/utils/ui/command/AddAppliedQNStereotypeToDisplayCommand.java
+++ /dev/null
@@ -1,82 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2008 CEA LIST.
- *
- *
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Patrick Tessier (CEA LIST) Patrick.tessier@cea.fr - Initial API and implementation
- *
- *****************************************************************************/
-package org.eclipse.papyrus.uml.tools.utils.ui.command;
-
-import org.eclipse.emf.ecore.EAnnotation;
-import org.eclipse.emf.ecore.EModelElement;
-import org.eclipse.emf.transaction.TransactionalEditingDomain;
-import org.eclipse.papyrus.uml.tools.utils.ui.VisualInformationPapyrusConstant;
-import org.eclipse.papyrus.uml.tools.utils.ui.helper.AppliedStereotypeHelper;
-
-/**
- * The Class AddQNAppliedStereotypeToDisplayCommand used to set the list of applied stereotype to
- * display withe the qualifiedName.
- */
-public class AddAppliedQNStereotypeToDisplayCommand extends CreateEAnnotationCommand {
-
- /** The qualified namedepht. */
- private final String stereotypeListQN;
-
- /**
- * the presnetation kind of applied stereotypes
- */
- // @unused
- private String appliedStereotypePresentationKind;
-
- /**
- * Instantiates a new sets the applied stereotype to display command.
- *
- * @param domain
- * the domain
- * @param object
- * the object
- * @param stereotypeList
- * the stereotype list
- */
- public AddAppliedQNStereotypeToDisplayCommand(TransactionalEditingDomain domain, EModelElement object,
- String stereotypeQNList) {
- super(domain, object, VisualInformationPapyrusConstant.STEREOTYPE_ANNOTATION);
- this.stereotypeListQN = stereotypeQNList;
- }
-
- /**
- * {@inheritDoc}
- */
- @Override
- protected void doExecute() {
- String stereoListQN = AppliedStereotypeHelper.getStereotypesQNToDisplay(this.getObject());
- if(!"".equals(stereoListQN)) {
- stereoListQN = stereoListQN + ",";
- }
- stereoListQN = stereoListQN + stereotypeListQN;
- EAnnotation oldAnnotation = getObject().getEAnnotation(VisualInformationPapyrusConstant.STEREOTYPE_ANNOTATION);
- if(oldAnnotation == null) {
- oldAnnotation = createEAnnotation();
- attachEannotation(oldAnnotation, getObject());
- }
- replaceEntry(oldAnnotation, VisualInformationPapyrusConstant.STEREOTYPE_WITHQN_LIST, stereoListQN);
- replaceEntry(oldAnnotation, VisualInformationPapyrusConstant.STEREOTYPE_LIST, AppliedStereotypeHelper
- .getStereotypesToDisplay(getObject()));
- replaceEntry(oldAnnotation, VisualInformationPapyrusConstant.STEREOTYPE_PRESENTATION_KIND,
- AppliedStereotypeHelper.getAppliedStereotypePresentationKind(getObject()));
- replaceEntry(oldAnnotation, VisualInformationPapyrusConstant.PROPERTY_STEREOTYPE_DISPLAY,
- AppliedStereotypeHelper.getAppliedStereotypesPropertiesToDisplay(getObject()));
- replaceEntry(oldAnnotation, VisualInformationPapyrusConstant.STEREOTYPE_PROPERTY_LOCATION,
- AppliedStereotypeHelper.getAppliedStereotypesPropertiesLocalization(getObject()));
- replaceEannotation(getObject().getEAnnotation(VisualInformationPapyrusConstant.STEREOTYPE_ANNOTATION),
- getObject());
-
- }
-
-}
diff --git a/sandbox/org.eclipse.papyrus.uml.tools.utils_css/src/org/eclipse/papyrus/uml/tools/utils/ui/command/AddAppliedStereotypePropertiesToDisplayCommand.java b/sandbox/org.eclipse.papyrus.uml.tools.utils_css/src/org/eclipse/papyrus/uml/tools/utils/ui/command/AddAppliedStereotypePropertiesToDisplayCommand.java
deleted file mode 100644
index 5641d9a0715..00000000000
--- a/sandbox/org.eclipse.papyrus.uml.tools.utils_css/src/org/eclipse/papyrus/uml/tools/utils/ui/command/AddAppliedStereotypePropertiesToDisplayCommand.java
+++ /dev/null
@@ -1,78 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2008 CEA LIST.
- *
- *
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Patrick Tessier (CEA LIST) Patrick.tessier@cea.fr - Initial API and implementation
- *
- *****************************************************************************/
-package org.eclipse.papyrus.uml.tools.utils.ui.command;
-
-import org.eclipse.emf.ecore.EAnnotation;
-import org.eclipse.emf.ecore.EModelElement;
-import org.eclipse.emf.transaction.TransactionalEditingDomain;
-import org.eclipse.papyrus.uml.tools.utils.ui.VisualInformationPapyrusConstant;
-import org.eclipse.papyrus.uml.tools.utils.ui.helper.AppliedStereotypeHelper;
-
-/**
- * The Class AddAppliedStereotypeToDisplayCommand used to set the list of applied stereotype to
- * display
- */
-public class AddAppliedStereotypePropertiesToDisplayCommand extends CreateEAnnotationCommand {
-
- /** The qualified namedepht. */
- private String stereotypeList;
-
- /**
- * add a new sets the applied stereotype properties to display command.
- *
- * @param domain
- * the domain
- * @param object
- * the object
- * @param stereotypeList
- * the stereotype list
- */
- public AddAppliedStereotypePropertiesToDisplayCommand(TransactionalEditingDomain domain, EModelElement object,
- String stereotypeList) {
- super(domain, object, VisualInformationPapyrusConstant.STEREOTYPE_ANNOTATION);
- this.stereotypeList = stereotypeList;
- }
-
- /**
- * {@inheritDoc}
- */
- @Override
- protected void doExecute() {
- String stereotypePropertiesList = AppliedStereotypeHelper.getAppliedStereotypesPropertiesToDisplay(this
- .getObject());
- if(!"".equals(stereotypePropertiesList)) {
- stereotypePropertiesList = stereotypePropertiesList + ",";
- }
- stereotypePropertiesList = stereotypePropertiesList + stereotypeList;
- EAnnotation oldAnnotation = getObject().getEAnnotation(VisualInformationPapyrusConstant.STEREOTYPE_ANNOTATION);
- if(oldAnnotation == null) {
- oldAnnotation = createEAnnotation();
- attachEannotation(oldAnnotation, getObject());
- }
- replaceEntry(oldAnnotation, VisualInformationPapyrusConstant.STEREOTYPE_WITHQN_LIST, AppliedStereotypeHelper
- .getStereotypesQNToDisplay(getObject()));
- replaceEntry(oldAnnotation, VisualInformationPapyrusConstant.STEREOTYPE_LIST, AppliedStereotypeHelper
- .getStereotypesToDisplay(getObject()));
- replaceEntry(oldAnnotation, VisualInformationPapyrusConstant.PROPERTY_STEREOTYPE_DISPLAY,
- stereotypePropertiesList);
- replaceEntry(oldAnnotation, VisualInformationPapyrusConstant.STEREOTYPE_PRESENTATION_KIND,
- AppliedStereotypeHelper.getAppliedStereotypePresentationKind(getObject()));
- replaceEntry(oldAnnotation, VisualInformationPapyrusConstant.STEREOTYPE_PROPERTY_LOCATION,
- AppliedStereotypeHelper.getAppliedStereotypesPropertiesLocalization(getObject()));
-
- replaceEannotation(getObject().getEAnnotation(VisualInformationPapyrusConstant.STEREOTYPE_ANNOTATION),
- getObject());
- }
-
-}
diff --git a/sandbox/org.eclipse.papyrus.uml.tools.utils_css/src/org/eclipse/papyrus/uml/tools/utils/ui/command/AddAppliedStereotypeToDisplayCommand.java b/sandbox/org.eclipse.papyrus.uml.tools.utils_css/src/org/eclipse/papyrus/uml/tools/utils/ui/command/AddAppliedStereotypeToDisplayCommand.java
deleted file mode 100644
index 9196724f4f4..00000000000
--- a/sandbox/org.eclipse.papyrus.uml.tools.utils_css/src/org/eclipse/papyrus/uml/tools/utils/ui/command/AddAppliedStereotypeToDisplayCommand.java
+++ /dev/null
@@ -1,83 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2008 CEA LIST.
- *
- *
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Patrick Tessier (CEA LIST) Patrick.tessier@cea.fr - Initial API and implementation
- *
- *****************************************************************************/
-package org.eclipse.papyrus.uml.tools.utils.ui.command;
-
-import org.eclipse.emf.ecore.EAnnotation;
-import org.eclipse.emf.ecore.EModelElement;
-import org.eclipse.emf.transaction.TransactionalEditingDomain;
-import org.eclipse.papyrus.uml.tools.utils.ui.VisualInformationPapyrusConstant;
-import org.eclipse.papyrus.uml.tools.utils.ui.helper.AppliedStereotypeHelper;
-
-/**
- * The Class AddAppliedStereotypeToDisplayCommand used to set the list of applied stereotype to
- * display
- */
-public class AddAppliedStereotypeToDisplayCommand extends CreateEAnnotationCommand {
-
- /** The qualified namedepht. */
- private String stereotypeList;
-
- /**
- * the presnetation kind of applied stereotypes
- */
- private String appliedStereotypePresentationKind;
-
- /**
- * Instantiates a new sets the applied stereotype to display command.
- *
- * @param domain
- * the domain
- * @param object
- * the object
- * @param stereotypeList
- * the stereotype list
- */
- public AddAppliedStereotypeToDisplayCommand(TransactionalEditingDomain domain, EModelElement object,
- String stereotypeList, String appliedStereotypepresentationKind) {
- super(domain, object, VisualInformationPapyrusConstant.STEREOTYPE_ANNOTATION);
- this.stereotypeList = stereotypeList;
- this.appliedStereotypePresentationKind = appliedStereotypepresentationKind;
- }
-
- /**
- * {@inheritDoc}
- */
- @Override
- protected void doExecute() {
- String stereoList = AppliedStereotypeHelper.getStereotypesToDisplay(this.getObject());
- if(!"".equals(stereoList)) {
- stereoList = stereoList + ",";
- }
- stereoList = stereoList + stereotypeList;
- EAnnotation oldAnnotation = getObject().getEAnnotation(VisualInformationPapyrusConstant.STEREOTYPE_ANNOTATION);
- if(oldAnnotation == null) {
- oldAnnotation = createEAnnotation();
- attachEannotation(oldAnnotation, getObject());
- }
- replaceEntry(oldAnnotation, VisualInformationPapyrusConstant.STEREOTYPE_WITHQN_LIST, AppliedStereotypeHelper
- .getStereotypesQNToDisplay(getObject()));
- replaceEntry(oldAnnotation, VisualInformationPapyrusConstant.STEREOTYPE_LIST, stereoList);
- replaceEntry(oldAnnotation, VisualInformationPapyrusConstant.STEREOTYPE_PRESENTATION_KIND,
- appliedStereotypePresentationKind);
- replaceEntry(oldAnnotation, VisualInformationPapyrusConstant.PROPERTY_STEREOTYPE_DISPLAY,
- AppliedStereotypeHelper.getAppliedStereotypesPropertiesToDisplay(getObject()));
- replaceEntry(oldAnnotation, VisualInformationPapyrusConstant.STEREOTYPE_PROPERTY_LOCATION,
- AppliedStereotypeHelper.getAppliedStereotypesPropertiesLocalization(getObject()));
-
- replaceEannotation(getObject().getEAnnotation(VisualInformationPapyrusConstant.STEREOTYPE_ANNOTATION),
- getObject());
-
- }
-
-}
diff --git a/sandbox/org.eclipse.papyrus.uml.tools.utils_css/src/org/eclipse/papyrus/uml/tools/utils/ui/command/AddMaskManagedLabelDisplayCommand.java b/sandbox/org.eclipse.papyrus.uml.tools.utils_css/src/org/eclipse/papyrus/uml/tools/utils/ui/command/AddMaskManagedLabelDisplayCommand.java
deleted file mode 100644
index fb3e8b40984..00000000000
--- a/sandbox/org.eclipse.papyrus.uml.tools.utils_css/src/org/eclipse/papyrus/uml/tools/utils/ui/command/AddMaskManagedLabelDisplayCommand.java
+++ /dev/null
@@ -1,67 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2008 CEA LIST.
- *
- *
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Patrick Tessier (CEA LIST) Patrick.tessier@cea.fr - Initial API and implementation
- *
- *****************************************************************************/
-package org.eclipse.papyrus.uml.tools.utils.ui.command;
-
-import org.eclipse.emf.ecore.EAnnotation;
-import org.eclipse.emf.ecore.EModelElement;
-import org.eclipse.emf.transaction.TransactionalEditingDomain;
-import org.eclipse.papyrus.infra.services.edit.Activator;
-import org.eclipse.papyrus.uml.tools.utils.ui.VisualInformationPapyrusConstant;
-
-/**
- * The Class AddAppliedStereotypeToDisplayCommand used to set the list of applied stereotype to
- * display
- */
-public class AddMaskManagedLabelDisplayCommand extends CreateEAnnotationCommand {
-
- /** new Mask Value */
- private int maskValue;
-
- /**
- * Instantiates a new sets the applied stereotype to display command.
- *
- * @param domain
- * the editing domain that manages the command
- * @param object
- * the object to be modified
- * @param maskValue
- * the mask value to be stored
- */
- public AddMaskManagedLabelDisplayCommand(TransactionalEditingDomain domain, EModelElement object, int maskValue) {
- super(domain, object, VisualInformationPapyrusConstant.CUSTOM_APPEARENCE_ANNOTATION);
- this.maskValue = maskValue;
- }
-
- /**
- * {@inheritDoc}
- */
- @Override
- protected void doExecute() {
-
- EAnnotation oldAnnotation = getObject().getEAnnotation(
- VisualInformationPapyrusConstant.CUSTOM_APPEARENCE_ANNOTATION);
- if(oldAnnotation == null) {
- oldAnnotation = createEAnnotation();
- attachEannotation(oldAnnotation, getObject());
- }
- Activator.log.debug(maskValue + " -> " + Integer.toString(maskValue));
- replaceEntry(oldAnnotation, VisualInformationPapyrusConstant.CUSTOM_APPEARANCE_MASK_VALUE, Integer
- .toString(maskValue));
-
- replaceEannotation(getObject().getEAnnotation(VisualInformationPapyrusConstant.CUSTOM_APPEARENCE_ANNOTATION),
- getObject());
-
- }
-
-}
diff --git a/sandbox/org.eclipse.papyrus.uml.tools.utils_css/src/org/eclipse/papyrus/uml/tools/utils/ui/command/CreateEAnnotationCommand.java b/sandbox/org.eclipse.papyrus.uml.tools.utils_css/src/org/eclipse/papyrus/uml/tools/utils/ui/command/CreateEAnnotationCommand.java
deleted file mode 100644
index 8e486ae95d1..00000000000
--- a/sandbox/org.eclipse.papyrus.uml.tools.utils_css/src/org/eclipse/papyrus/uml/tools/utils/ui/command/CreateEAnnotationCommand.java
+++ /dev/null
@@ -1,150 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2008 CEA LIST.
- *
- *
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Patrick Tessier (CEA LIST) Patrick.tessier@cea.fr - Initial API and implementation
- *
- *****************************************************************************/
-package org.eclipse.papyrus.uml.tools.utils.ui.command;
-
-import org.eclipse.emf.ecore.EAnnotation;
-import org.eclipse.emf.ecore.EModelElement;
-import org.eclipse.emf.ecore.EcoreFactory;
-import org.eclipse.emf.transaction.TransactionalEditingDomain;
-
-/**
- * The Class CreateEAnnotationCommand. this class contains also all submethods to create or replace
- * eannotation of key value
- * @deprecated : use org.eclipse.papyrus.infra.emf.commands.CreateEAnnotationCommand
- */
-public class CreateEAnnotationCommand extends org.eclipse.emf.transaction.RecordingCommand {
-
- public EModelElement getObject() {
- return object;
- }
-
- // @unused
- public void setObject(EModelElement object) {
- this.object = object;
- }
-
- // @unused
- public String getEAnnotationName() {
- return eAnnotationName;
- }
-
- // @unused
- public void setEAnnotationName(String annotationName) {
- eAnnotationName = annotationName;
- }
-
- /** The object. */
- private EModelElement object;
-
- /** The e annotation name. */
- private String eAnnotationName;
-
- /**
- * Instantiates a new creates the e annotation command.
- *
- * @param domain
- * the domain
- * @param object
- * the object
- * @param eannotationName
- * the eannotation name
- */
- public CreateEAnnotationCommand(TransactionalEditingDomain domain, EModelElement object, String eannotationName) {
- super(domain);
- this.object = object;
- this.eAnnotationName = eannotationName;
- }
-
- /**
- * {@inheritDoc}
- */
- @Override
- protected void doExecute() {
- attachEannotation(createEAnnotation(), object);
-
- }
-
- /**
- * Creates the e annotation.
- *
- * @return the e annotation
- */
- protected EAnnotation createEAnnotation() {
- EAnnotation eannotation = EcoreFactory.eINSTANCE.createEAnnotation();
- eannotation.setSource(eAnnotationName);
- return eannotation;
- }
-
- /**
- * Attach eannotation to an EmodelElement.
- *
- * @param annotation
- * the annotation
- * @param object
- * the object
- */
- protected void attachEannotation(EAnnotation annotation, EModelElement object) {
- object.getEAnnotations().add(annotation);
- }
-
- /**
- * Replace existing eannotation with a new eannotation. This repplaced eannotation has the same
- * source.
- *
- * @param annotation
- * the annotation
- * @param object
- * the object
- */
- protected void replaceEannotation(EAnnotation annotation, EModelElement object) {
- while(object.getEAnnotation(annotation.getSource()) != null) {
- object.getEAnnotations().remove(object.getEAnnotation(annotation.getSource()));
- }
-
- object.getEAnnotations().add(annotation);
- }
-
- /**
- * Adds the entry.
- *
- * @param annotation
- * the annotation
- * @param key
- * the key
- * @param value
- * the value
- */
- // @unused
- protected void addEntry(EAnnotation annotation, String key, String value) {
- annotation.getDetails().put(key, value);
- }
-
- /**
- * Replace entry.
- *
- * @param annotation
- * the annotation not null
- * @param key
- * the key
- * @param value
- * the value
- */
- protected void replaceEntry(EAnnotation annotation, String key, String value) {
- while(annotation.getDetails().get(key) != null) {
- annotation.getDetails().removeKey(key);
-
- }
- annotation.getDetails().put(key, value);
- }
-}
diff --git a/sandbox/org.eclipse.papyrus.uml.tools.utils_css/src/org/eclipse/papyrus/uml/tools/utils/ui/command/RemoveAppliedStereotypePropertiesToDisplayCommand.java b/sandbox/org.eclipse.papyrus.uml.tools.utils_css/src/org/eclipse/papyrus/uml/tools/utils/ui/command/RemoveAppliedStereotypePropertiesToDisplayCommand.java
deleted file mode 100644
index 730659a6456..00000000000
--- a/sandbox/org.eclipse.papyrus.uml.tools.utils_css/src/org/eclipse/papyrus/uml/tools/utils/ui/command/RemoveAppliedStereotypePropertiesToDisplayCommand.java
+++ /dev/null
@@ -1,83 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2008 CEA LIST.
- *
- *
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Patrick Tessier (CEA LIST) Patrick.tessier@cea.fr - Initial API and implementation
- *
- *****************************************************************************/
-package org.eclipse.papyrus.uml.tools.utils.ui.command;
-
-import java.util.StringTokenizer;
-
-import org.eclipse.emf.ecore.EAnnotation;
-import org.eclipse.emf.ecore.EModelElement;
-import org.eclipse.emf.transaction.TransactionalEditingDomain;
-import org.eclipse.papyrus.uml.tools.utils.ui.VisualInformationPapyrusConstant;
-import org.eclipse.papyrus.uml.tools.utils.ui.helper.AppliedStereotypeHelper;
-
-/**
- * The Class RemoveAppliedStereotypeToDisplayCommand used to set the list of applied stereotype to
- * display
- */
-public class RemoveAppliedStereotypePropertiesToDisplayCommand extends CreateEAnnotationCommand {
-
- /** The qualified namedepht. */
- private String stereotypePropertiesListToRemove;
-
- /**
- * Instantiates a new sets the applied stereotype to display command.
- *
- * @param domain
- * the domain
- * @param object
- * the object
- * @param stereotypePropertyList
- * the stereotype list
- */
- public RemoveAppliedStereotypePropertiesToDisplayCommand(TransactionalEditingDomain domain, EModelElement object,
- String stereotypePropertyList) {
- super(domain, object, VisualInformationPapyrusConstant.STEREOTYPE_ANNOTATION);
- this.stereotypePropertiesListToRemove = stereotypePropertyList;
- }
-
- /**
- * {@inheritDoc}
- */
- @Override
- protected void doExecute() {
- String stereotypePropertiesList = AppliedStereotypeHelper.getAppliedStereotypesPropertiesToDisplay(this
- .getObject());
-
- StringTokenizer appliedStereotypeToken = new StringTokenizer(stereotypePropertiesListToRemove, ",");
- while(appliedStereotypeToken.hasMoreElements()) {
- String tokenToRemove = appliedStereotypeToken.nextToken();
- stereotypePropertiesList = stereotypePropertiesList.replaceAll("," + tokenToRemove.trim(), "");
- stereotypePropertiesList = stereotypePropertiesList.replaceAll(tokenToRemove.trim(), "");
- }
-
- EAnnotation oldAnnotation = getObject().getEAnnotation(VisualInformationPapyrusConstant.STEREOTYPE_ANNOTATION);
- if(oldAnnotation == null) {
- oldAnnotation = createEAnnotation();
- attachEannotation(oldAnnotation, getObject());
- }
- replaceEntry(oldAnnotation, VisualInformationPapyrusConstant.STEREOTYPE_WITHQN_LIST, AppliedStereotypeHelper
- .getStereotypesQNToDisplay(getObject()));
- replaceEntry(oldAnnotation, VisualInformationPapyrusConstant.STEREOTYPE_LIST, AppliedStereotypeHelper
- .getStereotypesToDisplay(getObject()));
- replaceEntry(oldAnnotation, VisualInformationPapyrusConstant.STEREOTYPE_PRESENTATION_KIND,
- AppliedStereotypeHelper.getAppliedStereotypePresentationKind(getObject()));
- replaceEntry(oldAnnotation, VisualInformationPapyrusConstant.PROPERTY_STEREOTYPE_DISPLAY,
- stereotypePropertiesList);
- replaceEntry(oldAnnotation, VisualInformationPapyrusConstant.STEREOTYPE_PROPERTY_LOCATION,
- AppliedStereotypeHelper.getAppliedStereotypesPropertiesLocalization(getObject()));
-
- replaceEannotation(getObject().getEAnnotation(VisualInformationPapyrusConstant.STEREOTYPE_ANNOTATION),
- getObject());
- }
-}
diff --git a/sandbox/org.eclipse.papyrus.uml.tools.utils_css/src/org/eclipse/papyrus/uml/tools/utils/ui/command/RemoveAppliedStereotypeToDisplayCommand.java b/sandbox/org.eclipse.papyrus.uml.tools.utils_css/src/org/eclipse/papyrus/uml/tools/utils/ui/command/RemoveAppliedStereotypeToDisplayCommand.java
deleted file mode 100644
index fb9277f37a7..00000000000
--- a/sandbox/org.eclipse.papyrus.uml.tools.utils_css/src/org/eclipse/papyrus/uml/tools/utils/ui/command/RemoveAppliedStereotypeToDisplayCommand.java
+++ /dev/null
@@ -1,95 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2008 CEA LIST.
- *
- *
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Patrick Tessier (CEA LIST) Patrick.tessier@cea.fr - Initial API and implementation
- *
- *****************************************************************************/
-package org.eclipse.papyrus.uml.tools.utils.ui.command;
-
-import java.util.StringTokenizer;
-
-import org.eclipse.emf.ecore.EAnnotation;
-import org.eclipse.emf.ecore.EModelElement;
-import org.eclipse.emf.transaction.TransactionalEditingDomain;
-import org.eclipse.papyrus.uml.tools.utils.ui.VisualInformationPapyrusConstant;
-import org.eclipse.papyrus.uml.tools.utils.ui.helper.AppliedStereotypeHelper;
-
-/**
- * The Class RemoveAppliedStereotypeToDisplayCommand used to set the list of applied stereotype to
- * display
- */
-public class RemoveAppliedStereotypeToDisplayCommand extends CreateEAnnotationCommand {
-
- /** The qualified namedepht. */
- private String stereotypeList;
-
- /**
- * the presnetation kind of applied stereotypes
- */
- private String appliedStereotypePresentationKind;
-
- /**
- * Instantiates a new sets the applied stereotype to display command.
- *
- * @param domain
- * the domain
- * @param object
- * the object
- * @param stereotypeList
- * the stereotype list
- */
- public RemoveAppliedStereotypeToDisplayCommand(TransactionalEditingDomain domain, EModelElement object,
- String stereotypeList, String appliedStereotypepresentationKind) {
- super(domain, object, VisualInformationPapyrusConstant.STEREOTYPE_ANNOTATION);
- this.stereotypeList = stereotypeList;
- this.appliedStereotypePresentationKind = appliedStereotypepresentationKind;
- }
-
- /**
- * {@inheritDoc}
- */
- @Override
- protected void doExecute() {
- String stereoList = AppliedStereotypeHelper.getStereotypesToDisplay(this.getObject());
-
- StringTokenizer appliedStereotypeToken = new StringTokenizer(stereotypeList, ",");
- while(appliedStereotypeToken.hasMoreElements()) {
- String token = appliedStereotypeToken.nextToken();
- stereoList = stereoList.replaceAll("," + token.trim(), "");
- stereoList = stereoList.replaceAll(token.trim(), "");
- }
-
- String stereoListQN = AppliedStereotypeHelper.getStereotypesQNToDisplay(this.getObject());
- appliedStereotypeToken = new StringTokenizer(stereotypeList, ",");
- while(appliedStereotypeToken.hasMoreElements()) {
- String token = appliedStereotypeToken.nextToken();
- stereoListQN = stereoListQN.replaceAll("," + token.trim(), "");
- stereoListQN = stereoListQN.replaceAll(token.trim(), "");
- }
-
- EAnnotation oldAnnotation = getObject().getEAnnotation(VisualInformationPapyrusConstant.STEREOTYPE_ANNOTATION);
- if(oldAnnotation == null) {
- oldAnnotation = createEAnnotation();
- attachEannotation(oldAnnotation, getObject());
- }
- replaceEntry(oldAnnotation, VisualInformationPapyrusConstant.STEREOTYPE_WITHQN_LIST, stereoListQN);
- replaceEntry(oldAnnotation, VisualInformationPapyrusConstant.STEREOTYPE_LIST, stereoList);
- replaceEntry(oldAnnotation, VisualInformationPapyrusConstant.STEREOTYPE_PRESENTATION_KIND,
- appliedStereotypePresentationKind);
- replaceEntry(oldAnnotation, VisualInformationPapyrusConstant.PROPERTY_STEREOTYPE_DISPLAY,
- AppliedStereotypeHelper.getAppliedStereotypesPropertiesToDisplay(getObject()));
- replaceEntry(oldAnnotation, VisualInformationPapyrusConstant.STEREOTYPE_PROPERTY_LOCATION,
- AppliedStereotypeHelper.getAppliedStereotypesPropertiesLocalization(getObject()));
-
- replaceEannotation(getObject().getEAnnotation(VisualInformationPapyrusConstant.STEREOTYPE_ANNOTATION),
- getObject());
-
- }
-}
diff --git a/sandbox/org.eclipse.papyrus.uml.tools.utils_css/src/org/eclipse/papyrus/uml/tools/utils/ui/command/RemoveEAnnotationCommand.java b/sandbox/org.eclipse.papyrus.uml.tools.utils_css/src/org/eclipse/papyrus/uml/tools/utils/ui/command/RemoveEAnnotationCommand.java
deleted file mode 100644
index 498b032b21c..00000000000
--- a/sandbox/org.eclipse.papyrus.uml.tools.utils_css/src/org/eclipse/papyrus/uml/tools/utils/ui/command/RemoveEAnnotationCommand.java
+++ /dev/null
@@ -1,77 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2008 CEA LIST.
- *
- *
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Remi Schnekenburger (CEA LIST) - Initial API and implementation
- *
- *****************************************************************************/
-package org.eclipse.papyrus.uml.tools.utils.ui.command;
-
-import org.eclipse.emf.ecore.EAnnotation;
-import org.eclipse.emf.ecore.EModelElement;
-import org.eclipse.emf.transaction.RecordingCommand;
-import org.eclipse.emf.transaction.TransactionalEditingDomain;
-
-/**
- * This {@link RecordingCommand} removes an eannotation to a given element.
- */
-public class RemoveEAnnotationCommand extends org.eclipse.emf.transaction.RecordingCommand {
-
- // @unused
- public EModelElement getObject() {
- return object;
- }
-
- // @unused
- public void setObject(EModelElement object) {
- this.object = object;
- }
-
- // @unused
- public String getEAnnotationName() {
- return eAnnotationName;
- }
-
- // @unused
- public void setEAnnotationName(String annotationName) {
- eAnnotationName = annotationName;
- }
-
- /** The object. */
- private EModelElement object;
-
- /** The e annotation name. */
- private String eAnnotationName;
-
- /**
- * Instantiates a new creates the e annotation command.
- *
- * @param domain
- * the domain
- * @param object
- * the object
- * @param eannotationName
- * the eannotation name
- */
- public RemoveEAnnotationCommand(TransactionalEditingDomain domain, EModelElement object, String eannotationName) {
- super(domain);
- this.object = object;
- this.eAnnotationName = eannotationName;
- }
-
- /**
- * {@inheritDoc}
- */
- @Override
- protected void doExecute() {
- EAnnotation annotation = object.getEAnnotation(eAnnotationName);
- object.getEAnnotations().remove(annotation);
- }
-
-}
diff --git a/sandbox/org.eclipse.papyrus.uml.tools.utils_css/src/org/eclipse/papyrus/uml/tools/utils/ui/command/SetAppliedStereotypePropertiesLocalizationCommand.java b/sandbox/org.eclipse.papyrus.uml.tools.utils_css/src/org/eclipse/papyrus/uml/tools/utils/ui/command/SetAppliedStereotypePropertiesLocalizationCommand.java
deleted file mode 100644
index 6ca0fcd2fe1..00000000000
--- a/sandbox/org.eclipse.papyrus.uml.tools.utils_css/src/org/eclipse/papyrus/uml/tools/utils/ui/command/SetAppliedStereotypePropertiesLocalizationCommand.java
+++ /dev/null
@@ -1,74 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2008 CEA LIST.
- *
- *
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Patrick Tessier (CEA LIST) Patrick.tessier@cea.fr - Initial API and implementation
- *
- *****************************************************************************/
-package org.eclipse.papyrus.uml.tools.utils.ui.command;
-
-import org.eclipse.emf.ecore.EAnnotation;
-import org.eclipse.emf.ecore.EModelElement;
-import org.eclipse.emf.transaction.TransactionalEditingDomain;
-import org.eclipse.papyrus.uml.tools.utils.ui.VisualInformationPapyrusConstant;
-import org.eclipse.papyrus.uml.tools.utils.ui.helper.AppliedStereotypeHelper;
-
-/**
- * The Class SetAppliedStereotypeToDisplayCommand used to set the list of applied stereotype to
- * display
- */
-public class SetAppliedStereotypePropertiesLocalizationCommand extends CreateEAnnotationCommand {
-
- /**
- * the presnetation kind of applied stereotypes
- */
- private String appliedStereotypePropertiesKind;
-
- /**
- * Instantiates a new sets the applied stereotype to display command.
- *
- * @param domain
- * the domain
- * @param object
- * the object
- * @param stereotypeList
- * the stereotype list
- */
- public SetAppliedStereotypePropertiesLocalizationCommand(TransactionalEditingDomain domain, EModelElement object,
- String appliedStereotypePropertiesKind) {
- super(domain, object, VisualInformationPapyrusConstant.STEREOTYPE_ANNOTATION);
- this.appliedStereotypePropertiesKind = appliedStereotypePropertiesKind;
- }
-
- /**
- * {@inheritDoc}
- */
- @Override
- protected void doExecute() {
- EAnnotation oldAnnotation = getObject().getEAnnotation(VisualInformationPapyrusConstant.STEREOTYPE_ANNOTATION);
- if(oldAnnotation == null) {
- oldAnnotation = createEAnnotation();
- attachEannotation(oldAnnotation, getObject());
- }
- replaceEntry(oldAnnotation, VisualInformationPapyrusConstant.STEREOTYPE_WITHQN_LIST, AppliedStereotypeHelper
- .getStereotypesQNToDisplay(getObject()));
- replaceEntry(oldAnnotation, VisualInformationPapyrusConstant.STEREOTYPE_LIST, AppliedStereotypeHelper
- .getStereotypesToDisplay(getObject()));
- replaceEntry(oldAnnotation, VisualInformationPapyrusConstant.STEREOTYPE_PRESENTATION_KIND,
- AppliedStereotypeHelper.getAppliedStereotypePresentationKind(getObject()));
- replaceEntry(oldAnnotation, VisualInformationPapyrusConstant.PROPERTY_STEREOTYPE_DISPLAY,
- AppliedStereotypeHelper.getAppliedStereotypesPropertiesToDisplay(getObject()));
- replaceEntry(oldAnnotation, VisualInformationPapyrusConstant.STEREOTYPE_PROPERTY_LOCATION,
- appliedStereotypePropertiesKind);
- replaceEannotation(getObject().getEAnnotation(VisualInformationPapyrusConstant.STEREOTYPE_ANNOTATION),
- getObject());
-
- }
-
-}
diff --git a/sandbox/org.eclipse.papyrus.uml.tools.utils_css/src/org/eclipse/papyrus/uml/tools/utils/ui/command/SetAppliedStereotypeToDisplayCommand.java b/sandbox/org.eclipse.papyrus.uml.tools.utils_css/src/org/eclipse/papyrus/uml/tools/utils/ui/command/SetAppliedStereotypeToDisplayCommand.java
deleted file mode 100644
index 11680a76354..00000000000
--- a/sandbox/org.eclipse.papyrus.uml.tools.utils_css/src/org/eclipse/papyrus/uml/tools/utils/ui/command/SetAppliedStereotypeToDisplayCommand.java
+++ /dev/null
@@ -1,78 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2008 CEA LIST.
- *
- *
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Patrick Tessier (CEA LIST) Patrick.tessier@cea.fr - Initial API and implementation
- *
- *****************************************************************************/
-package org.eclipse.papyrus.uml.tools.utils.ui.command;
-
-import org.eclipse.emf.ecore.EAnnotation;
-import org.eclipse.emf.ecore.EModelElement;
-import org.eclipse.emf.transaction.TransactionalEditingDomain;
-import org.eclipse.papyrus.uml.tools.utils.ui.VisualInformationPapyrusConstant;
-import org.eclipse.papyrus.uml.tools.utils.ui.helper.AppliedStereotypeHelper;
-
-/**
- * The Class SetAppliedStereotypeToDisplayCommand used to set the list of applied stereotype to
- * display
- */
-public class SetAppliedStereotypeToDisplayCommand extends CreateEAnnotationCommand {
-
- /** The qualified namedepht. */
- private String stereotypeList;
-
- /**
- * the presnetation kind of applied stereotypes
- */
- private String appliedStereotypePresentationKind;
-
- /**
- * Instantiates a new sets the applied stereotype to display command.
- *
- * @param domain
- * the domain
- * @param object
- * the object
- * @param stereotypeList
- * the stereotype list
- */
- public SetAppliedStereotypeToDisplayCommand(TransactionalEditingDomain domain, EModelElement object,
- String stereotypeList, String appliedStereotypepresentationKind) {
- super(domain, object, VisualInformationPapyrusConstant.STEREOTYPE_ANNOTATION);
- this.stereotypeList = stereotypeList;
- this.appliedStereotypePresentationKind = appliedStereotypepresentationKind;
- }
-
- /**
- * {@inheritDoc}
- */
- @Override
- protected void doExecute() {
- EAnnotation oldAnnotation = getObject().getEAnnotation(VisualInformationPapyrusConstant.STEREOTYPE_ANNOTATION);
- if(oldAnnotation == null) {
- oldAnnotation = createEAnnotation();
- attachEannotation(oldAnnotation, getObject());
- }
- replaceEntry(oldAnnotation, VisualInformationPapyrusConstant.STEREOTYPE_WITHQN_LIST, AppliedStereotypeHelper
- .getStereotypesQNToDisplay(getObject()));
- replaceEntry(oldAnnotation, VisualInformationPapyrusConstant.STEREOTYPE_LIST, stereotypeList);
- replaceEntry(oldAnnotation, VisualInformationPapyrusConstant.STEREOTYPE_PRESENTATION_KIND,
- appliedStereotypePresentationKind);
- replaceEntry(oldAnnotation, VisualInformationPapyrusConstant.PROPERTY_STEREOTYPE_DISPLAY,
- AppliedStereotypeHelper.getAppliedStereotypesPropertiesToDisplay(getObject()));
- replaceEntry(oldAnnotation, VisualInformationPapyrusConstant.STEREOTYPE_PROPERTY_LOCATION,
- AppliedStereotypeHelper.getAppliedStereotypesPropertiesLocalization(getObject()));
-
- replaceEannotation(getObject().getEAnnotation(VisualInformationPapyrusConstant.STEREOTYPE_ANNOTATION),
- getObject());
-
- }
-
-}
diff --git a/sandbox/org.eclipse.papyrus.uml.tools.utils_css/src/org/eclipse/papyrus/uml/tools/utils/ui/command/SetGradienColorCommand.java b/sandbox/org.eclipse.papyrus.uml.tools.utils_css/src/org/eclipse/papyrus/uml/tools/utils/ui/command/SetGradienColorCommand.java
deleted file mode 100644
index d6fe01a9831..00000000000
--- a/sandbox/org.eclipse.papyrus.uml.tools.utils_css/src/org/eclipse/papyrus/uml/tools/utils/ui/command/SetGradienColorCommand.java
+++ /dev/null
@@ -1,59 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2008 CEA LIST.
- *
- *
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Patrick Tessier (CEA LIST) Patrick.tessier@cea.fr - Initial API and implementation
- *
- *****************************************************************************/
-package org.eclipse.papyrus.uml.tools.utils.ui.command;
-
-import org.eclipse.emf.ecore.EAnnotation;
-import org.eclipse.emf.ecore.EModelElement;
-import org.eclipse.emf.transaction.TransactionalEditingDomain;
-import org.eclipse.papyrus.uml.tools.utils.ui.VisualInformationPapyrusConstant;
-
-// TODO: Auto-generated Javadoc
-/**
- * The Class SetQualifiedNameDepthCommand.
- *
- * @deprecated
- */
-@Deprecated
-public class SetGradienColorCommand extends CreateEAnnotationCommand {
-
- /** The qualified namedepht. */
- private final String gradientColor;
-
- /**
- * Instantiates a new sets the qualified name depth command.
- *
- * @param domain
- * the domain
- * @param object
- * the object
- * @param depht
- * the depht
- */
- // @unused
- public SetGradienColorCommand(TransactionalEditingDomain domain, EModelElement object, boolean gradient) {
- super(domain, object, VisualInformationPapyrusConstant.GRADIENT);
- this.gradientColor = "" + gradient;
- }
-
- /**
- * {@inheritDoc}
- */
- @Override
- protected void doExecute() {
- EAnnotation qualifiedNameEAnnotation = createEAnnotation();
- replaceEannotation(qualifiedNameEAnnotation, getObject());
- replaceEntry(qualifiedNameEAnnotation, VisualInformationPapyrusConstant.GRADIENT_VALUE, gradientColor);
- }
-
-}
diff --git a/sandbox/org.eclipse.papyrus.uml.tools.utils_css/src/org/eclipse/papyrus/uml/tools/utils/ui/command/SetNameLabelIconCommand.java b/sandbox/org.eclipse.papyrus.uml.tools.utils_css/src/org/eclipse/papyrus/uml/tools/utils/ui/command/SetNameLabelIconCommand.java
deleted file mode 100644
index 53446640475..00000000000
--- a/sandbox/org.eclipse.papyrus.uml.tools.utils_css/src/org/eclipse/papyrus/uml/tools/utils/ui/command/SetNameLabelIconCommand.java
+++ /dev/null
@@ -1,55 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2008 CEA LIST.
- *
- *
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Patrick Tessier (CEA LIST) Patrick.tessier@cea.fr - Initial API and implementation
- *
- *****************************************************************************/
-package org.eclipse.papyrus.uml.tools.utils.ui.command;
-
-import org.eclipse.emf.ecore.EAnnotation;
-import org.eclipse.emf.ecore.EModelElement;
-import org.eclipse.emf.transaction.TransactionalEditingDomain;
-import org.eclipse.papyrus.uml.tools.utils.ui.VisualInformationPapyrusConstant;
-
-// TODO: Auto-generated Javadoc
-/**
- * The Class SetQualifiedNameDepthCommand.
- */
-public class SetNameLabelIconCommand extends CreateEAnnotationCommand {
-
- /** The shadowFigure. */
- private String displayIcon;
-
- /**
- * Instantiates a new sets the qualified name depth command.
- *
- * @param domain
- * the domain
- * @param object
- * the object
- * @param shadow
- * the shadow
- */
- public SetNameLabelIconCommand(TransactionalEditingDomain domain, EModelElement object, boolean displayIcon) {
- super(domain, object, VisualInformationPapyrusConstant.DISPLAY_NAMELABELICON);
- this.displayIcon = "" + displayIcon;
- }
-
- /**
- * {@inheritDoc}
- */
- @Override
- protected void doExecute() {
- EAnnotation shadowFigureEAnnotation = createEAnnotation();
- replaceEannotation(shadowFigureEAnnotation, getObject());
- replaceEntry(shadowFigureEAnnotation, VisualInformationPapyrusConstant.DISPLAY_NAMELABELICON_VALUE, displayIcon);
- }
-
-}
diff --git a/sandbox/org.eclipse.papyrus.uml.tools.utils_css/src/org/eclipse/papyrus/uml/tools/utils/ui/command/SetQualifiedNameDepthCommand.java b/sandbox/org.eclipse.papyrus.uml.tools.utils_css/src/org/eclipse/papyrus/uml/tools/utils/ui/command/SetQualifiedNameDepthCommand.java
deleted file mode 100644
index 3ba2f1be00e..00000000000
--- a/sandbox/org.eclipse.papyrus.uml.tools.utils_css/src/org/eclipse/papyrus/uml/tools/utils/ui/command/SetQualifiedNameDepthCommand.java
+++ /dev/null
@@ -1,56 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2008 CEA LIST.
- *
- *
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Patrick Tessier (CEA LIST) Patrick.tessier@cea.fr - Initial API and implementation
- *
- *****************************************************************************/
-package org.eclipse.papyrus.uml.tools.utils.ui.command;
-
-import org.eclipse.emf.ecore.EAnnotation;
-import org.eclipse.emf.ecore.EModelElement;
-import org.eclipse.emf.transaction.TransactionalEditingDomain;
-import org.eclipse.papyrus.uml.tools.utils.ui.VisualInformationPapyrusConstant;
-
-// TODO: Auto-generated Javadoc
-/**
- * The Class SetQualifiedNameDepthCommand.
- */
-public class SetQualifiedNameDepthCommand extends CreateEAnnotationCommand {
-
- /** The qualified namedepht. */
- private String qualifiedNamedepht;
-
- /**
- * Instantiates a new sets the qualified name depth command.
- *
- * @param domain
- * the domain
- * @param object
- * the object
- * @param depht
- * the depht
- */
- public SetQualifiedNameDepthCommand(TransactionalEditingDomain domain, EModelElement object, int depht) {
- super(domain, object, VisualInformationPapyrusConstant.QUALIFIED_NAME);
- this.qualifiedNamedepht = "" + depht;
- }
-
- /**
- * {@inheritDoc}
- */
- @Override
- protected void doExecute() {
- EAnnotation qualifiedNameEAnnotation = createEAnnotation();
- replaceEannotation(qualifiedNameEAnnotation, getObject());
- replaceEntry(qualifiedNameEAnnotation, VisualInformationPapyrusConstant.QUALIFIED_NAME_DEPTH,
- qualifiedNamedepht);
- }
-
-}
diff --git a/sandbox/org.eclipse.papyrus.uml.tools.utils_css/src/org/eclipse/papyrus/uml/tools/utils/ui/command/SetShadowFigureCommand.java b/sandbox/org.eclipse.papyrus.uml.tools.utils_css/src/org/eclipse/papyrus/uml/tools/utils/ui/command/SetShadowFigureCommand.java
deleted file mode 100644
index 494d146ed11..00000000000
--- a/sandbox/org.eclipse.papyrus.uml.tools.utils_css/src/org/eclipse/papyrus/uml/tools/utils/ui/command/SetShadowFigureCommand.java
+++ /dev/null
@@ -1,55 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2008 CEA LIST.
- *
- *
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Patrick Tessier (CEA LIST) Patrick.tessier@cea.fr - Initial API and implementation
- *
- *****************************************************************************/
-package org.eclipse.papyrus.uml.tools.utils.ui.command;
-
-import org.eclipse.emf.ecore.EAnnotation;
-import org.eclipse.emf.ecore.EModelElement;
-import org.eclipse.emf.transaction.TransactionalEditingDomain;
-import org.eclipse.papyrus.uml.tools.utils.ui.VisualInformationPapyrusConstant;
-
-// TODO: Auto-generated Javadoc
-/**
- * The Class SetQualifiedNameDepthCommand.
- */
-public class SetShadowFigureCommand extends CreateEAnnotationCommand {
-
- /** The shadowFigure. */
- private String shadowFigure;
-
- /**
- * Instantiates a new sets the qualified name depth command.
- *
- * @param domain
- * the domain
- * @param object
- * the object
- * @param shadow
- * the shadow
- */
- public SetShadowFigureCommand(TransactionalEditingDomain domain, EModelElement object, boolean shadow) {
- super(domain, object, VisualInformationPapyrusConstant.SHADOWFIGURE);
- this.shadowFigure = "" + shadow;
- }
-
- /**
- * {@inheritDoc}
- */
- @Override
- protected void doExecute() {
- EAnnotation shadowFigureEAnnotation = createEAnnotation();
- replaceEannotation(shadowFigureEAnnotation, getObject());
- replaceEntry(shadowFigureEAnnotation, VisualInformationPapyrusConstant.SHADOWFIGURE_VALUE, shadowFigure);
- }
-
-}
diff --git a/sandbox/org.eclipse.papyrus.uml.tools.utils_css/src/org/eclipse/papyrus/uml/tools/utils/ui/helper/AppliedStereotypeHelper.java b/sandbox/org.eclipse.papyrus.uml.tools.utils_css/src/org/eclipse/papyrus/uml/tools/utils/ui/helper/AppliedStereotypeHelper.java
deleted file mode 100644
index 39c92d24665..00000000000
--- a/sandbox/org.eclipse.papyrus.uml.tools.utils_css/src/org/eclipse/papyrus/uml/tools/utils/ui/helper/AppliedStereotypeHelper.java
+++ /dev/null
@@ -1,341 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2008 CEA LIST.
- *
- *
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Chokri Mraidha (CEA LIST) Chokri.Mraidha@cea.fr - Initial API and implementation
- * Patrick Tessier (CEA LIST) Patrick.Tessier@cea.fr - modification
- *
- *****************************************************************************/
-package org.eclipse.papyrus.uml.tools.utils.ui.helper;
-
-import java.util.StringTokenizer;
-
-import org.eclipse.emf.common.util.EMap;
-import org.eclipse.emf.ecore.EAnnotation;
-import org.eclipse.emf.ecore.EModelElement;
-import org.eclipse.emf.transaction.RecordingCommand;
-import org.eclipse.emf.transaction.TransactionalEditingDomain;
-import org.eclipse.papyrus.prototype.infra.gmfdiag.css.custom.UMLCustomStyle;
-import org.eclipse.papyrus.uml.tools.utils.ui.VisualInformationPapyrusConstant;
-import org.eclipse.papyrus.uml.tools.utils.ui.command.AddAppliedQNStereotypeToDisplayCommand;
-import org.eclipse.papyrus.uml.tools.utils.ui.command.AddAppliedStereotypePropertiesToDisplayCommand;
-import org.eclipse.papyrus.uml.tools.utils.ui.command.AddAppliedStereotypeToDisplayCommand;
-import org.eclipse.papyrus.uml.tools.utils.ui.command.RemoveAppliedStereotypePropertiesToDisplayCommand;
-import org.eclipse.papyrus.uml.tools.utils.ui.command.RemoveAppliedStereotypeToDisplayCommand;
-import org.eclipse.papyrus.uml.tools.utils.ui.command.SetAppliedStereotypePropertiesLocalizationCommand;
-import org.eclipse.papyrus.uml.tools.utils.ui.command.SetAppliedStereotypeToDisplayCommand;
-import org.eclipse.uml2.uml.Element;
-import org.eclipse.uml2.uml.Stereotype;
-
-/**
- * The Class AppliedStereotypeHelper.
- */
-public class AppliedStereotypeHelper {
-
- /**
- * get the list of stereotype to display from the eannotation.
- *
- * @param view
- * the view
- *
- * @return the list of stereotypes to display separated by a comma. the applied stereotype to
- * display is represented by the qualified name of the stereotype
- */
- public static String getStereotypesToDisplay(EModelElement view) {
- EAnnotation stereotypeDisplayKind = view.getEAnnotation(VisualInformationPapyrusConstant.STEREOTYPE_ANNOTATION);
- if(stereotypeDisplayKind != null) {
- EMap<String, String> entries = stereotypeDisplayKind.getDetails();
-
- String stereotypesToDisplay = entries.get(VisualInformationPapyrusConstant.STEREOTYPE_LIST);
- if(stereotypesToDisplay != null) {
- return stereotypesToDisplay;
- }
- }
- return "";
- }
-
- /**
- * Gets the applied stereotypes properties to display.
- *
- * @param view
- * the view the view that displays the stereotyped element
- *
- * @return the applied stereotypes properties to display
- */
- public static String getAppliedStereotypesPropertiesToDisplay(EModelElement view) {
- EAnnotation stereotypeDisplayKind = view.getEAnnotation(VisualInformationPapyrusConstant.STEREOTYPE_ANNOTATION);
- if(stereotypeDisplayKind != null) {
- EMap<String, String> entries = stereotypeDisplayKind.getDetails();
-
- String stereotypesToDisplay = entries.get(VisualInformationPapyrusConstant.PROPERTY_STEREOTYPE_DISPLAY);
- if(stereotypesToDisplay != null) {
- return stereotypesToDisplay;
- }
- }
- return "";
- }
-
- /**
- * checks if the applied stereotypes properties have to be displayed.
- *
- * @param view
- * the view the view that displays the stereotyped element
- * @param location
- * the location where the properties have to be displayed.
- *
- * @return <code>true</code> if the applied stereotypes properties have to display, <code>false</code> in other case
- */
- public static boolean hasAppliedStereotypesPropertiesToDisplay(EModelElement view, String location) {
- EAnnotation stereotypeDisplayKind = view.getEAnnotation(VisualInformationPapyrusConstant.STEREOTYPE_ANNOTATION);
- if(stereotypeDisplayKind != null) {
- EMap<String, String> entries = stereotypeDisplayKind.getDetails();
-
- String placeToDisplay = entries.get(VisualInformationPapyrusConstant.STEREOTYPE_PROPERTY_LOCATION);
- if(placeToDisplay != null && placeToDisplay.equals(location)) {
- return true;
- }
- }
- return false;
- }
-
- /**
- * Gets the applied stereotypes properties localization.
- *
- * @param view
- * the view
- *
- * @return the applied stereotypes properties localization
- */
- public static String getAppliedStereotypesPropertiesLocalization(EModelElement view) {
- EAnnotation stereotypeDisplayKind = view.getEAnnotation(VisualInformationPapyrusConstant.STEREOTYPE_ANNOTATION);
- if(stereotypeDisplayKind != null) {
- EMap<String, String> entries = stereotypeDisplayKind.getDetails();
-
- String displayLocalization = entries.get(VisualInformationPapyrusConstant.STEREOTYPE_PROPERTY_LOCATION);
- if(displayLocalization != null && !displayLocalization.equals(VisualInformationPapyrusConstant.STEREOTYPE_COMPARTMENT_LOCATION)) {
- return displayLocalization;
- }
- }
-
- //CSS Value (TODO : Remove this dependency ; add an extension point)
-
- if(view instanceof UMLCustomStyle) {
- UMLCustomStyle cssElement = (UMLCustomStyle)view;
- return cssElement.getCSSDisplayPlace();
- }
-
- return VisualInformationPapyrusConstant.STEREOTYPE_COMPARTMENT_LOCATION;
- }
-
- /**
- * get lhe list of stereotype to display with the qulifiedName.
- *
- * @param view
- * the view of the uml element
- *
- * @return the list of applied stereotype to display withe their qualified name
- */
- public static String getStereotypesQNToDisplay(EModelElement view) {
- EAnnotation stereotypeDisplayKind = view.getEAnnotation(VisualInformationPapyrusConstant.STEREOTYPE_ANNOTATION);
- if(stereotypeDisplayKind != null) {
- EMap<String, String> entries = stereotypeDisplayKind.getDetails();
-
- String stereotypesToDisplay = entries.get(VisualInformationPapyrusConstant.STEREOTYPE_WITHQN_LIST);
- if(stereotypesToDisplay != null) {
- return stereotypesToDisplay;
- }
- }
- return "";
- }
-
- /**
- * return the kind of display of applied stereotype.
- *
- * @param view
- * that contains the eannotation about the display
- *
- * @return VisualInformationPapyrusConstant.TEXT_ICON_STEREOTYPE_PRESENTATION,
- * VisualInformationPapyrusConstant.ICON_STEREOTYPE_PRESENTATION,
- * VisualInformationPapyrusConstant.IMAGE_STEREOTYPE_PRESENTATION,
- * VisualInformationPapyrusConstant.STEREOTYPE_TEXT_HORIZONTAL_PRESENTATION,
- * VisualInformationPapyrusConstant.STEREOTYPE_TEXT_VERTICAL_PRESENTATION
- */
- public static String getAppliedStereotypePresentationKind(EModelElement view) {
- EAnnotation stereotypeDisplayKind = view.getEAnnotation(VisualInformationPapyrusConstant.STEREOTYPE_ANNOTATION);
- if(stereotypeDisplayKind != null) {
- EMap<String, String> entries = stereotypeDisplayKind.getDetails();
- String stereotypespresentationKind = entries.get(VisualInformationPapyrusConstant.STEREOTYPE_PRESENTATION_KIND);
- if(stereotypespresentationKind != null) {
- if(!(stereotypespresentationKind.equals(VisualInformationPapyrusConstant.STEREOTYPE_TEXT_HORIZONTAL_PRESENTATION) || stereotypespresentationKind.equals(VisualInformationPapyrusConstant.STEREOTYPE_TEXT_VERTICAL_PRESENTATION))) {
- return stereotypespresentationKind;
- }
- }
- }
-
- //CSS Value (TODO : Remove this dependency ; add an extension point)
-
- if(view instanceof UMLCustomStyle) {
- UMLCustomStyle cssElement = (UMLCustomStyle)view;
- String display = cssElement.getCSSStereotypeDisplay();
-
- if(display != null) {
- if(display.equals("Text")) {
- String alignment = cssElement.getCSSTextAlignment();
- if(alignment.equals("Vertical")) {
- return VisualInformationPapyrusConstant.STEREOTYPE_TEXT_VERTICAL_PRESENTATION;
- }
- return VisualInformationPapyrusConstant.STEREOTYPE_TEXT_HORIZONTAL_PRESENTATION;
- } else if("Text and Icon".equals(display)) {
- return VisualInformationPapyrusConstant.TEXT_ICON_STEREOTYPE_PRESENTATION;
- } else if("Icon".equals(display)) {
- return VisualInformationPapyrusConstant.ICON_STEREOTYPE_PRESENTATION;
- } else if("Shape".equals(display)) {
- return VisualInformationPapyrusConstant.IMAGE_STEREOTYPE_PRESENTATION;
- }
- }
- }
-
- return VisualInformationPapyrusConstant.STEREOTYPE_TEXT_HORIZONTAL_PRESENTATION;
- }
-
- /**
- * Gets the applied.
- *
- * @param domain
- * the domain
- * @param view
- * the view
- * @param appliedStereotypeList
- * the applied stereotype list
- * @param presentationKind
- * see {@link VisualInformationPapyrusConstant} for the kind of presentation
- *
- * @return the applied
- */
- public static RecordingCommand getAppliedStereotypeToDisplayCommand(TransactionalEditingDomain domain, EModelElement view, String appliedStereotypeList, String presentationKind) {
- return new SetAppliedStereotypeToDisplayCommand(domain, view, appliedStereotypeList, presentationKind);
- }
-
- /**
- * add new applied stereotypes to display withe the qualified name.
- *
- * @param domain
- * the transactionnal edit domain
- * @param view
- * the emodel element that is the display of the uml element
- * @param appliedStereotypeList
- * the list of stereotype with qualified name to display
- *
- * @return the command to display it
- */
- public static RecordingCommand getAddAppliedStereotypeToDisplayWithQNCommand(TransactionalEditingDomain domain, EModelElement view, String appliedStereotypeList) {
- return new AddAppliedQNStereotypeToDisplayCommand(domain, view, appliedStereotypeList);
- }
-
- /**
- * Gets the adds the applied stereotype command.
- *
- * @param domain
- * the domain
- * @param view
- * the view
- * @param appliedStereotypeListToAdd
- * the applied stereotype list to add
- * @param presentationKind
- * the presentation kind
- *
- * @return the adds the applied stereotype command
- */
- public static RecordingCommand getAddAppliedStereotypeCommand(TransactionalEditingDomain domain, EModelElement view, String appliedStereotypeListToAdd, String presentationKind) {
- return new AddAppliedStereotypeToDisplayCommand(domain, view, appliedStereotypeListToAdd, presentationKind);
- }
-
- /**
- * Gets the adds the applied stereotype propertiescommand.
- *
- * @param domain
- * the domain
- * @param view
- * the view
- * @param appliedStereotypeListToAdd
- * the applied stereotype properties list to add
- *
- * @return the adds the applied stereotype command
- */
- public static RecordingCommand getAddAppliedStereotypePropertiesCommand(TransactionalEditingDomain domain, EModelElement view, String appliedStereotypeListToAdd) {
- return new AddAppliedStereotypePropertiesToDisplayCommand(domain, view, appliedStereotypeListToAdd);
- }
-
- /**
- * Gets the removes the applied stereotype command.
- *
- * @param domain
- * the domain
- * @param view
- * the view
- * @param appliedStereotypeListToRemove
- * the applied stereotype list to remove
- * @param presentationKind
- * the presentation kind
- *
- * @return the removes the applied stereotype command
- */
- public static RecordingCommand getRemoveAppliedStereotypeCommand(TransactionalEditingDomain domain, EModelElement view, String appliedStereotypeListToRemove, String presentationKind) {
- return new RemoveAppliedStereotypeToDisplayCommand(domain, view, appliedStereotypeListToRemove, presentationKind);
- }
-
- /**
- * Gets the remove applied stereotype properties command.
- *
- * @param domain
- * the domain
- * @param view
- * the view
- * @param appliedStereotypeListToRemove
- * the applied stereotype list to remove
- *
- * @return the removes the applied stereotype properties command
- */
- public static RecordingCommand getRemoveAppliedStereotypePropertiesCommand(TransactionalEditingDomain domain, EModelElement view, String appliedStereotypeListToRemove) {
- return new RemoveAppliedStereotypePropertiesToDisplayCommand(domain, view, appliedStereotypeListToRemove);
- }
-
- /**
- * Gets the sets the applied stereotype properties localization command.
- *
- * @param domain
- * the domain
- * @param view
- * the view
- * @param appliedStereotypePropertiesLocation
- * the applied stereotype properties location
- *
- * @return the sets the applied stereotype properties localization command
- */
- public static RecordingCommand getSetAppliedStereotypePropertiesLocalizationCommand(TransactionalEditingDomain domain, EModelElement view, String appliedStereotypePropertiesLocation) {
- return new SetAppliedStereotypePropertiesLocalizationCommand(domain, view, appliedStereotypePropertiesLocation);
- }
-
- /**
- *
- * @param model
- * @param element
- * @return
- */
- public static Stereotype getFirstDisplayedStereotype(EModelElement model, Element element) {
- String stereotypesToDisplay = AppliedStereotypeHelper.getStereotypesToDisplay(model);
- StringTokenizer tokenizer = new StringTokenizer(stereotypesToDisplay, ",");
- if(tokenizer.hasMoreTokens()) {
- String firstStereotypeName = tokenizer.nextToken();
- Stereotype stereotype = element.getAppliedStereotype(firstStereotypeName);
- return stereotype;
- }
- return null;
- }
-}
diff --git a/sandbox/org.eclipse.papyrus.uml.tools.utils_css/src/org/eclipse/papyrus/uml/tools/utils/ui/helper/NameLabelIconHelper.java b/sandbox/org.eclipse.papyrus.uml.tools.utils_css/src/org/eclipse/papyrus/uml/tools/utils/ui/helper/NameLabelIconHelper.java
deleted file mode 100644
index aab6eac1d2a..00000000000
--- a/sandbox/org.eclipse.papyrus.uml.tools.utils_css/src/org/eclipse/papyrus/uml/tools/utils/ui/helper/NameLabelIconHelper.java
+++ /dev/null
@@ -1,87 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2008 CEA LIST.
- *
- *
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Patrick Tessier (CEA LIST) Patrick.tessier@cea.fr - Initial API and implementation
- *
- *****************************************************************************/
-package org.eclipse.papyrus.uml.tools.utils.ui.helper;
-
-import org.eclipse.emf.common.util.EMap;
-import org.eclipse.emf.ecore.EAnnotation;
-import org.eclipse.emf.ecore.EModelElement;
-import org.eclipse.emf.transaction.RecordingCommand;
-import org.eclipse.emf.transaction.TransactionalEditingDomain;
-import org.eclipse.papyrus.prototype.infra.gmfdiag.css.custom.UMLCustomStyle;
-import org.eclipse.papyrus.uml.tools.utils.ui.VisualInformationPapyrusConstant;
-import org.eclipse.papyrus.uml.tools.utils.ui.command.SetNameLabelIconCommand;
-
-public class NameLabelIconHelper {
-
- /**
- * get the display name label icon indication true or false
- *
- * @param modelElement
- * the view where is attach the element
- * @deprecated use showLabelIcon(EModelElement) instead
- */
- @Deprecated
- public static boolean getNameLabelIconValue(EModelElement modelElement) {
- return showLabelIcon(modelElement);
- }
-
- /**
- * get the display name label icon indication true or false
- *
- * @param modelElement
- * the view where is attach the element
- */
- public static boolean showLabelIcon(EModelElement modelElement) {
- EAnnotation stereotypeDisplayKind = modelElement.getEAnnotation(VisualInformationPapyrusConstant.DISPLAY_NAMELABELICON);
- if(stereotypeDisplayKind != null) {
- EMap<String, String> entries = stereotypeDisplayKind.getDetails();
- if(entries != null) {
- String gradientvalueString = entries.get(VisualInformationPapyrusConstant.DISPLAY_NAMELABELICON_VALUE);
- if(gradientvalueString != null) {
- Boolean display = new Boolean(gradientvalueString);
- if(display) {
- return true;
- }
- }
- }
- }
-
- //CSS Value (TODO : Remove this dependency ; add an extension point)
-
- if(modelElement instanceof UMLCustomStyle) {
- UMLCustomStyle cssElement = (UMLCustomStyle)modelElement;
- return cssElement.getCSSElementIcon();
- }
-
- return false;
- }
-
- /**
- * Gets the command to set the gradient to true are false.
- *
- * @param domain
- * the domain
- * @param view
- * the view
- * @param nameLabelIconValue
- * true to display the icon of the element in labelName
- *
- * @return the command to set the gradient to true are false.
- */
- // @unused
- public static RecordingCommand getNameLabelIconCommand(TransactionalEditingDomain domain, EModelElement view, boolean nameLabelIconValue) {
- return new SetNameLabelIconCommand(domain, view, nameLabelIconValue);
- }
-
-}
diff --git a/sandbox/org.eclipse.papyrus.uml.tools.utils_css/src/org/eclipse/papyrus/uml/tools/utils/ui/helper/QualifiedNameHelper.java b/sandbox/org.eclipse.papyrus.uml.tools.utils_css/src/org/eclipse/papyrus/uml/tools/utils/ui/helper/QualifiedNameHelper.java
deleted file mode 100644
index bc7f9d72578..00000000000
--- a/sandbox/org.eclipse.papyrus.uml.tools.utils_css/src/org/eclipse/papyrus/uml/tools/utils/ui/helper/QualifiedNameHelper.java
+++ /dev/null
@@ -1,77 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2008 CEA LIST.
- *
- *
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Patrick Tessier (CEA LIST) Patrick.tessier@cea.fr - Initial API and implementation
- *
- *****************************************************************************/
-package org.eclipse.papyrus.uml.tools.utils.ui.helper;
-
-import org.eclipse.emf.common.util.EMap;
-import org.eclipse.emf.ecore.EAnnotation;
-import org.eclipse.emf.ecore.EModelElement;
-import org.eclipse.emf.transaction.RecordingCommand;
-import org.eclipse.emf.transaction.TransactionalEditingDomain;
-import org.eclipse.papyrus.prototype.infra.gmfdiag.css.custom.UMLCustomStyle;
-import org.eclipse.papyrus.uml.tools.utils.ui.VisualInformationPapyrusConstant;
-import org.eclipse.papyrus.uml.tools.utils.ui.command.SetQualifiedNameDepthCommand;
-
-public class QualifiedNameHelper {
-
- /**
- * get the depth to display for the qualified name from a eannotation in the view
- *
- * @param modelElement
- * the view where is attach the element
- * @return the depth
- */
- public static int getQualifiedNameDepth(EModelElement modelElement) {
- EAnnotation stereotypeDisplayKind = modelElement.getEAnnotation(VisualInformationPapyrusConstant.QUALIFIED_NAME);
- if(stereotypeDisplayKind != null) {
- EMap<String, String> entries = stereotypeDisplayKind.getDetails();
-
- if(entries != null) {
- String depthString = entries.get(VisualInformationPapyrusConstant.QUALIFIED_NAME_DEPTH);
- if(depthString != null) {
- Integer i = new Integer(depthString);
- if(i != 1000) {
- return i.intValue();
- }
- }
- }
- }
-
- //CSS Value (TODO : Remove this dependency ; add an extension point)
-
- if(modelElement instanceof UMLCustomStyle) {
- UMLCustomStyle cssElement = (UMLCustomStyle)modelElement;
- return cssElement.getCSSQualifiedNameDepth();
- }
-
- return 0;
- }
-
- /**
- * Gets the sets the qualifed name depth command.
- *
- * @param domain
- * the domain
- * @param view
- * the view
- * @param depth
- * the depth
- *
- * @return the sets the qualifed name depth command
- */
- // @unused
- public static RecordingCommand getSetQualifedNameDepthCommand(TransactionalEditingDomain domain, EModelElement view, int depth) {
- return new SetQualifiedNameDepthCommand(domain, view, depth);
- }
-
-}
diff --git a/sandbox/org.eclipse.papyrus.uml.tools.utils_css/src/org/eclipse/papyrus/uml/tools/utils/ui/helper/ShadowFigureHelper.java b/sandbox/org.eclipse.papyrus.uml.tools.utils_css/src/org/eclipse/papyrus/uml/tools/utils/ui/helper/ShadowFigureHelper.java
deleted file mode 100644
index fb578960820..00000000000
--- a/sandbox/org.eclipse.papyrus.uml.tools.utils_css/src/org/eclipse/papyrus/uml/tools/utils/ui/helper/ShadowFigureHelper.java
+++ /dev/null
@@ -1,75 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2008 CEA LIST.
- *
- *
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Patrick Tessier (CEA LIST) Patrick.tessier@cea.fr - Initial API and implementation
- *
- *****************************************************************************/
-package org.eclipse.papyrus.uml.tools.utils.ui.helper;
-
-import org.eclipse.emf.common.util.EMap;
-import org.eclipse.emf.ecore.EAnnotation;
-import org.eclipse.emf.ecore.EModelElement;
-import org.eclipse.emf.transaction.RecordingCommand;
-import org.eclipse.emf.transaction.TransactionalEditingDomain;
-import org.eclipse.papyrus.prototype.infra.gmfdiag.css.custom.UMLCustomStyle;
-import org.eclipse.papyrus.uml.tools.utils.ui.VisualInformationPapyrusConstant;
-import org.eclipse.papyrus.uml.tools.utils.ui.command.SetShadowFigureCommand;
-
-public class ShadowFigureHelper {
-
- /**
- * get the shadow figure indication true or false
- *
- * @param modelElement
- * the view where is attach the element
- */
- public static boolean getShadowFigureValue(EModelElement modelElement) {
- EAnnotation stereotypeDisplayKind = modelElement.getEAnnotation(VisualInformationPapyrusConstant.SHADOWFIGURE);
- if(stereotypeDisplayKind != null) {
- EMap<String, String> entries = stereotypeDisplayKind.getDetails();
-
- if(entries != null) {
- String gradientvalueString = entries.get(VisualInformationPapyrusConstant.SHADOWFIGURE_VALUE);
- if(gradientvalueString != null) {
- Boolean b = new Boolean(gradientvalueString);
- if(b) {
- return true;
- }
- }
- }
- }
- //CSS Value (TODO : Remove this dependency ; add an extension point)
-
- if(modelElement instanceof UMLCustomStyle) {
- UMLCustomStyle cssElement = (UMLCustomStyle)modelElement;
- return cssElement.getCSSShadow();
- }
-
- return false;
- }
-
- /**
- * Gets the command to set the shadow figure to true are false.
- *
- * @param domain
- * the domain
- * @param view
- * the view
- * @param shadowFigureValue
- * true to display the shadow on the figure
- *
- * @return the command to set the gradient to true are false.
- */
- // @unused
- public static RecordingCommand getShadowColorCommand(TransactionalEditingDomain domain, EModelElement view, boolean shadowFigureValue) {
- return new SetShadowFigureCommand(domain, view, shadowFigureValue);
- }
-
-}

Back to the top