Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorjeremie.tatibouet2015-05-27 04:17:05 -0400
committerjeremie.tatibouet2015-05-27 05:21:37 -0400
commitb9ae078da54b58d1813b3518c633d5f514523f17 (patch)
treef54ae442ef6041f27d8dd62e1d88e676296d4e66
parent455f4aad0b34872dca6ba98c6e46f94558c917c3 (diff)
parent576f39b13f86998615aac65ab6011aa9632ab0dd (diff)
downloadorg.eclipse.papyrus-b9ae078da54b58d1813b3518c633d5f514523f17.tar.gz
org.eclipse.papyrus-b9ae078da54b58d1813b3518c633d5f514523f17.tar.xz
org.eclipse.papyrus-b9ae078da54b58d1813b3518c633d5f514523f17.zip
Merge branch 'master' into bugs/462954-alf-postRC1
Conflicts: releng/top-pom-extras.xml Change-Id: Ia4be9916a6e59928780df709dce9741bb1ded363 Signed-off-by: jeremie.tatibouet <jeremie.tatibouet@cea.fr>
-rw-r--r--extraplugins/adl4eclipse/org.eclipse.papyrus.adl4eclipse.profile/.settings/org.eclipse.jdt.core.prefs284
-rw-r--r--extraplugins/adl4eclipse/org.eclipse.papyrus.adl4eclipse.profile/.settings/org.eclipse.jdt.ui.prefs68
-rw-r--r--extraplugins/adl4eclipse/org.eclipse.papyrus.osgi.profile/.settings/org.eclipse.jdt.core.prefs284
-rw-r--r--extraplugins/adl4eclipse/org.eclipse.papyrus.osgi.profile/.settings/org.eclipse.jdt.ui.prefs68
-rw-r--r--extraplugins/cdo/org.eclipse.papyrus.cdo.uml.search.ui/src/org/eclipse/papyrus/cdo/uml/search/internal/ui/query/CDOSearchQueryProvider.java2
-rw-r--r--extraplugins/marte/org.eclipse.papyrus.marte.static.profile/palettes/ActivityDiag-GCM.Palette.xml28
-rw-r--r--extraplugins/marte/org.eclipse.papyrus.marte.static.profile/palettes/ActivityDiag-GQAM.Palette.xml138
-rw-r--r--extraplugins/marte/org.eclipse.papyrus.marte.static.profile/palettes/ActivityDiag-HLAM.Palette.xml48
-rw-r--r--extraplugins/marte/org.eclipse.papyrus.marte.static.profile/palettes/ActivityDiag-PAM.Palette.xml108
-rw-r--r--extraplugins/marte/org.eclipse.papyrus.marte.static.profile/palettes/ActivityDiag-SAM.Palette.xml79
-rw-r--r--extraplugins/marte/org.eclipse.papyrus.marte.static.profile/palettes/ActivityDiag-Time.Palette.xml28
-rw-r--r--extraplugins/marte/org.eclipse.papyrus.marte.static.profile/palettes/StateMachineDiag-CoreElements.Palette.xml2
-rw-r--r--extraplugins/req/org.eclipse.papyrus.req.reqif/src/org/eclipse/papyrus/req/reqif/transformation/BasicRequirementMerger.java425
-rw-r--r--extraplugins/req/org.eclipse.papyrus.req.reqif/src/org/eclipse/papyrus/req/reqif/transformation/I_RI.java34
-rw-r--r--extraplugins/req/org.eclipse.papyrus.req.reqif/src/org/eclipse/papyrus/req/reqif/transformation/ReqIFImporter.java8
-rw-r--r--extraplugins/req/org.eclipse.papyrus.req.reqif/src/org/eclipse/papyrus/req/reqif/util/BasicRequirementMerger.java391
-rw-r--r--extraplugins/req/org.eclipse.papyrus.req.reqif/src/org/eclipse/papyrus/req/reqif/util/CopierWithoutContainment.java473
-rw-r--r--extraplugins/req/org.eclipse.papyrus.req.reqif/src/org/eclipse/papyrus/req/reqif/util/EqualityHelperWithoutContainment.java341
-rw-r--r--extraplugins/req/org.eclipse.papyrus.req.reqif/src/org/eclipse/papyrus/req/reqif/util/IRequirementMerger.java33
-rw-r--r--extraplugins/robotml/org.eclipse.papyrus.robotml/palettes/Palette_SM_RobotML.xml8
-rw-r--r--extraplugins/sysml14/org.eclipse.papyrus.sysml14.diagram.blockdefinition/resources/palette/blockDiagram.paletteconfiguration4
-rw-r--r--extraplugins/sysml14/org.eclipse.papyrus.sysml14.diagram.requirement/resources/configuration/RequirementDiagram.configuration2
-rw-r--r--extraplugins/sysml14/org.eclipse.papyrus.sysml14.diagram.requirement/resources/palette/requirementDiagram.paletteconfiguration128
-rw-r--r--extraplugins/sysml14/org.eclipse.papyrus.sysml14.diagram.requirement/resources/style/requirementdiagram.css66
-rw-r--r--extraplugins/umlrt/org.eclipse.papyrus.umlrt.ui/palettes/UML-RT.CapsuleDiagram.paletteconfiguration18
-rw-r--r--extraplugins/umlrt/org.eclipse.papyrus.umlrt/elementtypes/uml-rt.elementtypesconfigurations9
-rw-r--r--extraplugins/umlrt/org.eclipse.papyrus.umlrt/src/org/eclipse/papyrus/umlrt/custom/advice/CapsuleEditHelperAdvice.java69
-rw-r--r--features/papyrus-dev-features/org.eclipse.papyrus.dev.feature/feature.xml35
-rw-r--r--features/papyrus-extra-features/org.eclipse.papyrus.extra.feature/feature.xml228
-rw-r--r--plugins/developer/org.eclipse.papyrus.def/xtend/aspects/impl/diagram/editparts/CompartmentEditPart.xtend17
-rw-r--r--plugins/developer/org.eclipse.papyrus.releng.tools/META-INF/MANIFEST.MF6
-rw-r--r--plugins/developer/org.eclipse.papyrus.uml.developer.mde/META-INF/MANIFEST.MF6
-rw-r--r--plugins/developer/org.eclipse.papyrus.uml.developer.mde/resource/developermodel.uml138
-rw-r--r--plugins/developer/org.eclipse.papyrus.uml.developer.mde/src/org/eclipse/papyrus/uml/developper/mde/LinkUtil.java162
-rw-r--r--plugins/developer/org.eclipse.papyrus.uml.developer.mde/src/org/eclipse/papyrus/uml/developper/mde/command/CreateDocumentModelCommand.java353
-rw-r--r--plugins/developer/org.eclipse.papyrus.uml.developer.mde/src/org/eclipse/papyrus/uml/developper/mde/handler/GetHTMLTextHandler.java30
-rw-r--r--plugins/developer/org.eclipse.papyrus.uml.developer.mde/src/org/eclipse/papyrus/uml/developper/mde/handler/GetWikiTextHandler.java22
-rw-r--r--plugins/developer/org.eclipse.papyrus.uml.developer.mde/src/org/eclipse/papyrus/uml/developper/mde/handler/IDMAbstractHandler.java38
-rw-r--r--plugins/developer/org.eclipse.papyrus.uml.developer.mde/src/org/eclipse/papyrus/uml/developper/mde/transcription/HTMLTranscription.java87
-rw-r--r--plugins/developer/org.eclipse.papyrus.uml.developer.mde/src/org/eclipse/papyrus/uml/developper/mde/transcription/ITranscription.java79
-rw-r--r--plugins/developer/org.eclipse.papyrus.uml.developer.mde/src/org/eclipse/papyrus/uml/developper/mde/transcription/TranscriptionEngine.java71
-rw-r--r--plugins/developer/org.eclipse.papyrus.uml.developer.mde/src/org/eclipse/papyrus/uml/developper/mde/transcription/WikiTranscription.java72
-rw-r--r--plugins/infra/core/org.eclipse.papyrus.infra.core/src/org/eclipse/papyrus/infra/core/utils/TransactionPrecommitExecutor.java13
-rw-r--r--plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.properties/src/org/eclipse/papyrus/infra/gmfdiag/css/properties/databinding/ModelStyleSheetObservableList.java81
-rw-r--r--plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.properties/src/org/eclipse/papyrus/infra/gmfdiag/css/properties/modelelement/CSSModelElement.java29
-rw-r--r--plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css/src/org/eclipse/papyrus/infra/gmfdiag/css/dom/GMFElementAdapter.java24
-rw-r--r--plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css/src/org/eclipse/papyrus/infra/gmfdiag/css/engine/ModelCSSEngine.java15
-rw-r--r--plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css3.xtext/.launch/Generate Language Infrastructure (org.eclipse.papyrus.infra.gmfdiag.css3.xtext).launch4
-rw-r--r--plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css3.xtext/.launch/Launch Runtime Eclipse.launch64
-rw-r--r--plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.canonical/DeveloperDoc.html1
-rw-r--r--plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.canonical/doc/DeveloperDoc.html92
-rw-r--r--plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.canonical/doc/default.css (renamed from plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.canonical/default.css)118
-rw-r--r--plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.canonical/doc/design.di2
-rw-r--r--plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.canonical/doc/design.notation1603
-rw-r--r--plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.canonical/doc/design.uml (renamed from plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.canonical/resource/model.uml)1546
-rw-r--r--plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.canonical/doc/imgDOC/ArchitectureOverview.pngbin0 -> 19974 bytes
-rw-r--r--plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.canonical/doc/imgDOC/Structure.pngbin0 -> 62810 bytes
-rw-r--r--plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.canonical/doc/imgDOC/UseCaseDiagram.pngbin0 -> 27505 bytes
-rw-r--r--plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.canonical/docs/out.html1
-rw-r--r--plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.canonical/imgDOC/ArchitectureOverview.pngbin14434 -> 0 bytes
-rw-r--r--plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.canonical/imgDOC/Structure.pngbin34647 -> 0 bytes
-rw-r--r--plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.canonical/imgDOC/UseCaseDiagram.pngbin18524 -> 0 bytes
-rw-r--r--plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.canonical/resource/model.notation724
-rw-r--r--plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/META-INF/MANIFEST.MF1
-rw-r--r--plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/icons/symbols/hourglass.svg9
-rw-r--r--plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/plugin.xml14
-rw-r--r--plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/Activator.java1
-rw-r--r--plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/expansion/CreateInducedRepresentationViewCommand.java4
-rw-r--r--plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/expansion/DiagramExpansionsRegistry.java6
-rw-r--r--plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/expansion/ExpandEditPartProvider.java20
-rw-r--r--plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/expansion/ExpandViewProvider.java18
-rw-r--r--plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/figure/node/SVGNodePlateFigure.java4
-rw-r--r--plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/internal/sync/UISyncServiceInitializer.java120
-rw-r--r--plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/sync/AbstractNestedDiagramViewsSyncFeature.java16
-rw-r--r--plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/sync/NodePositionSyncFeature.java11
-rw-r--r--plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/sync/NodeSizeSyncFeature.java11
-rw-r--r--plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/sync/UISyncUtils.java13
-rw-r--r--plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.dnd/src/org/eclipse/papyrus/infra/gmfdiag/dnd/Activator.java2
-rw-r--r--plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.dnd/src/org/eclipse/papyrus/infra/gmfdiag/dnd/strategy/ExpansionElementDropStrategy.java10
-rw-r--r--plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.common/plugin.xml31
-rw-r--r--plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.common/src/org/eclipse/papyrus/infra/nattable/common/editor/AbstractEMFNattableEditor.java22
-rwxr-xr-xplugins/infra/nattable/org.eclipse.papyrus.infra.nattable.common/src/org/eclipse/papyrus/infra/nattable/common/handlers/ReloadNattableWidgetInEditorHandler.java91
-rw-r--r--plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src/org/eclipse/papyrus/infra/nattable/model/factory/IAxisFactory.java2
-rw-r--r--plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/manager/axis/CompositeTreeAxisManagerForEventList.java28
-rwxr-xr-xplugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/manager/table/AbstractNattableWidgetManager.java3380
-rwxr-xr-xplugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/manager/table/TreeNattableModelManager.java43
-rw-r--r--plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/utils/FillingConfigurationUtils.java2
-rw-r--r--plugins/infra/org.eclipse.papyrus.infra.hyperlink/src/org/eclipse/papyrus/infra/hyperlink/object/HyperLinkDocument.java197
-rw-r--r--plugins/infra/org.eclipse.papyrus.infra.newchild/src/org/eclipse/papyrus/infra/newchild/ui/DynamicNewChild.java5
-rw-r--r--plugins/infra/org.eclipse.papyrus.infra.onefile/src/org/eclipse/papyrus/infra/onefile/providers/PapyrusContentProvider.java5
-rw-r--r--plugins/infra/org.eclipse.papyrus.infra.sync/doc/DeveloperDoc.html291
-rw-r--r--plugins/infra/org.eclipse.papyrus.infra.sync/doc/default.css59
-rw-r--r--plugins/infra/org.eclipse.papyrus.infra.sync/doc/design.di2
-rw-r--r--plugins/infra/org.eclipse.papyrus.infra.sync/doc/design.notation4042
-rw-r--r--plugins/infra/org.eclipse.papyrus.infra.sync/doc/design.uml1139
-rw-r--r--plugins/infra/org.eclipse.papyrus.infra.sync/doc/imgDOC/Exclude_Views_from_Synchronization.pngbin0 -> 35368 bytes
-rw-r--r--plugins/infra/org.eclipse.papyrus.infra.sync/doc/imgDOC/Notation_Sync_Classes.pngbin0 -> 26118 bytes
-rw-r--r--plugins/infra/org.eclipse.papyrus.infra.sync/doc/imgDOC/Notation_Synchronization.pngbin0 -> 22278 bytes
-rw-r--r--plugins/infra/org.eclipse.papyrus.infra.sync/doc/imgDOC/Plug-ins.pngbin0 -> 26780 bytes
-rw-r--r--plugins/infra/org.eclipse.papyrus.infra.sync/doc/imgDOC/Sync_Framework_Core_Classes.pngbin0 -> 27505 bytes
-rw-r--r--plugins/infra/org.eclipse.papyrus.infra.sync/doc/imgDOC/Sync_Policy_Classes.pngbin0 -> 27137 bytes
-rw-r--r--plugins/infra/org.eclipse.papyrus.infra.sync/doc/imgDOC/Sync_Service_Classes.pngbin0 -> 25558 bytes
-rw-r--r--plugins/infra/org.eclipse.papyrus.infra.sync/doc/imgDOC/Synchronization.pngbin0 -> 19252 bytes
-rw-r--r--plugins/infra/org.eclipse.papyrus.infra.sync/doc/imgDOC/Synchronization_Exclusions.pngbin0 -> 28097 bytes
-rw-r--r--plugins/infra/org.eclipse.papyrus.infra.sync/doc/imgDOC/Synchronization_Overrides.pngbin0 -> 25348 bytes
-rw-r--r--plugins/infra/org.eclipse.papyrus.infra.sync/doc/imgDOC/Synchronization_Overrides_1.pngbin0 -> 38299 bytes
-rw-r--r--plugins/infra/org.eclipse.papyrus.infra.sync/doc/imgDOC/Synchronize_Model_Elements.pngbin0 -> 24752 bytes
-rw-r--r--plugins/infra/org.eclipse.papyrus.infra.sync/doc/imgDOC/Synchronize_Model_Elements_1.pngbin0 -> 27386 bytes
-rw-r--r--plugins/infra/org.eclipse.papyrus.infra.sync/doc/imgDOC/Test_Classes.pngbin0 -> 10267 bytes
-rw-r--r--plugins/infra/org.eclipse.papyrus.infra.sync/doc/imgDOC/Test_Plug-ins.pngbin0 -> 7136 bytes
-rw-r--r--plugins/infra/org.eclipse.papyrus.infra.sync/doc/imgDOC/Use_Cases.pngbin0 -> 58171 bytes
-rw-r--r--plugins/infra/org.eclipse.papyrus.infra.sync/src/org/eclipse/papyrus/infra/sync/EStructuralFeatureSyncFeature.java32
-rw-r--r--plugins/infra/org.eclipse.papyrus.infra.sync/src/org/eclipse/papyrus/infra/sync/ISyncObject.java14
-rw-r--r--plugins/infra/org.eclipse.papyrus.infra.sync/src/org/eclipse/papyrus/infra/sync/SyncObject.java9
-rw-r--r--plugins/infra/org.eclipse.papyrus.infra.sync/src/org/eclipse/papyrus/infra/sync/internal/SyncService.java41
-rw-r--r--plugins/infra/org.eclipse.papyrus.infra.sync/src/org/eclipse/papyrus/infra/sync/service/ISyncService.java24
-rwxr-xr-xplugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.policy/META-INF/MANIFEST.MF6
-rwxr-xr-xplugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.policy/model/style.ecore5
-rwxr-xr-xplugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.policy/model/style.genmodel2
-rwxr-xr-xplugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.policy/src-gen/org/eclipse/papyrus/infra/viewpoints/style/PapyrusViewStyle.java4
-rwxr-xr-xplugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.policy/src-gen/org/eclipse/papyrus/infra/viewpoints/style/impl/PapyrusViewStyleImpl.java2
-rwxr-xr-xplugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.policy/src-gen/org/eclipse/papyrus/infra/viewpoints/style/impl/StylePackageImpl.java15
-rwxr-xr-xplugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.policy/src-gen/org/eclipse/papyrus/infra/viewpoints/style/util/StyleAdapterFactory.java29
-rwxr-xr-xplugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.policy/src-gen/org/eclipse/papyrus/infra/viewpoints/style/util/StyleSwitch.java3
-rw-r--r--plugins/uml/alf/org.eclipse.papyrus.uml.alf.common/.launch/Generate Language Infrastructure (org.eclipse.papyrus.uml.alf.common).launch4
-rw-r--r--plugins/uml/alf/org.eclipse.papyrus.uml.alf.common/.launch/Launch Runtime Eclipse.launch4
-rw-r--r--plugins/uml/alf/org.eclipse.papyrus.uml.alf/.launch/Generate Language Infrastructure (org.eclipse.papyrus.alf.integration).launch4
-rw-r--r--plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/custom-src/org/eclipse/papyrus/uml/diagram/activity/edit/part/ActivityGroup/CustomLoopNodeStructuredActivityNodeContentCompartmentEditPart.java20
-rw-r--r--plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/custom-src/org/eclipse/papyrus/uml/diagram/activity/edit/part/ActivityGroup/CustomSequenceNodeStructuredActivityNodeContentCompartmentEditPart.java20
-rw-r--r--plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/custom-src/org/eclipse/papyrus/uml/diagram/activity/edit/part/ActivityGroup/CustomStructuredActivityNodeStructuredActivityNodeContentCompartmentEditPart.java20
-rw-r--r--plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/custom-src/org/eclipse/papyrus/uml/diagram/activity/edit/part/ShapeCompartmentWithoutScrollbarsEditPart.java35
-rw-r--r--plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/custom-src/org/eclipse/papyrus/uml/diagram/activity/edit/policies/CustomDiagramDragDropEditPolicy.java11
-rw-r--r--plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/custom-src/org/eclipse/papyrus/uml/diagram/activity/figures/ActivityFigure.java47
-rw-r--r--plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/custom-src/org/eclipse/papyrus/uml/diagram/activity/figures/ActivityFigureCN.java27
-rw-r--r--plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/model/activityDiagram.gmfgen7
-rw-r--r--plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src/org/eclipse/papyrus/uml/diagram/activity/edit/parts/ActivityEditPartCN.java8
-rw-r--r--plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src/org/eclipse/papyrus/uml/diagram/activity/edit/parts/ActivityPartitionActivityPartitionContentCompartmentEditPart.java20
-rw-r--r--plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src/org/eclipse/papyrus/uml/diagram/activity/edit/parts/InterruptibleActivityRegionInterruptibleActivityRegionContentCompartmentEditPart.java19
-rw-r--r--plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src/org/eclipse/papyrus/uml/diagram/activity/edit/parts/LoopNodeStructuredActivityNodeContentCompartmentEditPart.java19
-rw-r--r--plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src/org/eclipse/papyrus/uml/diagram/activity/edit/parts/SequenceNodeStructuredActivityNodeContentCompartmentEditPart.java19
-rw-r--r--plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src/org/eclipse/papyrus/uml/diagram/activity/edit/parts/StructuredActivityNodeStructuredActivityNodeContentCompartmentEditPart.java19
-rw-r--r--plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/custom-src/org/eclipse/papyrus/uml/diagram/clazz/custom/edit/part/AbstractAssociationEditPart.java347
-rw-r--r--plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/custom-src/org/eclipse/papyrus/uml/diagram/clazz/custom/policies/ClassDiagramDragDropEditPolicy.java37
-rw-r--r--plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/model/UMLRepresentationKind.xmi8
-rw-r--r--plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/uml/diagram/common/Activator.java2
-rw-r--r--plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/uml/diagram/common/editparts/ContainerNodeEditPart.java160
-rw-r--r--plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/uml/diagram/common/editparts/EditableLabelForNodeEditPart.java737
-rw-r--r--plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/uml/diagram/common/editparts/UMLNodeEditPart.java3
-rw-r--r--plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/uml/diagram/common/editpolicies/CommonDiagramDragDropEditPolicy.java58
-rw-r--r--plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/uml/diagram/common/editpolicies/DisplayAssociationBranchEndEditPolicy.java12
-rw-r--r--plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/uml/diagram/common/editpolicies/DisplayAssociationEndEditPolicy.java10
-rw-r--r--plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/uml/diagram/common/editpolicies/DisplayAssociationEndSourceEditPolicy.java12
-rw-r--r--plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/uml/diagram/common/editpolicies/DisplayAssociationEndSourceMultiplicityEditPolicy.java14
-rw-r--r--plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/uml/diagram/common/editpolicies/DisplayAssociationEndTargetEditPolicy.java12
-rw-r--r--plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/uml/diagram/common/editpolicies/DisplayAssociationEndTargetMultiplicityEditPolicy.java14
-rw-r--r--plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/uml/diagram/common/helper/AssociationEndSourceLabelHelper.java171
-rw-r--r--plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/uml/diagram/common/helper/AssociationEndSourceMultiplicityLabelHelper.java20
-rw-r--r--plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/uml/diagram/common/helper/AssociationEndTargetLabelHelper.java181
-rw-r--r--plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/uml/diagram/common/helper/AssociationEndTargetMultiplicityLabelHelper.java20
-rw-r--r--plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/uml/diagram/common/helper/PropertyLabelHelper.java4
-rw-r--r--plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.communication/custom-src/org/eclipse/papyrus/uml/diagram/communication/custom/commands/CustomLifelineCreateCommandCN.java51
-rw-r--r--plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.communication/custom-src/org/eclipse/papyrus/uml/diagram/communication/custom/edit/policies/CustomDiagramDragDropEditPolicy.java42
-rw-r--r--plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.communication/custom-src/org/eclipse/papyrus/uml/diagram/communication/custom/helper/CommunicationRequestConstant.java14
-rw-r--r--plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.communication/custom-src/org/eclipse/papyrus/uml/diagram/communication/custom/policies/itemsemantic/CustomInteractionCompartmentSemanticEditPolicy.java15
-rw-r--r--plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.css/src/org/eclipse/papyrus/uml/diagram/css/dom/GMFUMLElementAdapter.java61
-rw-r--r--plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.css/theme/umlBase.css45
-rw-r--r--plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment/.options14
-rw-r--r--plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment/META-INF/MANIFEST.MF155
-rw-r--r--plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment/build.properties9
-rw-r--r--plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment/custom-src/org/eclipse/papyrus/uml/diagram/deployment/custom/edit/command/BranchDependenctReorientCommand.java80
-rw-r--r--plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment/custom-src/org/eclipse/papyrus/uml/diagram/deployment/custom/edit/policies/itemsemantic/CustomDefaultNamedElementItemSemanticEditPolicy.java24
-rw-r--r--plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment/custom-src/org/eclipse/papyrus/uml/diagram/deployment/custom/edit/policies/itemsemantic/CustomDependencyBranchSemanticEditPolicy.java19
-rw-r--r--plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment/model/DeploymentDiagram-notation.elementtypesconfigurations6
-rw-r--r--plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment/model/DeploymentDiagram.elementtypesconfigurations374
-rw-r--r--plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment/model/DeploymentDiagram.gmfgen6316
-rw-r--r--plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment/plugin.xml535
-rw-r--r--plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment/src/org/eclipse/papyrus/uml/diagram/deployment/edit/commands/ArtifactCreateCommand.java127
-rw-r--r--plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment/src/org/eclipse/papyrus/uml/diagram/deployment/edit/commands/ArtifactCreateCommandACN.java126
-rw-r--r--plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment/src/org/eclipse/papyrus/uml/diagram/deployment/edit/commands/ArtifactCreateCommandCN.java127
-rw-r--r--plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment/src/org/eclipse/papyrus/uml/diagram/deployment/edit/commands/CommentAnnotatedElementCreateCommand.java108
-rw-r--r--plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment/src/org/eclipse/papyrus/uml/diagram/deployment/edit/commands/CommentAnnotatedElementReorientCommand.java165
-rw-r--r--plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment/src/org/eclipse/papyrus/uml/diagram/deployment/edit/commands/CommentCreateCommand.java127
-rw-r--r--plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment/src/org/eclipse/papyrus/uml/diagram/deployment/edit/commands/CommentCreateCommandCN.java127
-rw-r--r--plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment/src/org/eclipse/papyrus/uml/diagram/deployment/edit/commands/ConstraintConstrainedElementCreateCommand.java108
-rw-r--r--plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment/src/org/eclipse/papyrus/uml/diagram/deployment/edit/commands/ConstraintConstrainedElementReorientCommand.java165
-rw-r--r--plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment/src/org/eclipse/papyrus/uml/diagram/deployment/edit/commands/ConstraintCreateCommand.java131
-rw-r--r--plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment/src/org/eclipse/papyrus/uml/diagram/deployment/edit/commands/ConstraintCreateCommandCN.java127
-rw-r--r--plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment/src/org/eclipse/papyrus/uml/diagram/deployment/edit/commands/DefaultNamedElementCreateCommand.java98
-rw-r--r--plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment/src/org/eclipse/papyrus/uml/diagram/deployment/edit/commands/DependencyBranchCreateCommand.java171
-rw-r--r--plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment/src/org/eclipse/papyrus/uml/diagram/deployment/edit/commands/DependencyBranchReorientCommand.java187
-rw-r--r--plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment/src/org/eclipse/papyrus/uml/diagram/deployment/edit/commands/DependencyCreateCommand.java171
-rw-r--r--plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment/src/org/eclipse/papyrus/uml/diagram/deployment/edit/commands/DependencyNodeCreateCommand.java125
-rw-r--r--plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment/src/org/eclipse/papyrus/uml/diagram/deployment/edit/commands/DependencyReorientCommand.java187
-rw-r--r--plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment/src/org/eclipse/papyrus/uml/diagram/deployment/edit/commands/DeploymentCreateCommand.java171
-rw-r--r--plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment/src/org/eclipse/papyrus/uml/diagram/deployment/edit/commands/DeploymentReorientCommand.java187
-rw-r--r--plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment/src/org/eclipse/papyrus/uml/diagram/deployment/edit/commands/DeviceCreateCommand.java127
-rw-r--r--plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment/src/org/eclipse/papyrus/uml/diagram/deployment/edit/commands/DeviceCreateCommandCN.java127
-rw-r--r--plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment/src/org/eclipse/papyrus/uml/diagram/deployment/edit/commands/ExecutionEnvironmentCreateCommand.java127
-rw-r--r--plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment/src/org/eclipse/papyrus/uml/diagram/deployment/edit/commands/ExecutionEnvironmentCreateCommandCN.java127
-rw-r--r--plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment/src/org/eclipse/papyrus/uml/diagram/deployment/edit/commands/GeneralizationCreateCommand.java170
-rw-r--r--plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment/src/org/eclipse/papyrus/uml/diagram/deployment/edit/commands/GeneralizationReorientCommand.java174
-rw-r--r--plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment/src/org/eclipse/papyrus/uml/diagram/deployment/edit/commands/ManifestationCreateCommand.java171
-rw-r--r--plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment/src/org/eclipse/papyrus/uml/diagram/deployment/edit/commands/ManifestationReorientCommand.java187
-rw-r--r--plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment/src/org/eclipse/papyrus/uml/diagram/deployment/edit/commands/ModelCreateCommand.java127
-rw-r--r--plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment/src/org/eclipse/papyrus/uml/diagram/deployment/edit/commands/ModelCreateCommandCN.java127
-rw-r--r--plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment/src/org/eclipse/papyrus/uml/diagram/deployment/edit/commands/NestedArtifactNodeCreateCommandCN.java127
-rw-r--r--plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment/src/org/eclipse/papyrus/uml/diagram/deployment/edit/commands/NestedDeviceCreateCommandCN.java127
-rw-r--r--plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment/src/org/eclipse/papyrus/uml/diagram/deployment/edit/commands/NestedExecutionEnvironmentCreateCommandCN.java127
-rw-r--r--plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment/src/org/eclipse/papyrus/uml/diagram/deployment/edit/commands/NestedNodeCreateCommandCN.java127
-rw-r--r--plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment/src/org/eclipse/papyrus/uml/diagram/deployment/edit/commands/NodeCreateCommand.java127
-rw-r--r--plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment/src/org/eclipse/papyrus/uml/diagram/deployment/edit/commands/NodeCreateCommandCN.java126
-rw-r--r--plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment/src/org/eclipse/papyrus/uml/diagram/deployment/edit/commands/PackageCreateCommand.java126
-rw-r--r--plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment/src/org/eclipse/papyrus/uml/diagram/deployment/edit/commands/PackageCreateCommandCN.java126
-rw-r--r--plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment/src/org/eclipse/papyrus/uml/diagram/deployment/edit/helpers/ArtifactEditHelper.java20
-rw-r--r--plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment/src/org/eclipse/papyrus/uml/diagram/deployment/edit/helpers/CommentEditHelper.java20
-rw-r--r--plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment/src/org/eclipse/papyrus/uml/diagram/deployment/edit/helpers/ConstraintEditHelper.java20
-rw-r--r--plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment/src/org/eclipse/papyrus/uml/diagram/deployment/edit/helpers/DefaultNamedElementEditHelper.java20
-rw-r--r--plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment/src/org/eclipse/papyrus/uml/diagram/deployment/edit/helpers/DependencyEditHelper.java20
-rw-r--r--plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment/src/org/eclipse/papyrus/uml/diagram/deployment/edit/helpers/DeploymentEditHelper.java20
-rw-r--r--plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment/src/org/eclipse/papyrus/uml/diagram/deployment/edit/helpers/DeviceEditHelper.java20
-rw-r--r--plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment/src/org/eclipse/papyrus/uml/diagram/deployment/edit/helpers/ExecutionEnvironmentEditHelper.java20
-rw-r--r--plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment/src/org/eclipse/papyrus/uml/diagram/deployment/edit/helpers/GeneralizationEditHelper.java20
-rw-r--r--plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment/src/org/eclipse/papyrus/uml/diagram/deployment/edit/helpers/ManifestationEditHelper.java20
-rw-r--r--plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment/src/org/eclipse/papyrus/uml/diagram/deployment/edit/helpers/ModelEditHelper.java20
-rw-r--r--plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment/src/org/eclipse/papyrus/uml/diagram/deployment/edit/helpers/NodeEditHelper.java20
-rw-r--r--plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment/src/org/eclipse/papyrus/uml/diagram/deployment/edit/helpers/UMLBaseEditHelper.java40
-rw-r--r--plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment/src/org/eclipse/papyrus/uml/diagram/deployment/edit/parts/ArtifactCompositeCompartmentEditPart.java12
-rw-r--r--plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment/src/org/eclipse/papyrus/uml/diagram/deployment/edit/parts/ArtifactCompositeCompartmentEditPartACN.java12
-rw-r--r--plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment/src/org/eclipse/papyrus/uml/diagram/deployment/edit/parts/ArtifactCompositeCompartmentEditPartCN.java12
-rw-r--r--plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment/src/org/eclipse/papyrus/uml/diagram/deployment/edit/parts/ArtifactEditPart.java726
-rw-r--r--plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment/src/org/eclipse/papyrus/uml/diagram/deployment/edit/parts/ArtifactEditPartACN.java726
-rw-r--r--plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment/src/org/eclipse/papyrus/uml/diagram/deployment/edit/parts/ArtifactEditPartCN.java726
-rw-r--r--plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment/src/org/eclipse/papyrus/uml/diagram/deployment/edit/parts/ArtifactFloatingLabelEditPart.java1706
-rw-r--r--plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment/src/org/eclipse/papyrus/uml/diagram/deployment/edit/parts/ArtifactFloatingLabelEditPartACN.java1706
-rw-r--r--plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment/src/org/eclipse/papyrus/uml/diagram/deployment/edit/parts/ArtifactFloatingLabelEditPartCN.java1706
-rw-r--r--plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment/src/org/eclipse/papyrus/uml/diagram/deployment/edit/parts/ArtifactNameEditPart.java1727
-rw-r--r--plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment/src/org/eclipse/papyrus/uml/diagram/deployment/edit/parts/ArtifactNameEditPartACN.java1727
-rw-r--r--plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment/src/org/eclipse/papyrus/uml/diagram/deployment/edit/parts/ArtifactNameEditPartCN.java1727
-rw-r--r--plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment/src/org/eclipse/papyrus/uml/diagram/deployment/edit/parts/CommentAnnotatedElementEditPart.java136
-rw-r--r--plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment/src/org/eclipse/papyrus/uml/diagram/deployment/edit/parts/CommentBodyEditPart.java1727
-rw-r--r--plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment/src/org/eclipse/papyrus/uml/diagram/deployment/edit/parts/CommentBodyEditPartCN.java1727
-rw-r--r--plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment/src/org/eclipse/papyrus/uml/diagram/deployment/edit/parts/CommentEditPart.java568
-rw-r--r--plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment/src/org/eclipse/papyrus/uml/diagram/deployment/edit/parts/CommentEditPartCN.java568
-rw-r--r--plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment/src/org/eclipse/papyrus/uml/diagram/deployment/edit/parts/ConstraintConstrainedElementEditPart.java136
-rw-r--r--plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment/src/org/eclipse/papyrus/uml/diagram/deployment/edit/parts/ConstraintEditPart.java578
-rw-r--r--plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment/src/org/eclipse/papyrus/uml/diagram/deployment/edit/parts/ConstraintEditPartCN.java578
-rw-r--r--plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment/src/org/eclipse/papyrus/uml/diagram/deployment/edit/parts/ConstraintNameEditPart.java1727
-rw-r--r--plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment/src/org/eclipse/papyrus/uml/diagram/deployment/edit/parts/ConstraintNameEditPartCN.java1727
-rw-r--r--plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment/src/org/eclipse/papyrus/uml/diagram/deployment/edit/parts/ConstraintSpecificationEditPart.java1727
-rw-r--r--plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment/src/org/eclipse/papyrus/uml/diagram/deployment/edit/parts/ConstraintSpecificationEditPartCN.java1727
-rw-r--r--plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment/src/org/eclipse/papyrus/uml/diagram/deployment/edit/parts/DefaultNamedElementEditPart.java574
-rw-r--r--plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment/src/org/eclipse/papyrus/uml/diagram/deployment/edit/parts/DefaultNamedElementNameEditPart.java1761
-rw-r--r--plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment/src/org/eclipse/papyrus/uml/diagram/deployment/edit/parts/DependencyAppliedStereotypeEditPart.java1646
-rw-r--r--plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment/src/org/eclipse/papyrus/uml/diagram/deployment/edit/parts/DependencyBranchEditPart.java142
-rw-r--r--plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment/src/org/eclipse/papyrus/uml/diagram/deployment/edit/parts/DependencyEditPart.java253
-rw-r--r--plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment/src/org/eclipse/papyrus/uml/diagram/deployment/edit/parts/DependencyNameEditPart.java1646
-rw-r--r--plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment/src/org/eclipse/papyrus/uml/diagram/deployment/edit/parts/DependencyNodeEditPart.java490
-rw-r--r--plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment/src/org/eclipse/papyrus/uml/diagram/deployment/edit/parts/DeploymentAppliedStereotypeEditPart.java1646
-rw-r--r--plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment/src/org/eclipse/papyrus/uml/diagram/deployment/edit/parts/DeploymentDiagramEditPart.java12
-rw-r--r--plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment/src/org/eclipse/papyrus/uml/diagram/deployment/edit/parts/DeploymentEditPart.java247
-rw-r--r--plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment/src/org/eclipse/papyrus/uml/diagram/deployment/edit/parts/DeploymentNameEditPart.java1646
-rw-r--r--plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment/src/org/eclipse/papyrus/uml/diagram/deployment/edit/parts/DeviceCompositeCompartmentEditPart.java12
-rw-r--r--plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment/src/org/eclipse/papyrus/uml/diagram/deployment/edit/parts/DeviceCompositeCompartmentEditPartCN.java12
-rw-r--r--plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment/src/org/eclipse/papyrus/uml/diagram/deployment/edit/parts/DeviceEditPart.java614
-rw-r--r--plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment/src/org/eclipse/papyrus/uml/diagram/deployment/edit/parts/DeviceEditPartCN.java584
-rw-r--r--plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment/src/org/eclipse/papyrus/uml/diagram/deployment/edit/parts/DeviceNameEditPart.java1727
-rw-r--r--plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment/src/org/eclipse/papyrus/uml/diagram/deployment/edit/parts/DeviceNameEditPartCN.java1727
-rw-r--r--plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment/src/org/eclipse/papyrus/uml/diagram/deployment/edit/parts/ExecutionEnvironmentCompositeCompartmentEditPart.java12
-rw-r--r--plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment/src/org/eclipse/papyrus/uml/diagram/deployment/edit/parts/ExecutionEnvironmentCompositeCompartmentEditPartCN.java12
-rw-r--r--plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment/src/org/eclipse/papyrus/uml/diagram/deployment/edit/parts/ExecutionEnvironmentEditPart.java614
-rw-r--r--plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment/src/org/eclipse/papyrus/uml/diagram/deployment/edit/parts/ExecutionEnvironmentEditPartCN.java584
-rw-r--r--plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment/src/org/eclipse/papyrus/uml/diagram/deployment/edit/parts/ExecutionEnvironmentNameEditPart.java1727
-rw-r--r--plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment/src/org/eclipse/papyrus/uml/diagram/deployment/edit/parts/ExecutionEnvironmentNameEditPartCN.java1727
-rw-r--r--plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment/src/org/eclipse/papyrus/uml/diagram/deployment/edit/parts/GeneralizationAppliedStereotypeEditPart.java1630
-rw-r--r--plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment/src/org/eclipse/papyrus/uml/diagram/deployment/edit/parts/GeneralizationEditPart.java233
-rw-r--r--plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment/src/org/eclipse/papyrus/uml/diagram/deployment/edit/parts/LinkDescriptorEditPart.java140
-rw-r--r--plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment/src/org/eclipse/papyrus/uml/diagram/deployment/edit/parts/ManifestationAppliedStereotypeEditPart.java1646
-rw-r--r--plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment/src/org/eclipse/papyrus/uml/diagram/deployment/edit/parts/ManifestationEditPart.java247
-rw-r--r--plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment/src/org/eclipse/papyrus/uml/diagram/deployment/edit/parts/ManifestationNameEditPart.java1646
-rw-r--r--plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment/src/org/eclipse/papyrus/uml/diagram/deployment/edit/parts/ModelEditPart.java602
-rw-r--r--plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment/src/org/eclipse/papyrus/uml/diagram/deployment/edit/parts/ModelEditPartCN.java602
-rw-r--r--plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment/src/org/eclipse/papyrus/uml/diagram/deployment/edit/parts/ModelNameEditPart.java1761
-rw-r--r--plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment/src/org/eclipse/papyrus/uml/diagram/deployment/edit/parts/ModelNameEditPartCN.java1761
-rw-r--r--plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment/src/org/eclipse/papyrus/uml/diagram/deployment/edit/parts/ModelPackageableElementCompartmentEditPart.java12
-rw-r--r--plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment/src/org/eclipse/papyrus/uml/diagram/deployment/edit/parts/ModelPackageableElementCompartmentEditPartCN.java12
-rw-r--r--plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment/src/org/eclipse/papyrus/uml/diagram/deployment/edit/parts/MultiDependencyLabelEditPart.java1690
-rw-r--r--plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment/src/org/eclipse/papyrus/uml/diagram/deployment/edit/parts/NestedArtifactNameEditPart.java1727
-rw-r--r--plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment/src/org/eclipse/papyrus/uml/diagram/deployment/edit/parts/NestedArtifactNodeEditPartCN.java556
-rw-r--r--plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment/src/org/eclipse/papyrus/uml/diagram/deployment/edit/parts/NestedDeviceEditPartCN.java590
-rw-r--r--plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment/src/org/eclipse/papyrus/uml/diagram/deployment/edit/parts/NestedDeviceNameEditPartCN.java1727
-rw-r--r--plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment/src/org/eclipse/papyrus/uml/diagram/deployment/edit/parts/NestedExecutionEnvironmentEditPartCN.java590
-rw-r--r--plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment/src/org/eclipse/papyrus/uml/diagram/deployment/edit/parts/NestedExecutionEnvironmentNameEditPartCN.java1727
-rw-r--r--plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment/src/org/eclipse/papyrus/uml/diagram/deployment/edit/parts/NestedNodeEditPartCN.java588
-rw-r--r--plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment/src/org/eclipse/papyrus/uml/diagram/deployment/edit/parts/NestedNodeNameEditPart.java1727
-rw-r--r--plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment/src/org/eclipse/papyrus/uml/diagram/deployment/edit/parts/NodeCompositeCompartmentEditPart.java12
-rw-r--r--plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment/src/org/eclipse/papyrus/uml/diagram/deployment/edit/parts/NodeCompositeCompartmentEditPartCN.java12
-rw-r--r--plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment/src/org/eclipse/papyrus/uml/diagram/deployment/edit/parts/NodeEditPart.java612
-rw-r--r--plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment/src/org/eclipse/papyrus/uml/diagram/deployment/edit/parts/NodeEditPartCN.java582
-rw-r--r--plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment/src/org/eclipse/papyrus/uml/diagram/deployment/edit/parts/NodeNameEditPart.java1727
-rw-r--r--plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment/src/org/eclipse/papyrus/uml/diagram/deployment/edit/parts/NodeNameEditPartCN.java1727
-rw-r--r--plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment/src/org/eclipse/papyrus/uml/diagram/deployment/edit/parts/PackageEditPart.java600
-rw-r--r--plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment/src/org/eclipse/papyrus/uml/diagram/deployment/edit/parts/PackageEditPartCN.java602
-rw-r--r--plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment/src/org/eclipse/papyrus/uml/diagram/deployment/edit/parts/PackageNameEditPart.java1761
-rw-r--r--plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment/src/org/eclipse/papyrus/uml/diagram/deployment/edit/parts/PackageNameEditPartCN.java1761
-rw-r--r--plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment/src/org/eclipse/papyrus/uml/diagram/deployment/edit/parts/PackagePackageableElementCompartmentEditPart.java12
-rw-r--r--plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment/src/org/eclipse/papyrus/uml/diagram/deployment/edit/parts/PackagePackageableElementCompartmentEditPartCN.java12
-rw-r--r--plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment/src/org/eclipse/papyrus/uml/diagram/deployment/edit/parts/UMLEditPartFactory.java717
-rw-r--r--plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment/src/org/eclipse/papyrus/uml/diagram/deployment/edit/policies/ArtifactCompositeCompartmentCanonicalEditPolicy.java176
-rw-r--r--plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment/src/org/eclipse/papyrus/uml/diagram/deployment/edit/policies/ArtifactCompositeCompartmentCanonicalEditPolicyACN.java176
-rw-r--r--plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment/src/org/eclipse/papyrus/uml/diagram/deployment/edit/policies/ArtifactCompositeCompartmentCanonicalEditPolicyCN.java176
-rw-r--r--plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment/src/org/eclipse/papyrus/uml/diagram/deployment/edit/policies/ArtifactCompositeCompartmentItemSemanticEditPolicy.java51
-rw-r--r--plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment/src/org/eclipse/papyrus/uml/diagram/deployment/edit/policies/ArtifactCompositeCompartmentItemSemanticEditPolicyACN.java51
-rw-r--r--plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment/src/org/eclipse/papyrus/uml/diagram/deployment/edit/policies/ArtifactCompositeCompartmentItemSemanticEditPolicyCN.java51
-rw-r--r--plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment/src/org/eclipse/papyrus/uml/diagram/deployment/edit/policies/ArtifactItemSemanticEditPolicy.java266
-rw-r--r--plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment/src/org/eclipse/papyrus/uml/diagram/deployment/edit/policies/ArtifactItemSemanticEditPolicyACN.java339
-rw-r--r--plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment/src/org/eclipse/papyrus/uml/diagram/deployment/edit/policies/ArtifactItemSemanticEditPolicyCN.java339
-rw-r--r--plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment/src/org/eclipse/papyrus/uml/diagram/deployment/edit/policies/CommentAnnotatedElementItemSemanticEditPolicy.java38
-rw-r--r--plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment/src/org/eclipse/papyrus/uml/diagram/deployment/edit/policies/CommentItemSemanticEditPolicy.java161
-rw-r--r--plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment/src/org/eclipse/papyrus/uml/diagram/deployment/edit/policies/CommentItemSemanticEditPolicyCN.java169
-rw-r--r--plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment/src/org/eclipse/papyrus/uml/diagram/deployment/edit/policies/ConstraintConstrainedElementItemSemanticEditPolicy.java38
-rw-r--r--plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment/src/org/eclipse/papyrus/uml/diagram/deployment/edit/policies/ConstraintItemSemanticEditPolicy.java253
-rw-r--r--plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment/src/org/eclipse/papyrus/uml/diagram/deployment/edit/policies/ConstraintItemSemanticEditPolicyCN.java265
-rw-r--r--plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment/src/org/eclipse/papyrus/uml/diagram/deployment/edit/policies/DefaultNamedElementItemSemanticEditPolicy.java261
-rw-r--r--plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment/src/org/eclipse/papyrus/uml/diagram/deployment/edit/policies/DependencyBranchItemSemanticEditPolicy.java249
-rw-r--r--plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment/src/org/eclipse/papyrus/uml/diagram/deployment/edit/policies/DependencyItemSemanticEditPolicy.java249
-rw-r--r--plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment/src/org/eclipse/papyrus/uml/diagram/deployment/edit/policies/DependencyNodeItemSemanticEditPolicy.java249
-rw-r--r--plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment/src/org/eclipse/papyrus/uml/diagram/deployment/edit/policies/DeploymentDiagramItemSemanticEditPolicy.java131
-rw-r--r--plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment/src/org/eclipse/papyrus/uml/diagram/deployment/edit/policies/DeploymentItemSemanticEditPolicy.java249
-rw-r--r--plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment/src/org/eclipse/papyrus/uml/diagram/deployment/edit/policies/DeviceCompositeCompartmentCanonicalEditPolicy.java179
-rw-r--r--plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment/src/org/eclipse/papyrus/uml/diagram/deployment/edit/policies/DeviceCompositeCompartmentCanonicalEditPolicyCN.java179
-rw-r--r--plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment/src/org/eclipse/papyrus/uml/diagram/deployment/edit/policies/DeviceCompositeCompartmentItemSemanticEditPolicy.java63
-rw-r--r--plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment/src/org/eclipse/papyrus/uml/diagram/deployment/edit/policies/DeviceCompositeCompartmentItemSemanticEditPolicyCN.java63
-rw-r--r--plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment/src/org/eclipse/papyrus/uml/diagram/deployment/edit/policies/DeviceItemSemanticEditPolicy.java266
-rw-r--r--plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment/src/org/eclipse/papyrus/uml/diagram/deployment/edit/policies/DeviceItemSemanticEditPolicyCN.java278
-rw-r--r--plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment/src/org/eclipse/papyrus/uml/diagram/deployment/edit/policies/ExecutionEnvironmentCompositeCompartmentCanonicalEditPolicy.java190
-rw-r--r--plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment/src/org/eclipse/papyrus/uml/diagram/deployment/edit/policies/ExecutionEnvironmentCompositeCompartmentCanonicalEditPolicyCN.java190
-rw-r--r--plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment/src/org/eclipse/papyrus/uml/diagram/deployment/edit/policies/ExecutionEnvironmentCompositeCompartmentItemSemanticEditPolicy.java57
-rw-r--r--plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment/src/org/eclipse/papyrus/uml/diagram/deployment/edit/policies/ExecutionEnvironmentCompositeCompartmentItemSemanticEditPolicyCN.java57
-rw-r--r--plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment/src/org/eclipse/papyrus/uml/diagram/deployment/edit/policies/ExecutionEnvironmentItemSemanticEditPolicy.java266
-rw-r--r--plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment/src/org/eclipse/papyrus/uml/diagram/deployment/edit/policies/ExecutionEnvironmentItemSemanticEditPolicyCN.java278
-rw-r--r--plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment/src/org/eclipse/papyrus/uml/diagram/deployment/edit/policies/GeneralizationItemSemanticEditPolicy.java154
-rw-r--r--plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment/src/org/eclipse/papyrus/uml/diagram/deployment/edit/policies/ManifestationItemSemanticEditPolicy.java249
-rw-r--r--plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment/src/org/eclipse/papyrus/uml/diagram/deployment/edit/policies/ModelCanonicalEditPolicy.java639
-rw-r--r--plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment/src/org/eclipse/papyrus/uml/diagram/deployment/edit/policies/ModelItemSemanticEditPolicy.java535
-rw-r--r--plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment/src/org/eclipse/papyrus/uml/diagram/deployment/edit/policies/ModelItemSemanticEditPolicyCN.java535
-rw-r--r--plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment/src/org/eclipse/papyrus/uml/diagram/deployment/edit/policies/ModelPackageableElementCompartmentCanonicalEditPolicy.java208
-rw-r--r--plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment/src/org/eclipse/papyrus/uml/diagram/deployment/edit/policies/ModelPackageableElementCompartmentCanonicalEditPolicyCN.java208
-rw-r--r--plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment/src/org/eclipse/papyrus/uml/diagram/deployment/edit/policies/ModelPackageableElementCompartmentItemSemanticEditPolicy.java93
-rw-r--r--plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment/src/org/eclipse/papyrus/uml/diagram/deployment/edit/policies/ModelPackageableElementCompartmentItemSemanticEditPolicyCN.java93
-rw-r--r--plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment/src/org/eclipse/papyrus/uml/diagram/deployment/edit/policies/NestedArtifactNodeItemSemanticEditPolicyCN.java278
-rw-r--r--plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment/src/org/eclipse/papyrus/uml/diagram/deployment/edit/policies/NestedDeviceItemSemanticEditPolicyCN.java403
-rw-r--r--plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment/src/org/eclipse/papyrus/uml/diagram/deployment/edit/policies/NestedExecutionEnvironmentItemSemanticEditPolicyCN.java371
-rw-r--r--plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment/src/org/eclipse/papyrus/uml/diagram/deployment/edit/policies/NestedNodeItemSemanticEditPolicyCN.java435
-rw-r--r--plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment/src/org/eclipse/papyrus/uml/diagram/deployment/edit/policies/NodeCompositeCompartmentCanonicalEditPolicy.java199
-rw-r--r--plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment/src/org/eclipse/papyrus/uml/diagram/deployment/edit/policies/NodeCompositeCompartmentCanonicalEditPolicyCN.java199
-rw-r--r--plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment/src/org/eclipse/papyrus/uml/diagram/deployment/edit/policies/NodeCompositeCompartmentItemSemanticEditPolicy.java69
-rw-r--r--plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment/src/org/eclipse/papyrus/uml/diagram/deployment/edit/policies/NodeCompositeCompartmentItemSemanticEditPolicyCN.java69
-rw-r--r--plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment/src/org/eclipse/papyrus/uml/diagram/deployment/edit/policies/NodeItemSemanticEditPolicy.java266
-rw-r--r--plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment/src/org/eclipse/papyrus/uml/diagram/deployment/edit/policies/NodeItemSemanticEditPolicyCN.java278
-rw-r--r--plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment/src/org/eclipse/papyrus/uml/diagram/deployment/edit/policies/PackageItemSemanticEditPolicy.java249
-rw-r--r--plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment/src/org/eclipse/papyrus/uml/diagram/deployment/edit/policies/PackageItemSemanticEditPolicyCN.java249
-rw-r--r--plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment/src/org/eclipse/papyrus/uml/diagram/deployment/edit/policies/PackagePackageableElementCompartmentCanonicalEditPolicy.java208
-rw-r--r--plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment/src/org/eclipse/papyrus/uml/diagram/deployment/edit/policies/PackagePackageableElementCompartmentCanonicalEditPolicyCN.java206
-rw-r--r--plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment/src/org/eclipse/papyrus/uml/diagram/deployment/edit/policies/PackagePackageableElementCompartmentItemSemanticEditPolicy.java93
-rw-r--r--plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment/src/org/eclipse/papyrus/uml/diagram/deployment/edit/policies/PackagePackageableElementCompartmentItemSemanticEditPolicyCN.java87
-rw-r--r--plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment/src/org/eclipse/papyrus/uml/diagram/deployment/edit/policies/UMLBaseItemSemanticEditPolicy.java1088
-rw-r--r--plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment/src/org/eclipse/papyrus/uml/diagram/deployment/edit/policies/UMLTextNonResizableEditPolicy.java487
-rw-r--r--plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment/src/org/eclipse/papyrus/uml/diagram/deployment/edit/policies/UMLTextSelectionEditPolicy.java452
-rw-r--r--plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment/src/org/eclipse/papyrus/uml/diagram/deployment/expressions/UMLAbstractExpression.java340
-rw-r--r--plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment/src/org/eclipse/papyrus/uml/diagram/deployment/expressions/UMLOCLFactory.java367
-rw-r--r--plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment/src/org/eclipse/papyrus/uml/diagram/deployment/parsers/AbstractParser.java2
-rw-r--r--plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment/src/org/eclipse/papyrus/uml/diagram/deployment/parsers/MessageFormatParser.java424
-rw-r--r--plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment/src/org/eclipse/papyrus/uml/diagram/deployment/part/DiagramEditorContextMenuProvider.java124
-rw-r--r--plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment/src/org/eclipse/papyrus/uml/diagram/deployment/part/LoadResourceAction.java60
-rw-r--r--plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment/src/org/eclipse/papyrus/uml/diagram/deployment/part/Messages.java998
-rw-r--r--plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment/src/org/eclipse/papyrus/uml/diagram/deployment/part/ModelElementSelectionPage.java78
-rw-r--r--plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment/src/org/eclipse/papyrus/uml/diagram/deployment/part/UMLCreationWizard.java359
-rw-r--r--plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment/src/org/eclipse/papyrus/uml/diagram/deployment/part/UMLCreationWizardPage.java196
-rw-r--r--plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment/src/org/eclipse/papyrus/uml/diagram/deployment/part/UMLDiagramActionBarContributor.java122
-rw-r--r--plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment/src/org/eclipse/papyrus/uml/diagram/deployment/part/UMLDiagramEditor.java1099
-rw-r--r--plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment/src/org/eclipse/papyrus/uml/diagram/deployment/part/UMLDiagramEditorPlugin.java603
-rw-r--r--plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment/src/org/eclipse/papyrus/uml/diagram/deployment/part/UMLDiagramEditorUtil.java722
-rw-r--r--plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment/src/org/eclipse/papyrus/uml/diagram/deployment/part/UMLDiagramUpdater.java5532
-rw-r--r--plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment/src/org/eclipse/papyrus/uml/diagram/deployment/part/UMLDocumentProvider.java2066
-rw-r--r--plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment/src/org/eclipse/papyrus/uml/diagram/deployment/part/UMLInitDiagramFileAction.java212
-rw-r--r--plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment/src/org/eclipse/papyrus/uml/diagram/deployment/part/UMLLinkDescriptor.java72
-rw-r--r--plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment/src/org/eclipse/papyrus/uml/diagram/deployment/part/UMLMatchingStrategy.java90
-rw-r--r--plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment/src/org/eclipse/papyrus/uml/diagram/deployment/part/UMLNewDiagramFileWizard.java387
-rw-r--r--plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment/src/org/eclipse/papyrus/uml/diagram/deployment/part/UMLNodeDescriptor.java56
-rw-r--r--plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment/src/org/eclipse/papyrus/uml/diagram/deployment/part/UMLPaletteFactory.java646
-rw-r--r--plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment/src/org/eclipse/papyrus/uml/diagram/deployment/part/UMLVisualIDRegistry.java1994
-rw-r--r--plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment/src/org/eclipse/papyrus/uml/diagram/deployment/part/ValidateAction.java594
-rw-r--r--plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment/src/org/eclipse/papyrus/uml/diagram/deployment/preferences/DiagramAppearancePreferencePage.java56
-rw-r--r--plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment/src/org/eclipse/papyrus/uml/diagram/deployment/preferences/DiagramConnectionsPreferencePage.java56
-rw-r--r--plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment/src/org/eclipse/papyrus/uml/diagram/deployment/preferences/DiagramGeneralPreferencePage.java60
-rw-r--r--plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment/src/org/eclipse/papyrus/uml/diagram/deployment/preferences/DiagramPreferenceInitializer.java96
-rw-r--r--plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment/src/org/eclipse/papyrus/uml/diagram/deployment/preferences/DiagramPrintingPreferencePage.java56
-rw-r--r--plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment/src/org/eclipse/papyrus/uml/diagram/deployment/preferences/DiagramRulersAndGridPreferencePage.java56
-rw-r--r--plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment/src/org/eclipse/papyrus/uml/diagram/deployment/providers/ElementInitializers.java1339
-rw-r--r--plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment/src/org/eclipse/papyrus/uml/diagram/deployment/providers/UMLEditPartProvider.java64
-rw-r--r--plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment/src/org/eclipse/papyrus/uml/diagram/deployment/providers/UMLElementTypes.java1086
-rw-r--r--plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment/src/org/eclipse/papyrus/uml/diagram/deployment/providers/UMLIconProvider.java56
-rw-r--r--plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment/src/org/eclipse/papyrus/uml/diagram/deployment/providers/UMLMarkerNavigationProvider.java192
-rw-r--r--plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment/src/org/eclipse/papyrus/uml/diagram/deployment/providers/UMLParserProvider.java1747
-rw-r--r--plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment/src/org/eclipse/papyrus/uml/diagram/deployment/providers/UMLValidationDecoratorProvider.java146
-rw-r--r--plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment/src/org/eclipse/papyrus/uml/diagram/deployment/providers/UMLValidationProvider.java152
-rw-r--r--plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment/src/org/eclipse/papyrus/uml/diagram/deployment/providers/UMLViewProvider.java2540
-rw-r--r--plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment/src/org/eclipse/papyrus/uml/diagram/deployment/sheet/UMLPropertySection.java64
-rw-r--r--plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment/src/org/eclipse/papyrus/uml/diagram/deployment/sheet/UMLSheetLabelProvider.java174
-rw-r--r--plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/custom-src/org/eclipse/papyrus/uml/diagram/profile/custom/commands/CustomSemanticCreateCommand.java37
-rw-r--r--plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/custom-src/org/eclipse/papyrus/uml/diagram/profile/custom/helper/MetaclassHelper.java32
-rw-r--r--plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.symbols/plugin.xml12
-rw-r--r--plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.symbols/src/org/eclipse/papyrus/uml/diagram/symbols/provider/AcceptEventActionShapeProvider.java224
-rw-r--r--plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.wizards/src/org/eclipse/papyrus/uml/diagram/wizards/command/PapyrusModelFromExistingDomainModelCommand.java22
-rw-r--r--plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.wizards/src/org/eclipse/papyrus/uml/diagram/wizards/messages/Messages.java4
-rw-r--r--plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.wizards/src/org/eclipse/papyrus/uml/diagram/wizards/messages/messages.properties2
-rw-r--r--plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.wizards/src/org/eclipse/papyrus/uml/diagram/wizards/pages/NewModelFilePage.java65
-rw-r--r--plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.wizards/src/org/eclipse/papyrus/uml/diagram/wizards/pages/PapyrusProjectCreationPage.java43
-rw-r--r--plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.wizards/src/org/eclipse/papyrus/uml/diagram/wizards/pages/SelectDiagramCategoryPage.java13
-rw-r--r--plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.wizards/src/org/eclipse/papyrus/uml/diagram/wizards/wizards/CreateModelWizard.java16
-rw-r--r--plugins/uml/modelexplorer/org.eclipse.papyrus.uml.modelexplorer/resource/UMLEdges.creationmenumodel2
-rw-r--r--plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.clazz.config/configs/classTreeTable.configuration5
-rw-r--r--plugins/uml/nattable/org.eclipse.papyrus.uml.nattable/build.properties3
-rwxr-xr-xplugins/uml/nattable/org.eclipse.papyrus.uml.nattable/configs/genericTreeTable.configuration17
-rwxr-xr-xplugins/uml/nattable/org.eclipse.papyrus.uml.nattable/configs/genericTreeTable.nattableconfiguration36
-rwxr-xr-xplugins/uml/nattable/org.eclipse.papyrus.uml.nattable/icons/uml_generic_table.pngbin0 -> 319 bytes
-rw-r--r--plugins/uml/nattable/org.eclipse.papyrus.uml.nattable/plugin.xml14
-rw-r--r--plugins/uml/org.eclipse.papyrus.uml.search.ui/src/org/eclipse/papyrus/uml/search/ui/pages/PapyrusSearchPage.java3
-rw-r--r--plugins/uml/org.eclipse.papyrus.uml.search.ui/src/org/eclipse/papyrus/uml/search/ui/query/CompositePapyrusQuery.java16
-rw-r--r--plugins/uml/org.eclipse.papyrus.uml.service.types/model/uml-containments.elementtypesconfigurations803
-rw-r--r--plugins/uml/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations7748
-rw-r--r--plugins/uml/org.eclipse.papyrus.uml.service.types/src/org/eclipse/papyrus/uml/service/types/helper/ActivityGroupHelper.java16
-rw-r--r--plugins/uml/org.eclipse.papyrus.uml.service.types/src/org/eclipse/papyrus/uml/service/types/helper/ActivityHelper.java207
-rw-r--r--plugins/uml/org.eclipse.papyrus.uml.service.types/src/org/eclipse/papyrus/uml/service/types/helper/ActivityPartitionEditHelper.java9
-rw-r--r--plugins/uml/org.eclipse.papyrus.uml.service.types/src/org/eclipse/papyrus/uml/service/types/helper/ExpansionRegionHelper.java15
-rw-r--r--plugins/uml/org.eclipse.papyrus.uml.service.types/src/org/eclipse/papyrus/uml/service/types/helper/InterruptibleActivityRegionHelper.java9
-rw-r--r--plugins/uml/org.eclipse.papyrus.uml.service.types/src/org/eclipse/papyrus/uml/service/types/helper/advice/RefineEditHelperAdvice.java18
-rw-r--r--plugins/uml/org.eclipse.papyrus.uml.service.types/src/org/eclipse/papyrus/uml/service/types/helper/advice/TraceEditHelperAdvice.java18
-rw-r--r--plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.port.xtext.ui/src-gen/org/eclipse/papyrus/uml/textedit/port/xtext/ui/AbstractUmlPortUiModule.java281
-rw-r--r--plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.port.xtext.ui/src-gen/org/eclipse/papyrus/uml/textedit/port/xtext/ui/UmlPortExecutableExtensionFactory.java58
-rw-r--r--plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.port.xtext.ui/src-gen/org/eclipse/papyrus/uml/textedit/port/xtext/ui/contentassist/AbstractUmlPortProposalProvider.java392
-rw-r--r--plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.port.xtext.ui/src-gen/org/eclipse/papyrus/uml/textedit/port/xtext/ui/contentassist/antlr/UmlPortParser.java253
-rw-r--r--plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.port.xtext.ui/src-gen/org/eclipse/papyrus/uml/textedit/port/xtext/ui/contentassist/antlr/internal/InternalUmlPort.g5819
-rw-r--r--plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.port.xtext.ui/src-gen/org/eclipse/papyrus/uml/textedit/port/xtext/ui/contentassist/antlr/internal/InternalUmlPort.tokens124
-rw-r--r--plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.port.xtext.ui/src-gen/org/eclipse/papyrus/uml/textedit/port/xtext/ui/contentassist/antlr/internal/InternalUmlPortLexer.java4224
-rw-r--r--plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.port.xtext.ui/src-gen/org/eclipse/papyrus/uml/textedit/port/xtext/ui/contentassist/antlr/internal/InternalUmlPortParser.java16060
-rw-r--r--plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.port.xtext.ui/src-gen/org/eclipse/papyrus/uml/textedit/port/xtext/ui/internal/UmlPortActivator.java190
-rw-r--r--plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.port.xtext.ui/src/org/eclipse/papyrus/uml/textedit/port/xtext/ui/contribution/PortXtextDirectEditorConfiguration.java55
-rw-r--r--plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.port.xtext.ui/src/org/eclipse/papyrus/uml/textedit/port/xtext/ui/contribution/UMLPortEditorPropertyUtil.java226
-rw-r--r--plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.port.xtext/.launch/Generate Language Infrastructure (org.eclipse.papyrus.uml.textedit.port.xtext).launch4
-rw-r--r--plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.port.xtext/.launch/Launch Runtime Eclipse.launch64
-rw-r--r--plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.port.xtext/src-gen/org/eclipse/papyrus/uml/textedit/port/xtext/AbstractUmlPortRuntimeModule.java328
-rw-r--r--plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.port.xtext/src-gen/org/eclipse/papyrus/uml/textedit/port/xtext/UmlPort.genmodel180
-rw-r--r--plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.port.xtext/src-gen/org/eclipse/papyrus/uml/textedit/port/xtext/UmlPort.xtextbinbin6019 -> 6074 bytes
-rw-r--r--plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.port.xtext/src-gen/org/eclipse/papyrus/uml/textedit/port/xtext/UmlPortStandaloneSetupGenerated.java92
-rw-r--r--plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.port.xtext/src-gen/org/eclipse/papyrus/uml/textedit/port/xtext/parser/antlr/UmlPortAntlrTokenFileProvider.java32
-rw-r--r--plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.port.xtext/src-gen/org/eclipse/papyrus/uml/textedit/port/xtext/parser/antlr/UmlPortParser.java78
-rw-r--r--plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.port.xtext/src-gen/org/eclipse/papyrus/uml/textedit/port/xtext/parser/antlr/internal/InternalUmlPort.g2586
-rw-r--r--plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.port.xtext/src-gen/org/eclipse/papyrus/uml/textedit/port/xtext/parser/antlr/internal/InternalUmlPortLexer.java4228
-rw-r--r--plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.port.xtext/src-gen/org/eclipse/papyrus/uml/textedit/port/xtext/parser/antlr/internal/InternalUmlPortParser.java7119
-rw-r--r--plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.port.xtext/src-gen/org/eclipse/papyrus/uml/textedit/port/xtext/serializer/UmlPortSemanticSequencer.java705
-rw-r--r--plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.port.xtext/src-gen/org/eclipse/papyrus/uml/textedit/port/xtext/serializer/UmlPortSyntacticSequencer.java85
-rw-r--r--plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.port.xtext/src-gen/org/eclipse/papyrus/uml/textedit/port/xtext/services/UmlPortGrammarAccess.java2627
-rw-r--r--plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.port.xtext/src-gen/org/eclipse/papyrus/uml/textedit/port/xtext/umlPort/BooleanLiterals.java473
-rw-r--r--plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.port.xtext/src-gen/org/eclipse/papyrus/uml/textedit/port/xtext/umlPort/BooleanValue.java108
-rw-r--r--plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.port.xtext/src-gen/org/eclipse/papyrus/uml/textedit/port/xtext/umlPort/BoundSpecification.java104
-rw-r--r--plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.port.xtext/src-gen/org/eclipse/papyrus/uml/textedit/port/xtext/umlPort/DefaultValueRule.java104
-rw-r--r--plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.port.xtext/src-gen/org/eclipse/papyrus/uml/textedit/port/xtext/umlPort/IntValue.java102
-rw-r--r--plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.port.xtext/src-gen/org/eclipse/papyrus/uml/textedit/port/xtext/umlPort/ModifierKind.java585
-rw-r--r--plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.port.xtext/src-gen/org/eclipse/papyrus/uml/textedit/port/xtext/umlPort/ModifierSpecification.java222
-rw-r--r--plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.port.xtext/src-gen/org/eclipse/papyrus/uml/textedit/port/xtext/umlPort/ModifiersRule.java86
-rw-r--r--plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.port.xtext/src-gen/org/eclipse/papyrus/uml/textedit/port/xtext/umlPort/MultiplicityRule.java86
-rw-r--r--plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.port.xtext/src-gen/org/eclipse/papyrus/uml/textedit/port/xtext/umlPort/PortRule.java552
-rw-r--r--plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.port.xtext/src-gen/org/eclipse/papyrus/uml/textedit/port/xtext/umlPort/QualifiedName.java164
-rw-r--r--plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.port.xtext/src-gen/org/eclipse/papyrus/uml/textedit/port/xtext/umlPort/RealValue.java158
-rw-r--r--plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.port.xtext/src-gen/org/eclipse/papyrus/uml/textedit/port/xtext/umlPort/RedefinesRule.java108
-rw-r--r--plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.port.xtext/src-gen/org/eclipse/papyrus/uml/textedit/port/xtext/umlPort/StringValue.java102
-rw-r--r--plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.port.xtext/src-gen/org/eclipse/papyrus/uml/textedit/port/xtext/umlPort/SubsetsRule.java108
-rw-r--r--plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.port.xtext/src-gen/org/eclipse/papyrus/uml/textedit/port/xtext/umlPort/TypeRule.java164
-rw-r--r--plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.port.xtext/src-gen/org/eclipse/papyrus/uml/textedit/port/xtext/umlPort/UmlPortFactory.java413
-rw-r--r--plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.port.xtext/src-gen/org/eclipse/papyrus/uml/textedit/port/xtext/umlPort/UmlPortPackage.java3496
-rw-r--r--plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.port.xtext/src-gen/org/eclipse/papyrus/uml/textedit/port/xtext/umlPort/VisibilityKind.java585
-rw-r--r--plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.port.xtext/src-gen/org/eclipse/papyrus/uml/textedit/port/xtext/umlPort/VisibilityRule.java110
-rw-r--r--plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.port.xtext/src-gen/org/eclipse/papyrus/uml/textedit/port/xtext/umlPort/impl/BooleanValueImpl.java370
-rw-r--r--plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.port.xtext/src-gen/org/eclipse/papyrus/uml/textedit/port/xtext/umlPort/impl/BoundSpecificationImpl.java370
-rw-r--r--plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.port.xtext/src-gen/org/eclipse/papyrus/uml/textedit/port/xtext/umlPort/impl/DefaultValueRuleImpl.java410
-rw-r--r--plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.port.xtext/src-gen/org/eclipse/papyrus/uml/textedit/port/xtext/umlPort/impl/IntValueImpl.java368
-rw-r--r--plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.port.xtext/src-gen/org/eclipse/papyrus/uml/textedit/port/xtext/umlPort/impl/ModifierSpecificationImpl.java723
-rw-r--r--plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.port.xtext/src-gen/org/eclipse/papyrus/uml/textedit/port/xtext/umlPort/impl/ModifiersRuleImpl.java344
-rw-r--r--plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.port.xtext/src-gen/org/eclipse/papyrus/uml/textedit/port/xtext/umlPort/impl/MultiplicityRuleImpl.java344
-rw-r--r--plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.port.xtext/src-gen/org/eclipse/papyrus/uml/textedit/port/xtext/umlPort/impl/NoValueImpl.java84
-rw-r--r--plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.port.xtext/src-gen/org/eclipse/papyrus/uml/textedit/port/xtext/umlPort/impl/NullValueImpl.java84
-rw-r--r--plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.port.xtext/src-gen/org/eclipse/papyrus/uml/textedit/port/xtext/umlPort/impl/PortRuleImpl.java1555
-rw-r--r--plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.port.xtext/src-gen/org/eclipse/papyrus/uml/textedit/port/xtext/umlPort/impl/QualifiedNameImpl.java552
-rw-r--r--plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.port.xtext/src-gen/org/eclipse/papyrus/uml/textedit/port/xtext/umlPort/impl/RealValueImpl.java487
-rw-r--r--plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.port.xtext/src-gen/org/eclipse/papyrus/uml/textedit/port/xtext/umlPort/impl/RedefinesRuleImpl.java364
-rw-r--r--plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.port.xtext/src-gen/org/eclipse/papyrus/uml/textedit/port/xtext/umlPort/impl/StringValueImpl.java368
-rw-r--r--plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.port.xtext/src-gen/org/eclipse/papyrus/uml/textedit/port/xtext/umlPort/impl/SubsetsRuleImpl.java364
-rw-r--r--plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.port.xtext/src-gen/org/eclipse/papyrus/uml/textedit/port/xtext/umlPort/impl/TypeRuleImpl.java554
-rw-r--r--plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.port.xtext/src-gen/org/eclipse/papyrus/uml/textedit/port/xtext/umlPort/impl/UmlPortFactoryImpl.java912
-rw-r--r--plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.port.xtext/src-gen/org/eclipse/papyrus/uml/textedit/port/xtext/umlPort/impl/UmlPortPackageImpl.java2086
-rw-r--r--plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.port.xtext/src-gen/org/eclipse/papyrus/uml/textedit/port/xtext/umlPort/impl/ValueImpl.java88
-rw-r--r--plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.port.xtext/src-gen/org/eclipse/papyrus/uml/textedit/port/xtext/umlPort/impl/VisibilityRuleImpl.java372
-rw-r--r--plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.port.xtext/src-gen/org/eclipse/papyrus/uml/textedit/port/xtext/umlPort/util/UmlPortAdapterFactory.java988
-rw-r--r--plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.port.xtext/src-gen/org/eclipse/papyrus/uml/textedit/port/xtext/umlPort/util/UmlPortSwitch.java1105
-rw-r--r--plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.port.xtext/src-gen/org/eclipse/papyrus/uml/textedit/port/xtext/validation/AbstractUmlPortJavaValidator.java44
-rw-r--r--plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.port.xtext/src/org/eclipse/papyrus/uml/textedit/port/xtext/UmlPort.xtext198
-rw-r--r--plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.property.xtext.ui/src-gen/org/eclipse/papyrus/uml/textedit/property/xtext/ui/AbstractUmlPropertyUiModule.java282
-rw-r--r--plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.property.xtext.ui/src-gen/org/eclipse/papyrus/uml/textedit/property/xtext/ui/UmlPropertyExecutableExtensionFactory.java58
-rw-r--r--plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.property.xtext.ui/src-gen/org/eclipse/papyrus/uml/textedit/property/xtext/ui/contentassist/AbstractUmlPropertyProposalProvider.java385
-rw-r--r--plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.property.xtext.ui/src-gen/org/eclipse/papyrus/uml/textedit/property/xtext/ui/contentassist/antlr/UmlPropertyParser.java251
-rw-r--r--plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.property.xtext.ui/src-gen/org/eclipse/papyrus/uml/textedit/property/xtext/ui/contentassist/antlr/internal/InternalUmlProperty.g5711
-rw-r--r--plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.property.xtext.ui/src-gen/org/eclipse/papyrus/uml/textedit/property/xtext/ui/contentassist/antlr/internal/InternalUmlProperty.tokens124
-rw-r--r--plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.property.xtext.ui/src-gen/org/eclipse/papyrus/uml/textedit/property/xtext/ui/contentassist/antlr/internal/InternalUmlPropertyLexer.java4225
-rw-r--r--plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.property.xtext.ui/src-gen/org/eclipse/papyrus/uml/textedit/property/xtext/ui/contentassist/antlr/internal/InternalUmlPropertyParser.java15789
-rw-r--r--plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.property.xtext.ui/src-gen/org/eclipse/papyrus/uml/textedit/property/xtext/ui/internal/UmlPropertyActivator.java190
-rw-r--r--plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.property.xtext.ui/src/org/eclipse/papyrus/uml/textedit/property/xtext/ui/contributions/PropertyXtextDirectEditorConfiguration.java57
-rw-r--r--plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.property.xtext.ui/src/org/eclipse/papyrus/uml/textedit/property/xtext/ui/contributions/UMLPropertyEditorPropertyUtil.java210
-rw-r--r--plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.property.xtext/.classpath18
-rw-r--r--plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.property.xtext/.settings/org.eclipse.jdt.core.prefs608
-rw-r--r--plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.property.xtext/META-INF/MANIFEST.MF82
-rw-r--r--plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.property.xtext/src-gen/org/eclipse/papyrus/uml/textedit/property/xtext/AbstractUmlPropertyRuntimeModule.java328
-rw-r--r--plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.property.xtext/src-gen/org/eclipse/papyrus/uml/textedit/property/xtext/UmlProperty.genmodel178
-rw-r--r--plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.property.xtext/src-gen/org/eclipse/papyrus/uml/textedit/property/xtext/UmlProperty.xtextbinbin6027 -> 6082 bytes
-rw-r--r--plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.property.xtext/src-gen/org/eclipse/papyrus/uml/textedit/property/xtext/UmlPropertyStandaloneSetupGenerated.java91
-rw-r--r--plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.property.xtext/src-gen/org/eclipse/papyrus/uml/textedit/property/xtext/parser/antlr/UmlPropertyAntlrTokenFileProvider.java31
-rw-r--r--plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.property.xtext/src-gen/org/eclipse/papyrus/uml/textedit/property/xtext/parser/antlr/UmlPropertyParser.java78
-rw-r--r--plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.property.xtext/src-gen/org/eclipse/papyrus/uml/textedit/property/xtext/parser/antlr/internal/InternalUmlProperty.g2556
-rw-r--r--plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.property.xtext/src-gen/org/eclipse/papyrus/uml/textedit/property/xtext/parser/antlr/internal/InternalUmlPropertyLexer.java4225
-rw-r--r--plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.property.xtext/src-gen/org/eclipse/papyrus/uml/textedit/property/xtext/parser/antlr/internal/InternalUmlPropertyParser.java7045
-rw-r--r--plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.property.xtext/src-gen/org/eclipse/papyrus/uml/textedit/property/xtext/serializer/UmlPropertySemanticSequencer.java704
-rw-r--r--plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.property.xtext/src-gen/org/eclipse/papyrus/uml/textedit/property/xtext/serializer/UmlPropertySyntacticSequencer.java85
-rw-r--r--plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.property.xtext/src-gen/org/eclipse/papyrus/uml/textedit/property/xtext/services/UmlPropertyGrammarAccess.java2584
-rw-r--r--plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.property.xtext/src-gen/org/eclipse/papyrus/uml/textedit/property/xtext/umlProperty/BooleanLiterals.java470
-rw-r--r--plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.property.xtext/src-gen/org/eclipse/papyrus/uml/textedit/property/xtext/umlProperty/BooleanValue.java108
-rw-r--r--plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.property.xtext/src-gen/org/eclipse/papyrus/uml/textedit/property/xtext/umlProperty/BoundSpecification.java104
-rw-r--r--plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.property.xtext/src-gen/org/eclipse/papyrus/uml/textedit/property/xtext/umlProperty/DefaultValueRule.java104
-rw-r--r--plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.property.xtext/src-gen/org/eclipse/papyrus/uml/textedit/property/xtext/umlProperty/IntValue.java102
-rw-r--r--plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.property.xtext/src-gen/org/eclipse/papyrus/uml/textedit/property/xtext/umlProperty/ModifierKind.java582
-rw-r--r--plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.property.xtext/src-gen/org/eclipse/papyrus/uml/textedit/property/xtext/umlProperty/ModifierSpecification.java222
-rw-r--r--plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.property.xtext/src-gen/org/eclipse/papyrus/uml/textedit/property/xtext/umlProperty/ModifiersRule.java86
-rw-r--r--plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.property.xtext/src-gen/org/eclipse/papyrus/uml/textedit/property/xtext/umlProperty/MultiplicityRule.java86
-rw-r--r--plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.property.xtext/src-gen/org/eclipse/papyrus/uml/textedit/property/xtext/umlProperty/PropertyRule.java496
-rw-r--r--plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.property.xtext/src-gen/org/eclipse/papyrus/uml/textedit/property/xtext/umlProperty/QualifiedName.java164
-rw-r--r--plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.property.xtext/src-gen/org/eclipse/papyrus/uml/textedit/property/xtext/umlProperty/RealValue.java158
-rw-r--r--plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.property.xtext/src-gen/org/eclipse/papyrus/uml/textedit/property/xtext/umlProperty/RedefinesRule.java108
-rw-r--r--plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.property.xtext/src-gen/org/eclipse/papyrus/uml/textedit/property/xtext/umlProperty/StringValue.java102
-rw-r--r--plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.property.xtext/src-gen/org/eclipse/papyrus/uml/textedit/property/xtext/umlProperty/SubsetsRule.java108
-rw-r--r--plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.property.xtext/src-gen/org/eclipse/papyrus/uml/textedit/property/xtext/umlProperty/TypeRule.java164
-rw-r--r--plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.property.xtext/src-gen/org/eclipse/papyrus/uml/textedit/property/xtext/umlProperty/UmlPropertyFactory.java413
-rw-r--r--plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.property.xtext/src-gen/org/eclipse/papyrus/uml/textedit/property/xtext/umlProperty/UmlPropertyPackage.java3437
-rw-r--r--plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.property.xtext/src-gen/org/eclipse/papyrus/uml/textedit/property/xtext/umlProperty/VisibilityKind.java582
-rw-r--r--plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.property.xtext/src-gen/org/eclipse/papyrus/uml/textedit/property/xtext/umlProperty/VisibilityRule.java110
-rw-r--r--plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.property.xtext/src-gen/org/eclipse/papyrus/uml/textedit/property/xtext/umlProperty/impl/BooleanValueImpl.java368
-rw-r--r--plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.property.xtext/src-gen/org/eclipse/papyrus/uml/textedit/property/xtext/umlProperty/impl/BoundSpecificationImpl.java368
-rw-r--r--plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.property.xtext/src-gen/org/eclipse/papyrus/uml/textedit/property/xtext/umlProperty/impl/DefaultValueRuleImpl.java408
-rw-r--r--plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.property.xtext/src-gen/org/eclipse/papyrus/uml/textedit/property/xtext/umlProperty/impl/IntValueImpl.java366
-rw-r--r--plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.property.xtext/src-gen/org/eclipse/papyrus/uml/textedit/property/xtext/umlProperty/impl/ModifierSpecificationImpl.java717
-rw-r--r--plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.property.xtext/src-gen/org/eclipse/papyrus/uml/textedit/property/xtext/umlProperty/impl/ModifiersRuleImpl.java343
-rw-r--r--plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.property.xtext/src-gen/org/eclipse/papyrus/uml/textedit/property/xtext/umlProperty/impl/MultiplicityRuleImpl.java343
-rw-r--r--plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.property.xtext/src-gen/org/eclipse/papyrus/uml/textedit/property/xtext/umlProperty/impl/NoValueImpl.java84
-rw-r--r--plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.property.xtext/src-gen/org/eclipse/papyrus/uml/textedit/property/xtext/umlProperty/impl/NullValueImpl.java84
-rw-r--r--plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.property.xtext/src-gen/org/eclipse/papyrus/uml/textedit/property/xtext/umlProperty/impl/PropertyRuleImpl.java1420
-rw-r--r--plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.property.xtext/src-gen/org/eclipse/papyrus/uml/textedit/property/xtext/umlProperty/impl/QualifiedNameImpl.java548
-rw-r--r--plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.property.xtext/src-gen/org/eclipse/papyrus/uml/textedit/property/xtext/umlProperty/impl/RealValueImpl.java483
-rw-r--r--plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.property.xtext/src-gen/org/eclipse/papyrus/uml/textedit/property/xtext/umlProperty/impl/RedefinesRuleImpl.java362
-rw-r--r--plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.property.xtext/src-gen/org/eclipse/papyrus/uml/textedit/property/xtext/umlProperty/impl/StringValueImpl.java366
-rw-r--r--plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.property.xtext/src-gen/org/eclipse/papyrus/uml/textedit/property/xtext/umlProperty/impl/SubsetsRuleImpl.java362
-rw-r--r--plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.property.xtext/src-gen/org/eclipse/papyrus/uml/textedit/property/xtext/umlProperty/impl/TypeRuleImpl.java550
-rw-r--r--plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.property.xtext/src-gen/org/eclipse/papyrus/uml/textedit/property/xtext/umlProperty/impl/UmlPropertyFactoryImpl.java893
-rw-r--r--plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.property.xtext/src-gen/org/eclipse/papyrus/uml/textedit/property/xtext/umlProperty/impl/UmlPropertyPackageImpl.java2014
-rw-r--r--plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.property.xtext/src-gen/org/eclipse/papyrus/uml/textedit/property/xtext/umlProperty/impl/ValueImpl.java88
-rw-r--r--plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.property.xtext/src-gen/org/eclipse/papyrus/uml/textedit/property/xtext/umlProperty/impl/VisibilityRuleImpl.java370
-rw-r--r--plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.property.xtext/src-gen/org/eclipse/papyrus/uml/textedit/property/xtext/umlProperty/util/UmlPropertyAdapterFactory.java988
-rw-r--r--plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.property.xtext/src-gen/org/eclipse/papyrus/uml/textedit/property/xtext/umlProperty/util/UmlPropertySwitch.java1105
-rw-r--r--plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.property.xtext/src-gen/org/eclipse/papyrus/uml/textedit/property/xtext/validation/AbstractUmlPropertyJavaValidator.java44
-rw-r--r--plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.property.xtext/src/org/eclipse/papyrus/uml/textedit/property/xtext/UmlProperty.xtext4
-rw-r--r--plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.valuespecification.xtext/.launch/Generate Language Infrastructure (org.eclipse.papyrus.uml.textedit.port.xtext).launch4
-rw-r--r--plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.valuespecification.xtext/.launch/Launch Runtime Eclipse.launch4
-rw-r--r--plugins/uml/tools/org.eclipse.papyrus.uml.tools.utils/src/org/eclipse/papyrus/uml/tools/utils/ICustomAppearance.java5
-rw-r--r--plugins/uml/tools/org.eclipse.papyrus.uml.tools.utils/src/org/eclipse/papyrus/uml/tools/utils/MultiplicityElementUtil.java92
-rw-r--r--plugins/uml/tools/org.eclipse.papyrus.uml.tools.utils/src/org/eclipse/papyrus/uml/tools/utils/PropertyUtil.java3
-rw-r--r--plugins/uml/tools/org.eclipse.papyrus.uml.tools/src/org/eclipse/papyrus/uml/tools/providers/UMLLabelProvider.java107
-rw-r--r--plugins/uml/xtext/org.eclipse.papyrus.uml.xtext.integration.ui/META-INF/MANIFEST.MF69
-rw-r--r--plugins/uml/xtext/org.eclipse.papyrus.uml.xtext.integration.ui/src/org/eclipse/papyrus/uml/xtext/integration/MultiplicityXTextParserUtils.java239
-rw-r--r--plugins/views/modelexplorer/org.eclipse.papyrus.views.modelexplorer/src/org/eclipse/papyrus/views/modelexplorer/handler/RedoHandler.java13
-rw-r--r--plugins/views/modelexplorer/org.eclipse.papyrus.views.modelexplorer/src/org/eclipse/papyrus/views/modelexplorer/handler/UndoHandler.java13
-rw-r--r--releng/extras/category.xml8
-rw-r--r--releng/org.eclipse.papyrus.oomph/setups/papyrus.setup6057
-rw-r--r--releng/top-pom-dev.xml22
-rw-r--r--releng/top-pom-extra-tests.xml610
-rw-r--r--releng/top-pom-extras.xml1142
-rwxr-xr-x[-rw-r--r--]releng/top-pom-main-tests.xml22
-rwxr-xr-x[-rw-r--r--]releng/top-pom-main.xml1762
-rwxr-xr-xreleng/top-pom-rcp.xml18
-rw-r--r--tests/junit/extraplugins/cdo/org.eclipse.papyrus.cdo.core.tests/src/org/eclipse/papyrus/cdo/internal/core/importer/tests/ModelImporterTest.java2
-rw-r--r--tests/junit/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.canonical.tests/src/org/eclipse/papyrus/infra/gmfdiag/canonical/tests/CSSCanonicalStateInClassDiagramTest.java3
-rw-r--r--tests/junit/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.canonical.tests/src/org/eclipse/papyrus/infra/gmfdiag/canonical/tests/CSSExternalStylesheetInClassDiagramTest.java1
-rw-r--r--tests/junit/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common.tests/fragment.xml6
-rw-r--r--tests/junit/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common.tests/models/sync/sync-test.di2
-rw-r--r--tests/junit/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common.tests/models/sync/sync-test.notation193
-rw-r--r--tests/junit/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common.tests/models/sync/sync-test.uml16
-rw-r--r--tests/junit/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common.tests/org.eclipse.papyrus.infra.gmfdiag.common.tests.launch92
-rw-r--r--tests/junit/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common.tests/src/org/eclipse/papyrus/infra/gmfdiag/common/sync/tests/MasterSlaveNotationSyncTest.java290
-rw-r--r--tests/junit/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common.tests/src/org/eclipse/papyrus/infra/gmfdiag/common/sync/tests/NotationSyncOverrideTest.java200
-rw-r--r--tests/junit/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common.tests/src/org/eclipse/papyrus/infra/gmfdiag/common/sync/tests/SyncTests.java34
-rw-r--r--tests/junit/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common.tests/src/org/eclipse/papyrus/infra/gmfdiag/common/sync/tests/TestSyncFixture.java212
-rw-r--r--tests/junit/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common.tests/src/org/eclipse/papyrus/infra/gmfdiag/common/tests/AllTests.java28
-rw-r--r--tests/junit/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.css.tests/resources/model/namedElementsTest/model.di (renamed from plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.canonical/resource/model.di)0
-rw-r--r--tests/junit/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.css.tests/resources/model/namedElementsTest/model.notation194
-rw-r--r--tests/junit/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.css.tests/resources/model/namedElementsTest/model.uml30
-rw-r--r--tests/junit/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.css.tests/src/org/eclipse/papyrus/infra/gmfdiag/css/tests/tests/AllTests.java3
-rw-r--r--tests/junit/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.css.tests/src/org/eclipse/papyrus/infra/gmfdiag/css/tests/tests/CSSNamedElementsTest.java120
-rw-r--r--tests/junit/plugins/junit/org.eclipse.papyrus.junit.utils/src/org/eclipse/papyrus/junit/utils/rules/PapyrusEditorFixture.java222
-rw-r--r--tests/junit/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.blockdefinition.tests/org.eclipse.papyrus.sysml.diagram.blockdefinition.tests.launch87
-rw-r--r--tests/junit/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.internalblock.tests/org.eclipse.papyrus.sysml.diagram.internalblock.tests.launch87
-rw-r--r--tests/junit/plugins/uml/alf/org.eclipse.papyrus.uml.alf.tests/src/org/eclipse/papyrus/uml/alf/tests/generator/GenerationTest.xtend3
-rw-r--r--tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity.tests/src/org/eclipse/papyrus/uml/diagram/activity/tests/canonical/AbstractPapyrusTestCase.java30
-rw-r--r--tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity.tests/src/org/eclipse/papyrus/uml/diagram/activity/tests/canonical/TestSemanticContainerFeature.java34
-rw-r--r--tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz.tests/org.eclipse.papyrus.uml.diagram.clazz.tests.launch (renamed from tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz.tests/org.eclipse.papyrus.diagram.clazz.test.launch)95
-rw-r--r--tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz.tests/test/org/eclipse/papyrus/uml/diagram/clazz/test/canonical/TestListCompartmentNodesChildDuplicates.java3
-rw-r--r--tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common.tests/resources/418509/model.notation198
-rw-r--r--tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common.tests/resources/418509/model.uml14
-rw-r--r--tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common.tests/src/org/eclipse/papyrus/uml/diagram/common/tests/tests/Bug418509_ReorientationAssociation.java31
-rw-r--r--tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component.tests/src/org/eclipse/papyrus/uml/diagram/component/test/canonical/TestComponentDiagramCommentLink.java2
-rw-r--r--tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component.tests/src/org/eclipse/papyrus/uml/diagram/component/test/canonical/TestComponentDiagramConstraintLink.java2
-rw-r--r--tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component.tests/src/org/eclipse/papyrus/uml/diagram/component/test/canonical/TestListCompartmentNodeChildDuplicates.java5
-rw-r--r--tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment.tests/src/org/eclipse/papyrus/uml/diagram/deployment/test/canonical/AbstractPapyrusTestCase.java9
-rw-r--r--tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment.tests/src/org/eclipse/papyrus/uml/diagram/deployment/test/canonical/AllCanonicalTests.java3
-rw-r--r--tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment.tests/src/org/eclipse/papyrus/uml/diagram/deployment/test/canonical/TestDeploymentDiagramForNodeChildNode.java1
-rw-r--r--tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment.tests/src/org/eclipse/papyrus/uml/diagram/deployment/test/canonical/TestSemantics.java584
-rw-r--r--tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.interactionoverview.tests/org.eclipse.papyrus.uml.diagram.interactionoverview.tests.launch3
-rw-r--r--tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile.tests/src/org/eclipse/papyrus/uml/diagram/profile/tests/canonical/AllCanonicalTests.java2
-rw-r--r--tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile.tests/src/org/eclipse/papyrus/uml/diagram/profile/tests/canonical/TestImportMetaClass.java134
-rw-r--r--tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile.tests/src/org/eclipse/papyrus/uml/diagram/profile/tests/canonical/TestProfileDiagramExtension.java164
-rw-r--r--tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine.tests/src/org/eclipse/papyrus/uml/diagram/statemachine/tests/canonical/BaseTestCase.java40
-rw-r--r--tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine.tests/src/org/eclipse/papyrus/uml/diagram/statemachine/tests/canonical/TestSemantic.java93
-rw-r--r--tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.tests/src/org/eclipse/papyrus/uml/diagram/tests/canonical/AbstractPapyrusSemanticTestCase.java87
-rw-r--r--tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.tests/src/org/eclipse/papyrus/uml/diagram/tests/canonical/TestCommentLink.java4
-rw-r--r--tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.tests/src/org/eclipse/papyrus/uml/diagram/tests/canonical/TestConstraintLink.java4
-rw-r--r--tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.clazz.config.tests/src/org/eclipse/papyrus/uml/nattable/clazz/config/tests/tests/AllTests.java122
-rw-r--r--tests/junit/plugins/uml/profile/org.eclipse.papyrus.uml.profile.drafter.tests/META-INF/MANIFEST.MF3
-rw-r--r--tests/junit/plugins/uml/profile/org.eclipse.papyrus.uml.profile.drafter.tests/build.properties2
-rw-r--r--tests/junit/plugins/uml/profile/org.eclipse.papyrus.uml.profile.drafter.tests/src/org/eclipse/papyrus/uml/profile/drafter/tests/EclipseProject.java27
-rw-r--r--tests/junit/plugins/uml/profile/org.eclipse.papyrus.uml.profile.drafter.tests/src/org/eclipse/papyrus/uml/profile/drafter/tests/TracesRecorder.java3
-rw-r--r--tests/junit/plugins/uml/profile/org.eclipse.papyrus.uml.profile.drafter.tests/test/org/eclipse/papyrus/uml/profile/drafter/tests/AbstractDrafterTest.java70
-rw-r--r--tests/junit/plugins/uml/profile/org.eclipse.papyrus.uml.profile.drafter.tests/test/org/eclipse/papyrus/uml/profile/drafter/tests/AllTests.java1
-rw-r--r--tests/junit/plugins/uml/profile/org.eclipse.papyrus.uml.profile.drafter.tests/test/org/eclipse/papyrus/uml/profile/drafter/tests/EclipseProjectTest.java7
-rw-r--r--tests/junit/plugins/uml/profile/org.eclipse.papyrus.uml.profile.drafter.tests/test/org/eclipse/papyrus/uml/profile/drafter/tests/ModelSetManagerTest.java64
-rw-r--r--tests/junit/plugins/uml/profile/org.eclipse.papyrus.uml.profile.drafter.tests/test/org/eclipse/papyrus/uml/profile/drafter/tests/ProfileCatalogTest.java (renamed from tests/junit/plugins/uml/profile/org.eclipse.papyrus.uml.profile.drafter.tests/test/org/eclipse/papyrus/uml/profile/drafter/ProfileCatalogTest.java)63
-rw-r--r--tests/junit/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.port.tests/src/org/eclipse/papyrus/uml/textedit/port/tests/suites/PortGrammarTests.java252
-rw-r--r--tests/junit/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.property.tests/PropertyGrammarTests.launch88
-rw-r--r--tests/junit/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.property.tests/src/org/eclipse/papyrus/uml/textedit/property/tests/suites/PropertyGrammarTests.java238
-rw-r--r--tests/recipes/extraplugins/uml/org.eclipse.papyrus.req.reqif.test/models/re-import/addedSubReq/specObject_2.reqif95
-rw-r--r--tests/recipes/extraplugins/uml/org.eclipse.papyrus.req.reqif.test/models/re-import/addedSubReqWithLinks/ReqTypeProfile.profile.uml255
-rw-r--r--tests/recipes/extraplugins/uml/org.eclipse.papyrus.req.reqif.test/models/re-import/addedSubReqWithLinks/Result-ReimportSpecObject.di2
-rw-r--r--tests/recipes/extraplugins/uml/org.eclipse.papyrus.req.reqif.test/models/re-import/addedSubReqWithLinks/Result-ReimportSpecObject.notation2
-rw-r--r--tests/recipes/extraplugins/uml/org.eclipse.papyrus.req.reqif.test/models/re-import/addedSubReqWithLinks/Result-ReimportSpecObject.uml112
-rw-r--r--tests/recipes/extraplugins/uml/org.eclipse.papyrus.req.reqif.test/models/re-import/addedSubReqWithLinks/importSpecObject.di2
-rw-r--r--tests/recipes/extraplugins/uml/org.eclipse.papyrus.req.reqif.test/models/re-import/addedSubReqWithLinks/importSpecObject.notation523
-rw-r--r--tests/recipes/extraplugins/uml/org.eclipse.papyrus.req.reqif.test/models/re-import/addedSubReqWithLinks/importSpecObject.uml124
-rw-r--r--tests/recipes/extraplugins/uml/org.eclipse.papyrus.req.reqif.test/models/re-import/addedSubReqWithLinks/specObject_1.reqif573
-rw-r--r--tests/recipes/extraplugins/uml/org.eclipse.papyrus.req.reqif.test/models/re-import/addedSubReqWithLinks/specObject_2.reqif707
663 files changed, 152619 insertions, 156395 deletions
diff --git a/extraplugins/adl4eclipse/org.eclipse.papyrus.adl4eclipse.profile/.settings/org.eclipse.jdt.core.prefs b/extraplugins/adl4eclipse/org.eclipse.papyrus.adl4eclipse.profile/.settings/org.eclipse.jdt.core.prefs
index 44217f8c068..4759947300a 100644
--- a/extraplugins/adl4eclipse/org.eclipse.papyrus.adl4eclipse.profile/.settings/org.eclipse.jdt.core.prefs
+++ b/extraplugins/adl4eclipse/org.eclipse.papyrus.adl4eclipse.profile/.settings/org.eclipse.jdt.core.prefs
@@ -5,3 +5,287 @@ org.eclipse.jdt.core.compiler.compliance=1.5
org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
org.eclipse.jdt.core.compiler.source=1.5
+org.eclipse.jdt.core.formatter.align_type_members_on_columns=false
+org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression=16
+org.eclipse.jdt.core.formatter.alignment_for_arguments_in_annotation=0
+org.eclipse.jdt.core.formatter.alignment_for_arguments_in_enum_constant=16
+org.eclipse.jdt.core.formatter.alignment_for_arguments_in_explicit_constructor_call=16
+org.eclipse.jdt.core.formatter.alignment_for_arguments_in_method_invocation=16
+org.eclipse.jdt.core.formatter.alignment_for_arguments_in_qualified_allocation_expression=16
+org.eclipse.jdt.core.formatter.alignment_for_assignment=0
+org.eclipse.jdt.core.formatter.alignment_for_binary_expression=16
+org.eclipse.jdt.core.formatter.alignment_for_compact_if=16
+org.eclipse.jdt.core.formatter.alignment_for_conditional_expression=80
+org.eclipse.jdt.core.formatter.alignment_for_enum_constants=0
+org.eclipse.jdt.core.formatter.alignment_for_expressions_in_array_initializer=16
+org.eclipse.jdt.core.formatter.alignment_for_method_declaration=0
+org.eclipse.jdt.core.formatter.alignment_for_multiple_fields=16
+org.eclipse.jdt.core.formatter.alignment_for_parameters_in_constructor_declaration=16
+org.eclipse.jdt.core.formatter.alignment_for_parameters_in_method_declaration=16
+org.eclipse.jdt.core.formatter.alignment_for_resources_in_try=80
+org.eclipse.jdt.core.formatter.alignment_for_selector_in_method_invocation=16
+org.eclipse.jdt.core.formatter.alignment_for_superclass_in_type_declaration=16
+org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_enum_declaration=16
+org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_type_declaration=16
+org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_constructor_declaration=16
+org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_method_declaration=16
+org.eclipse.jdt.core.formatter.alignment_for_union_type_in_multicatch=16
+org.eclipse.jdt.core.formatter.blank_lines_after_imports=1
+org.eclipse.jdt.core.formatter.blank_lines_after_package=1
+org.eclipse.jdt.core.formatter.blank_lines_before_field=0
+org.eclipse.jdt.core.formatter.blank_lines_before_first_class_body_declaration=0
+org.eclipse.jdt.core.formatter.blank_lines_before_imports=1
+org.eclipse.jdt.core.formatter.blank_lines_before_member_type=1
+org.eclipse.jdt.core.formatter.blank_lines_before_method=1
+org.eclipse.jdt.core.formatter.blank_lines_before_new_chunk=1
+org.eclipse.jdt.core.formatter.blank_lines_before_package=0
+org.eclipse.jdt.core.formatter.blank_lines_between_import_groups=1
+org.eclipse.jdt.core.formatter.blank_lines_between_type_declarations=1
+org.eclipse.jdt.core.formatter.brace_position_for_annotation_type_declaration=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_anonymous_type_declaration=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_array_initializer=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_block=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_block_in_case=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_constructor_declaration=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_enum_constant=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_enum_declaration=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_lambda_body=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_method_declaration=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_switch=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_type_declaration=end_of_line
+org.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_block_comment=false
+org.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_javadoc_comment=false
+org.eclipse.jdt.core.formatter.comment.format_block_comments=true
+org.eclipse.jdt.core.formatter.comment.format_header=false
+org.eclipse.jdt.core.formatter.comment.format_html=true
+org.eclipse.jdt.core.formatter.comment.format_javadoc_comments=true
+org.eclipse.jdt.core.formatter.comment.format_line_comments=true
+org.eclipse.jdt.core.formatter.comment.format_source_code=true
+org.eclipse.jdt.core.formatter.comment.indent_parameter_description=true
+org.eclipse.jdt.core.formatter.comment.indent_root_tags=true
+org.eclipse.jdt.core.formatter.comment.insert_new_line_before_root_tags=insert
+org.eclipse.jdt.core.formatter.comment.insert_new_line_for_parameter=insert
+org.eclipse.jdt.core.formatter.comment.line_length=260
+org.eclipse.jdt.core.formatter.comment.new_lines_at_block_boundaries=true
+org.eclipse.jdt.core.formatter.comment.new_lines_at_javadoc_boundaries=true
+org.eclipse.jdt.core.formatter.comment.preserve_white_space_between_code_and_line_comments=false
+org.eclipse.jdt.core.formatter.compact_else_if=true
+org.eclipse.jdt.core.formatter.continuation_indentation=2
+org.eclipse.jdt.core.formatter.continuation_indentation_for_array_initializer=2
+org.eclipse.jdt.core.formatter.disabling_tag=@formatter\:off
+org.eclipse.jdt.core.formatter.enabling_tag=@formatter\:on
+org.eclipse.jdt.core.formatter.format_guardian_clause_on_one_line=false
+org.eclipse.jdt.core.formatter.format_line_comment_starting_on_first_column=true
+org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_annotation_declaration_header=true
+org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_enum_constant_header=true
+org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_enum_declaration_header=true
+org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_type_header=true
+org.eclipse.jdt.core.formatter.indent_breaks_compare_to_cases=true
+org.eclipse.jdt.core.formatter.indent_empty_lines=false
+org.eclipse.jdt.core.formatter.indent_statements_compare_to_block=true
+org.eclipse.jdt.core.formatter.indent_statements_compare_to_body=true
+org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_cases=true
+org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_switch=false
+org.eclipse.jdt.core.formatter.indentation.size=4
+org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_field=insert
+org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_local_variable=insert
+org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_method=insert
+org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_package=insert
+org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_parameter=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_type=insert
+org.eclipse.jdt.core.formatter.insert_new_line_after_label=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_after_opening_brace_in_array_initializer=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_after_type_annotation=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_at_end_of_file_if_missing=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_before_catch_in_try_statement=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_before_closing_brace_in_array_initializer=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_before_else_in_if_statement=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_before_finally_in_try_statement=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_before_while_in_do_statement=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_in_empty_annotation_declaration=insert
+org.eclipse.jdt.core.formatter.insert_new_line_in_empty_anonymous_type_declaration=insert
+org.eclipse.jdt.core.formatter.insert_new_line_in_empty_block=insert
+org.eclipse.jdt.core.formatter.insert_new_line_in_empty_enum_constant=insert
+org.eclipse.jdt.core.formatter.insert_new_line_in_empty_enum_declaration=insert
+org.eclipse.jdt.core.formatter.insert_new_line_in_empty_method_body=insert
+org.eclipse.jdt.core.formatter.insert_new_line_in_empty_type_declaration=insert
+org.eclipse.jdt.core.formatter.insert_space_after_and_in_type_parameter=insert
+org.eclipse.jdt.core.formatter.insert_space_after_assignment_operator=insert
+org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation_type_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_binary_operator=insert
+org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_arguments=insert
+org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_parameters=insert
+org.eclipse.jdt.core.formatter.insert_space_after_closing_brace_in_block=insert
+org.eclipse.jdt.core.formatter.insert_space_after_closing_paren_in_cast=insert
+org.eclipse.jdt.core.formatter.insert_space_after_colon_in_assert=insert
+org.eclipse.jdt.core.formatter.insert_space_after_colon_in_case=insert
+org.eclipse.jdt.core.formatter.insert_space_after_colon_in_conditional=insert
+org.eclipse.jdt.core.formatter.insert_space_after_colon_in_for=insert
+org.eclipse.jdt.core.formatter.insert_space_after_colon_in_labeled_statement=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_allocation_expression=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_annotation=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_array_initializer=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_constructor_declaration_parameters=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_constructor_declaration_throws=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_enum_constant_arguments=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_enum_declarations=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_explicitconstructorcall_arguments=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_for_increments=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_for_inits=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_declaration_parameters=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_declaration_throws=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_invocation_arguments=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_multiple_field_declarations=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_multiple_local_declarations=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_parameterized_type_reference=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_superinterfaces=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_arguments=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_parameters=insert
+org.eclipse.jdt.core.formatter.insert_space_after_ellipsis=insert
+org.eclipse.jdt.core.formatter.insert_space_after_lambda_arrow=insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_parameterized_type_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_arguments=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_parameters=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_brace_in_array_initializer=insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_bracket_in_array_allocation_expression=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_bracket_in_array_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_annotation=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_cast=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_catch=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_constructor_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_enum_constant=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_for=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_if=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_method_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_method_invocation=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_parenthesized_expression=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_switch=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_synchronized=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_try=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_while=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_postfix_operator=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_prefix_operator=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_question_in_conditional=insert
+org.eclipse.jdt.core.formatter.insert_space_after_question_in_wildcard=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_semicolon_in_for=insert
+org.eclipse.jdt.core.formatter.insert_space_after_semicolon_in_try_resources=insert
+org.eclipse.jdt.core.formatter.insert_space_after_unary_operator=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_and_in_type_parameter=insert
+org.eclipse.jdt.core.formatter.insert_space_before_assignment_operator=insert
+org.eclipse.jdt.core.formatter.insert_space_before_at_in_annotation_type_declaration=insert
+org.eclipse.jdt.core.formatter.insert_space_before_binary_operator=insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_parameterized_type_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_arguments=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_parameters=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_brace_in_array_initializer=insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_bracket_in_array_allocation_expression=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_bracket_in_array_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_annotation=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_cast=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_catch=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_constructor_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_enum_constant=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_for=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_if=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_method_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_method_invocation=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_parenthesized_expression=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_switch=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_synchronized=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_try=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_while=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_colon_in_assert=insert
+org.eclipse.jdt.core.formatter.insert_space_before_colon_in_case=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_colon_in_conditional=insert
+org.eclipse.jdt.core.formatter.insert_space_before_colon_in_default=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_colon_in_for=insert
+org.eclipse.jdt.core.formatter.insert_space_before_colon_in_labeled_statement=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_allocation_expression=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_annotation=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_array_initializer=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_constructor_declaration_parameters=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_constructor_declaration_throws=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_enum_constant_arguments=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_enum_declarations=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_explicitconstructorcall_arguments=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_for_increments=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_for_inits=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_declaration_parameters=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_declaration_throws=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_invocation_arguments=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_multiple_field_declarations=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_multiple_local_declarations=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_parameterized_type_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_superinterfaces=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_arguments=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_parameters=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_ellipsis=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_lambda_arrow=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_parameterized_type_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_arguments=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_parameters=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_annotation_type_declaration=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_anonymous_type_declaration=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_array_initializer=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_block=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_constructor_declaration=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_enum_constant=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_enum_declaration=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_method_declaration=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_switch=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_type_declaration=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_allocation_expression=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_type_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_annotation=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_annotation_type_member_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_catch=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_constructor_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_enum_constant=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_for=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_if=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_method_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_method_invocation=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_parenthesized_expression=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_switch=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_synchronized=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_try=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_while=insert
+org.eclipse.jdt.core.formatter.insert_space_before_parenthesized_expression_in_return=insert
+org.eclipse.jdt.core.formatter.insert_space_before_parenthesized_expression_in_throw=insert
+org.eclipse.jdt.core.formatter.insert_space_before_postfix_operator=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_prefix_operator=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_question_in_conditional=insert
+org.eclipse.jdt.core.formatter.insert_space_before_question_in_wildcard=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_semicolon=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_semicolon_in_for=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_semicolon_in_try_resources=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_unary_operator=do not insert
+org.eclipse.jdt.core.formatter.insert_space_between_brackets_in_array_type_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_between_empty_braces_in_array_initializer=do not insert
+org.eclipse.jdt.core.formatter.insert_space_between_empty_brackets_in_array_allocation_expression=do not insert
+org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_annotation_type_member_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_constructor_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_enum_constant=do not insert
+org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_invocation=do not insert
+org.eclipse.jdt.core.formatter.join_lines_in_comments=false
+org.eclipse.jdt.core.formatter.join_wrapped_lines=false
+org.eclipse.jdt.core.formatter.keep_else_statement_on_same_line=false
+org.eclipse.jdt.core.formatter.keep_empty_array_initializer_on_one_line=false
+org.eclipse.jdt.core.formatter.keep_imple_if_on_one_line=false
+org.eclipse.jdt.core.formatter.keep_then_statement_on_same_line=false
+org.eclipse.jdt.core.formatter.lineSplit=260
+org.eclipse.jdt.core.formatter.never_indent_block_comments_on_first_column=false
+org.eclipse.jdt.core.formatter.never_indent_line_comments_on_first_column=false
+org.eclipse.jdt.core.formatter.number_of_blank_lines_at_beginning_of_method_body=0
+org.eclipse.jdt.core.formatter.number_of_empty_lines_to_preserve=5
+org.eclipse.jdt.core.formatter.put_empty_statement_on_new_line=true
+org.eclipse.jdt.core.formatter.tabulation.char=tab
+org.eclipse.jdt.core.formatter.tabulation.size=4
+org.eclipse.jdt.core.formatter.use_on_off_tags=false
+org.eclipse.jdt.core.formatter.use_tabs_only_for_leading_indentations=false
+org.eclipse.jdt.core.formatter.wrap_before_binary_operator=true
+org.eclipse.jdt.core.formatter.wrap_before_or_operator_multicatch=true
+org.eclipse.jdt.core.formatter.wrap_outer_expressions_when_nested=true
diff --git a/extraplugins/adl4eclipse/org.eclipse.papyrus.adl4eclipse.profile/.settings/org.eclipse.jdt.ui.prefs b/extraplugins/adl4eclipse/org.eclipse.papyrus.adl4eclipse.profile/.settings/org.eclipse.jdt.ui.prefs
new file mode 100644
index 00000000000..954281dbc31
--- /dev/null
+++ b/extraplugins/adl4eclipse/org.eclipse.papyrus.adl4eclipse.profile/.settings/org.eclipse.jdt.ui.prefs
@@ -0,0 +1,68 @@
+cleanup.add_default_serial_version_id=true
+cleanup.add_generated_serial_version_id=false
+cleanup.add_missing_annotations=true
+cleanup.add_missing_deprecated_annotations=true
+cleanup.add_missing_methods=false
+cleanup.add_missing_nls_tags=false
+cleanup.add_missing_override_annotations=true
+cleanup.add_missing_override_annotations_interface_methods=true
+cleanup.add_serial_version_id=false
+cleanup.always_use_blocks=true
+cleanup.always_use_parentheses_in_expressions=false
+cleanup.always_use_this_for_non_static_field_access=false
+cleanup.always_use_this_for_non_static_method_access=false
+cleanup.convert_functional_interfaces=false
+cleanup.convert_to_enhanced_for_loop=false
+cleanup.correct_indentation=false
+cleanup.format_source_code=false
+cleanup.format_source_code_changes_only=false
+cleanup.insert_inferred_type_arguments=false
+cleanup.make_local_variable_final=true
+cleanup.make_parameters_final=false
+cleanup.make_private_fields_final=true
+cleanup.make_type_abstract_if_missing_method=false
+cleanup.make_variable_declarations_final=false
+cleanup.never_use_blocks=false
+cleanup.never_use_parentheses_in_expressions=true
+cleanup.organize_imports=false
+cleanup.qualify_static_field_accesses_with_declaring_class=false
+cleanup.qualify_static_member_accesses_through_instances_with_declaring_class=true
+cleanup.qualify_static_member_accesses_through_subtypes_with_declaring_class=true
+cleanup.qualify_static_member_accesses_with_declaring_class=true
+cleanup.qualify_static_method_accesses_with_declaring_class=false
+cleanup.remove_private_constructors=true
+cleanup.remove_redundant_type_arguments=true
+cleanup.remove_trailing_whitespaces=true
+cleanup.remove_trailing_whitespaces_all=true
+cleanup.remove_trailing_whitespaces_ignore_empty=false
+cleanup.remove_unnecessary_casts=true
+cleanup.remove_unnecessary_nls_tags=true
+cleanup.remove_unused_imports=true
+cleanup.remove_unused_local_variables=false
+cleanup.remove_unused_private_fields=true
+cleanup.remove_unused_private_members=false
+cleanup.remove_unused_private_methods=true
+cleanup.remove_unused_private_types=true
+cleanup.sort_members=false
+cleanup.sort_members_all=false
+cleanup.use_anonymous_class_creation=false
+cleanup.use_blocks=true
+cleanup.use_blocks_only_for_return_and_throw=false
+cleanup.use_lambda=true
+cleanup.use_parentheses_in_expressions=false
+cleanup.use_this_for_non_static_field_access=false
+cleanup.use_this_for_non_static_field_access_only_if_necessary=true
+cleanup.use_this_for_non_static_method_access=false
+cleanup.use_this_for_non_static_method_access_only_if_necessary=true
+cleanup.use_type_arguments=false
+cleanup_profile=_Papyrus
+cleanup_settings_version=2
+eclipse.preferences.version=1
+formatter_profile=_Papyrus
+formatter_settings_version=12
+org.eclipse.jdt.ui.ignorelowercasenames=true
+org.eclipse.jdt.ui.importorder=java;javax;org;com;
+org.eclipse.jdt.ui.javadoc=true
+org.eclipse.jdt.ui.ondemandthreshold=99
+org.eclipse.jdt.ui.staticondemandthreshold=99
+org.eclipse.jdt.ui.text.custom_code_templates=<?xml version\="1.0" encoding\="UTF-8" standalone\="no"?><templates><template autoinsert\="true" context\="gettercomment_context" deleted\="false" description\="Comment for getter method" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.gettercomment" name\="gettercomment">/**\n * @return the ${bare_field_name}\n */</template><template autoinsert\="true" context\="settercomment_context" deleted\="false" description\="Comment for setter method" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.settercomment" name\="settercomment">/**\n * @param ${param} the ${bare_field_name} to set\n */</template><template autoinsert\="false" context\="constructorcomment_context" deleted\="false" description\="Comment for created constructors" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.constructorcomment" name\="constructorcomment">/**\n * Constructor.\n *\n * ${tags}\n */</template><template autoinsert\="false" context\="filecomment_context" deleted\="false" description\="Comment for created Java files" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.filecomment" name\="filecomment">/*****************************************************************************\n * Copyright (c) ${year} CEA LIST and others.\n * \n * All rights reserved. This program and the accompanying materials\n * are made available under the terms of the Eclipse Public License v1.0\n * which accompanies this distribution, and is available at\n * http\://www.eclipse.org/legal/epl-v10.html\n *\n * Contributors\:\n * CEA LIST - Initial API and implementation\n * \n *****************************************************************************/\n</template><template autoinsert\="true" context\="typecomment_context" deleted\="false" description\="Comment for created types" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.typecomment" name\="typecomment">/**\n * @author ${user}\n *\n * ${tags}\n */</template><template autoinsert\="true" context\="fieldcomment_context" deleted\="false" description\="Comment for fields" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.fieldcomment" name\="fieldcomment">/**\n * \n */</template><template autoinsert\="true" context\="methodcomment_context" deleted\="false" description\="Comment for non-overriding methods" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.methodcomment" name\="methodcomment">/**\n * ${tags}\n */</template><template autoinsert\="false" context\="overridecomment_context" deleted\="false" description\="Comment for overriding methods" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.overridecomment" name\="overridecomment">/**\n * ${see_to_overridden}\n *\n * ${tags}\n */</template><template autoinsert\="false" context\="delegatecomment_context" deleted\="false" description\="Comment for delegate methods" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.delegatecomment" name\="delegatecomment">/**\n * ${see_to_target}\n *\n * ${tags}\n */</template><template autoinsert\="true" context\="newtype_context" deleted\="false" description\="Newly created files" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.newtype" name\="newtype">${filecomment}\n${package_declaration}\n\n${typecomment}\n${type_declaration}</template><template autoinsert\="true" context\="classbody_context" deleted\="false" description\="Code in new class type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.classbody" name\="classbody">\n</template><template autoinsert\="true" context\="interfacebody_context" deleted\="false" description\="Code in new interface type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.interfacebody" name\="interfacebody">\n</template><template autoinsert\="true" context\="enumbody_context" deleted\="false" description\="Code in new enum type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.enumbody" name\="enumbody">\n</template><template autoinsert\="true" context\="annotationbody_context" deleted\="false" description\="Code in new annotation type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.annotationbody" name\="annotationbody">\n</template><template autoinsert\="true" context\="catchblock_context" deleted\="false" description\="Code in new catch blocks" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.catchblock" name\="catchblock">// ${todo} Auto-generated catch block\n${exception_var}.printStackTrace();</template><template autoinsert\="true" context\="methodbody_context" deleted\="false" description\="Code in created method stubs" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.methodbody" name\="methodbody">// ${todo} Auto-generated method stub\n${body_statement}</template><template autoinsert\="true" context\="constructorbody_context" deleted\="false" description\="Code in created constructor stubs" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.constructorbody" name\="constructorbody">${body_statement}\n// ${todo} Auto-generated constructor stub</template><template autoinsert\="true" context\="getterbody_context" deleted\="false" description\="Code in created getters" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.getterbody" name\="getterbody">return ${field};</template><template autoinsert\="true" context\="setterbody_context" deleted\="false" description\="Code in created setters" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.setterbody" name\="setterbody">${field} \= ${param};</template></templates>
diff --git a/extraplugins/adl4eclipse/org.eclipse.papyrus.osgi.profile/.settings/org.eclipse.jdt.core.prefs b/extraplugins/adl4eclipse/org.eclipse.papyrus.osgi.profile/.settings/org.eclipse.jdt.core.prefs
index 44217f8c068..4759947300a 100644
--- a/extraplugins/adl4eclipse/org.eclipse.papyrus.osgi.profile/.settings/org.eclipse.jdt.core.prefs
+++ b/extraplugins/adl4eclipse/org.eclipse.papyrus.osgi.profile/.settings/org.eclipse.jdt.core.prefs
@@ -5,3 +5,287 @@ org.eclipse.jdt.core.compiler.compliance=1.5
org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
org.eclipse.jdt.core.compiler.source=1.5
+org.eclipse.jdt.core.formatter.align_type_members_on_columns=false
+org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression=16
+org.eclipse.jdt.core.formatter.alignment_for_arguments_in_annotation=0
+org.eclipse.jdt.core.formatter.alignment_for_arguments_in_enum_constant=16
+org.eclipse.jdt.core.formatter.alignment_for_arguments_in_explicit_constructor_call=16
+org.eclipse.jdt.core.formatter.alignment_for_arguments_in_method_invocation=16
+org.eclipse.jdt.core.formatter.alignment_for_arguments_in_qualified_allocation_expression=16
+org.eclipse.jdt.core.formatter.alignment_for_assignment=0
+org.eclipse.jdt.core.formatter.alignment_for_binary_expression=16
+org.eclipse.jdt.core.formatter.alignment_for_compact_if=16
+org.eclipse.jdt.core.formatter.alignment_for_conditional_expression=80
+org.eclipse.jdt.core.formatter.alignment_for_enum_constants=0
+org.eclipse.jdt.core.formatter.alignment_for_expressions_in_array_initializer=16
+org.eclipse.jdt.core.formatter.alignment_for_method_declaration=0
+org.eclipse.jdt.core.formatter.alignment_for_multiple_fields=16
+org.eclipse.jdt.core.formatter.alignment_for_parameters_in_constructor_declaration=16
+org.eclipse.jdt.core.formatter.alignment_for_parameters_in_method_declaration=16
+org.eclipse.jdt.core.formatter.alignment_for_resources_in_try=80
+org.eclipse.jdt.core.formatter.alignment_for_selector_in_method_invocation=16
+org.eclipse.jdt.core.formatter.alignment_for_superclass_in_type_declaration=16
+org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_enum_declaration=16
+org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_type_declaration=16
+org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_constructor_declaration=16
+org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_method_declaration=16
+org.eclipse.jdt.core.formatter.alignment_for_union_type_in_multicatch=16
+org.eclipse.jdt.core.formatter.blank_lines_after_imports=1
+org.eclipse.jdt.core.formatter.blank_lines_after_package=1
+org.eclipse.jdt.core.formatter.blank_lines_before_field=0
+org.eclipse.jdt.core.formatter.blank_lines_before_first_class_body_declaration=0
+org.eclipse.jdt.core.formatter.blank_lines_before_imports=1
+org.eclipse.jdt.core.formatter.blank_lines_before_member_type=1
+org.eclipse.jdt.core.formatter.blank_lines_before_method=1
+org.eclipse.jdt.core.formatter.blank_lines_before_new_chunk=1
+org.eclipse.jdt.core.formatter.blank_lines_before_package=0
+org.eclipse.jdt.core.formatter.blank_lines_between_import_groups=1
+org.eclipse.jdt.core.formatter.blank_lines_between_type_declarations=1
+org.eclipse.jdt.core.formatter.brace_position_for_annotation_type_declaration=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_anonymous_type_declaration=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_array_initializer=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_block=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_block_in_case=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_constructor_declaration=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_enum_constant=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_enum_declaration=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_lambda_body=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_method_declaration=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_switch=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_type_declaration=end_of_line
+org.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_block_comment=false
+org.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_javadoc_comment=false
+org.eclipse.jdt.core.formatter.comment.format_block_comments=true
+org.eclipse.jdt.core.formatter.comment.format_header=false
+org.eclipse.jdt.core.formatter.comment.format_html=true
+org.eclipse.jdt.core.formatter.comment.format_javadoc_comments=true
+org.eclipse.jdt.core.formatter.comment.format_line_comments=true
+org.eclipse.jdt.core.formatter.comment.format_source_code=true
+org.eclipse.jdt.core.formatter.comment.indent_parameter_description=true
+org.eclipse.jdt.core.formatter.comment.indent_root_tags=true
+org.eclipse.jdt.core.formatter.comment.insert_new_line_before_root_tags=insert
+org.eclipse.jdt.core.formatter.comment.insert_new_line_for_parameter=insert
+org.eclipse.jdt.core.formatter.comment.line_length=260
+org.eclipse.jdt.core.formatter.comment.new_lines_at_block_boundaries=true
+org.eclipse.jdt.core.formatter.comment.new_lines_at_javadoc_boundaries=true
+org.eclipse.jdt.core.formatter.comment.preserve_white_space_between_code_and_line_comments=false
+org.eclipse.jdt.core.formatter.compact_else_if=true
+org.eclipse.jdt.core.formatter.continuation_indentation=2
+org.eclipse.jdt.core.formatter.continuation_indentation_for_array_initializer=2
+org.eclipse.jdt.core.formatter.disabling_tag=@formatter\:off
+org.eclipse.jdt.core.formatter.enabling_tag=@formatter\:on
+org.eclipse.jdt.core.formatter.format_guardian_clause_on_one_line=false
+org.eclipse.jdt.core.formatter.format_line_comment_starting_on_first_column=true
+org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_annotation_declaration_header=true
+org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_enum_constant_header=true
+org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_enum_declaration_header=true
+org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_type_header=true
+org.eclipse.jdt.core.formatter.indent_breaks_compare_to_cases=true
+org.eclipse.jdt.core.formatter.indent_empty_lines=false
+org.eclipse.jdt.core.formatter.indent_statements_compare_to_block=true
+org.eclipse.jdt.core.formatter.indent_statements_compare_to_body=true
+org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_cases=true
+org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_switch=false
+org.eclipse.jdt.core.formatter.indentation.size=4
+org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_field=insert
+org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_local_variable=insert
+org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_method=insert
+org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_package=insert
+org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_parameter=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_type=insert
+org.eclipse.jdt.core.formatter.insert_new_line_after_label=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_after_opening_brace_in_array_initializer=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_after_type_annotation=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_at_end_of_file_if_missing=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_before_catch_in_try_statement=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_before_closing_brace_in_array_initializer=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_before_else_in_if_statement=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_before_finally_in_try_statement=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_before_while_in_do_statement=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_in_empty_annotation_declaration=insert
+org.eclipse.jdt.core.formatter.insert_new_line_in_empty_anonymous_type_declaration=insert
+org.eclipse.jdt.core.formatter.insert_new_line_in_empty_block=insert
+org.eclipse.jdt.core.formatter.insert_new_line_in_empty_enum_constant=insert
+org.eclipse.jdt.core.formatter.insert_new_line_in_empty_enum_declaration=insert
+org.eclipse.jdt.core.formatter.insert_new_line_in_empty_method_body=insert
+org.eclipse.jdt.core.formatter.insert_new_line_in_empty_type_declaration=insert
+org.eclipse.jdt.core.formatter.insert_space_after_and_in_type_parameter=insert
+org.eclipse.jdt.core.formatter.insert_space_after_assignment_operator=insert
+org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation_type_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_binary_operator=insert
+org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_arguments=insert
+org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_parameters=insert
+org.eclipse.jdt.core.formatter.insert_space_after_closing_brace_in_block=insert
+org.eclipse.jdt.core.formatter.insert_space_after_closing_paren_in_cast=insert
+org.eclipse.jdt.core.formatter.insert_space_after_colon_in_assert=insert
+org.eclipse.jdt.core.formatter.insert_space_after_colon_in_case=insert
+org.eclipse.jdt.core.formatter.insert_space_after_colon_in_conditional=insert
+org.eclipse.jdt.core.formatter.insert_space_after_colon_in_for=insert
+org.eclipse.jdt.core.formatter.insert_space_after_colon_in_labeled_statement=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_allocation_expression=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_annotation=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_array_initializer=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_constructor_declaration_parameters=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_constructor_declaration_throws=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_enum_constant_arguments=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_enum_declarations=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_explicitconstructorcall_arguments=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_for_increments=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_for_inits=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_declaration_parameters=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_declaration_throws=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_invocation_arguments=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_multiple_field_declarations=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_multiple_local_declarations=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_parameterized_type_reference=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_superinterfaces=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_arguments=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_parameters=insert
+org.eclipse.jdt.core.formatter.insert_space_after_ellipsis=insert
+org.eclipse.jdt.core.formatter.insert_space_after_lambda_arrow=insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_parameterized_type_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_arguments=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_parameters=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_brace_in_array_initializer=insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_bracket_in_array_allocation_expression=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_bracket_in_array_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_annotation=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_cast=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_catch=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_constructor_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_enum_constant=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_for=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_if=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_method_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_method_invocation=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_parenthesized_expression=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_switch=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_synchronized=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_try=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_while=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_postfix_operator=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_prefix_operator=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_question_in_conditional=insert
+org.eclipse.jdt.core.formatter.insert_space_after_question_in_wildcard=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_semicolon_in_for=insert
+org.eclipse.jdt.core.formatter.insert_space_after_semicolon_in_try_resources=insert
+org.eclipse.jdt.core.formatter.insert_space_after_unary_operator=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_and_in_type_parameter=insert
+org.eclipse.jdt.core.formatter.insert_space_before_assignment_operator=insert
+org.eclipse.jdt.core.formatter.insert_space_before_at_in_annotation_type_declaration=insert
+org.eclipse.jdt.core.formatter.insert_space_before_binary_operator=insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_parameterized_type_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_arguments=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_parameters=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_brace_in_array_initializer=insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_bracket_in_array_allocation_expression=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_bracket_in_array_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_annotation=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_cast=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_catch=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_constructor_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_enum_constant=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_for=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_if=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_method_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_method_invocation=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_parenthesized_expression=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_switch=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_synchronized=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_try=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_while=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_colon_in_assert=insert
+org.eclipse.jdt.core.formatter.insert_space_before_colon_in_case=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_colon_in_conditional=insert
+org.eclipse.jdt.core.formatter.insert_space_before_colon_in_default=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_colon_in_for=insert
+org.eclipse.jdt.core.formatter.insert_space_before_colon_in_labeled_statement=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_allocation_expression=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_annotation=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_array_initializer=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_constructor_declaration_parameters=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_constructor_declaration_throws=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_enum_constant_arguments=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_enum_declarations=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_explicitconstructorcall_arguments=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_for_increments=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_for_inits=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_declaration_parameters=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_declaration_throws=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_invocation_arguments=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_multiple_field_declarations=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_multiple_local_declarations=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_parameterized_type_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_superinterfaces=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_arguments=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_parameters=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_ellipsis=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_lambda_arrow=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_parameterized_type_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_arguments=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_parameters=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_annotation_type_declaration=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_anonymous_type_declaration=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_array_initializer=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_block=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_constructor_declaration=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_enum_constant=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_enum_declaration=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_method_declaration=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_switch=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_type_declaration=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_allocation_expression=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_type_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_annotation=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_annotation_type_member_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_catch=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_constructor_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_enum_constant=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_for=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_if=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_method_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_method_invocation=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_parenthesized_expression=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_switch=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_synchronized=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_try=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_while=insert
+org.eclipse.jdt.core.formatter.insert_space_before_parenthesized_expression_in_return=insert
+org.eclipse.jdt.core.formatter.insert_space_before_parenthesized_expression_in_throw=insert
+org.eclipse.jdt.core.formatter.insert_space_before_postfix_operator=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_prefix_operator=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_question_in_conditional=insert
+org.eclipse.jdt.core.formatter.insert_space_before_question_in_wildcard=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_semicolon=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_semicolon_in_for=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_semicolon_in_try_resources=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_unary_operator=do not insert
+org.eclipse.jdt.core.formatter.insert_space_between_brackets_in_array_type_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_between_empty_braces_in_array_initializer=do not insert
+org.eclipse.jdt.core.formatter.insert_space_between_empty_brackets_in_array_allocation_expression=do not insert
+org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_annotation_type_member_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_constructor_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_enum_constant=do not insert
+org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_invocation=do not insert
+org.eclipse.jdt.core.formatter.join_lines_in_comments=false
+org.eclipse.jdt.core.formatter.join_wrapped_lines=false
+org.eclipse.jdt.core.formatter.keep_else_statement_on_same_line=false
+org.eclipse.jdt.core.formatter.keep_empty_array_initializer_on_one_line=false
+org.eclipse.jdt.core.formatter.keep_imple_if_on_one_line=false
+org.eclipse.jdt.core.formatter.keep_then_statement_on_same_line=false
+org.eclipse.jdt.core.formatter.lineSplit=260
+org.eclipse.jdt.core.formatter.never_indent_block_comments_on_first_column=false
+org.eclipse.jdt.core.formatter.never_indent_line_comments_on_first_column=false
+org.eclipse.jdt.core.formatter.number_of_blank_lines_at_beginning_of_method_body=0
+org.eclipse.jdt.core.formatter.number_of_empty_lines_to_preserve=5
+org.eclipse.jdt.core.formatter.put_empty_statement_on_new_line=true
+org.eclipse.jdt.core.formatter.tabulation.char=tab
+org.eclipse.jdt.core.formatter.tabulation.size=4
+org.eclipse.jdt.core.formatter.use_on_off_tags=false
+org.eclipse.jdt.core.formatter.use_tabs_only_for_leading_indentations=false
+org.eclipse.jdt.core.formatter.wrap_before_binary_operator=true
+org.eclipse.jdt.core.formatter.wrap_before_or_operator_multicatch=true
+org.eclipse.jdt.core.formatter.wrap_outer_expressions_when_nested=true
diff --git a/extraplugins/adl4eclipse/org.eclipse.papyrus.osgi.profile/.settings/org.eclipse.jdt.ui.prefs b/extraplugins/adl4eclipse/org.eclipse.papyrus.osgi.profile/.settings/org.eclipse.jdt.ui.prefs
new file mode 100644
index 00000000000..954281dbc31
--- /dev/null
+++ b/extraplugins/adl4eclipse/org.eclipse.papyrus.osgi.profile/.settings/org.eclipse.jdt.ui.prefs
@@ -0,0 +1,68 @@
+cleanup.add_default_serial_version_id=true
+cleanup.add_generated_serial_version_id=false
+cleanup.add_missing_annotations=true
+cleanup.add_missing_deprecated_annotations=true
+cleanup.add_missing_methods=false
+cleanup.add_missing_nls_tags=false
+cleanup.add_missing_override_annotations=true
+cleanup.add_missing_override_annotations_interface_methods=true
+cleanup.add_serial_version_id=false
+cleanup.always_use_blocks=true
+cleanup.always_use_parentheses_in_expressions=false
+cleanup.always_use_this_for_non_static_field_access=false
+cleanup.always_use_this_for_non_static_method_access=false
+cleanup.convert_functional_interfaces=false
+cleanup.convert_to_enhanced_for_loop=false
+cleanup.correct_indentation=false
+cleanup.format_source_code=false
+cleanup.format_source_code_changes_only=false
+cleanup.insert_inferred_type_arguments=false
+cleanup.make_local_variable_final=true
+cleanup.make_parameters_final=false
+cleanup.make_private_fields_final=true
+cleanup.make_type_abstract_if_missing_method=false
+cleanup.make_variable_declarations_final=false
+cleanup.never_use_blocks=false
+cleanup.never_use_parentheses_in_expressions=true
+cleanup.organize_imports=false
+cleanup.qualify_static_field_accesses_with_declaring_class=false
+cleanup.qualify_static_member_accesses_through_instances_with_declaring_class=true
+cleanup.qualify_static_member_accesses_through_subtypes_with_declaring_class=true
+cleanup.qualify_static_member_accesses_with_declaring_class=true
+cleanup.qualify_static_method_accesses_with_declaring_class=false
+cleanup.remove_private_constructors=true
+cleanup.remove_redundant_type_arguments=true
+cleanup.remove_trailing_whitespaces=true
+cleanup.remove_trailing_whitespaces_all=true
+cleanup.remove_trailing_whitespaces_ignore_empty=false
+cleanup.remove_unnecessary_casts=true
+cleanup.remove_unnecessary_nls_tags=true
+cleanup.remove_unused_imports=true
+cleanup.remove_unused_local_variables=false
+cleanup.remove_unused_private_fields=true
+cleanup.remove_unused_private_members=false
+cleanup.remove_unused_private_methods=true
+cleanup.remove_unused_private_types=true
+cleanup.sort_members=false
+cleanup.sort_members_all=false
+cleanup.use_anonymous_class_creation=false
+cleanup.use_blocks=true
+cleanup.use_blocks_only_for_return_and_throw=false
+cleanup.use_lambda=true
+cleanup.use_parentheses_in_expressions=false
+cleanup.use_this_for_non_static_field_access=false
+cleanup.use_this_for_non_static_field_access_only_if_necessary=true
+cleanup.use_this_for_non_static_method_access=false
+cleanup.use_this_for_non_static_method_access_only_if_necessary=true
+cleanup.use_type_arguments=false
+cleanup_profile=_Papyrus
+cleanup_settings_version=2
+eclipse.preferences.version=1
+formatter_profile=_Papyrus
+formatter_settings_version=12
+org.eclipse.jdt.ui.ignorelowercasenames=true
+org.eclipse.jdt.ui.importorder=java;javax;org;com;
+org.eclipse.jdt.ui.javadoc=true
+org.eclipse.jdt.ui.ondemandthreshold=99
+org.eclipse.jdt.ui.staticondemandthreshold=99
+org.eclipse.jdt.ui.text.custom_code_templates=<?xml version\="1.0" encoding\="UTF-8" standalone\="no"?><templates><template autoinsert\="true" context\="gettercomment_context" deleted\="false" description\="Comment for getter method" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.gettercomment" name\="gettercomment">/**\n * @return the ${bare_field_name}\n */</template><template autoinsert\="true" context\="settercomment_context" deleted\="false" description\="Comment for setter method" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.settercomment" name\="settercomment">/**\n * @param ${param} the ${bare_field_name} to set\n */</template><template autoinsert\="false" context\="constructorcomment_context" deleted\="false" description\="Comment for created constructors" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.constructorcomment" name\="constructorcomment">/**\n * Constructor.\n *\n * ${tags}\n */</template><template autoinsert\="false" context\="filecomment_context" deleted\="false" description\="Comment for created Java files" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.filecomment" name\="filecomment">/*****************************************************************************\n * Copyright (c) ${year} CEA LIST and others.\n * \n * All rights reserved. This program and the accompanying materials\n * are made available under the terms of the Eclipse Public License v1.0\n * which accompanies this distribution, and is available at\n * http\://www.eclipse.org/legal/epl-v10.html\n *\n * Contributors\:\n * CEA LIST - Initial API and implementation\n * \n *****************************************************************************/\n</template><template autoinsert\="true" context\="typecomment_context" deleted\="false" description\="Comment for created types" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.typecomment" name\="typecomment">/**\n * @author ${user}\n *\n * ${tags}\n */</template><template autoinsert\="true" context\="fieldcomment_context" deleted\="false" description\="Comment for fields" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.fieldcomment" name\="fieldcomment">/**\n * \n */</template><template autoinsert\="true" context\="methodcomment_context" deleted\="false" description\="Comment for non-overriding methods" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.methodcomment" name\="methodcomment">/**\n * ${tags}\n */</template><template autoinsert\="false" context\="overridecomment_context" deleted\="false" description\="Comment for overriding methods" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.overridecomment" name\="overridecomment">/**\n * ${see_to_overridden}\n *\n * ${tags}\n */</template><template autoinsert\="false" context\="delegatecomment_context" deleted\="false" description\="Comment for delegate methods" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.delegatecomment" name\="delegatecomment">/**\n * ${see_to_target}\n *\n * ${tags}\n */</template><template autoinsert\="true" context\="newtype_context" deleted\="false" description\="Newly created files" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.newtype" name\="newtype">${filecomment}\n${package_declaration}\n\n${typecomment}\n${type_declaration}</template><template autoinsert\="true" context\="classbody_context" deleted\="false" description\="Code in new class type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.classbody" name\="classbody">\n</template><template autoinsert\="true" context\="interfacebody_context" deleted\="false" description\="Code in new interface type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.interfacebody" name\="interfacebody">\n</template><template autoinsert\="true" context\="enumbody_context" deleted\="false" description\="Code in new enum type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.enumbody" name\="enumbody">\n</template><template autoinsert\="true" context\="annotationbody_context" deleted\="false" description\="Code in new annotation type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.annotationbody" name\="annotationbody">\n</template><template autoinsert\="true" context\="catchblock_context" deleted\="false" description\="Code in new catch blocks" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.catchblock" name\="catchblock">// ${todo} Auto-generated catch block\n${exception_var}.printStackTrace();</template><template autoinsert\="true" context\="methodbody_context" deleted\="false" description\="Code in created method stubs" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.methodbody" name\="methodbody">// ${todo} Auto-generated method stub\n${body_statement}</template><template autoinsert\="true" context\="constructorbody_context" deleted\="false" description\="Code in created constructor stubs" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.constructorbody" name\="constructorbody">${body_statement}\n// ${todo} Auto-generated constructor stub</template><template autoinsert\="true" context\="getterbody_context" deleted\="false" description\="Code in created getters" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.getterbody" name\="getterbody">return ${field};</template><template autoinsert\="true" context\="setterbody_context" deleted\="false" description\="Code in created setters" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.setterbody" name\="setterbody">${field} \= ${param};</template></templates>
diff --git a/extraplugins/cdo/org.eclipse.papyrus.cdo.uml.search.ui/src/org/eclipse/papyrus/cdo/uml/search/internal/ui/query/CDOSearchQueryProvider.java b/extraplugins/cdo/org.eclipse.papyrus.cdo.uml.search.ui/src/org/eclipse/papyrus/cdo/uml/search/internal/ui/query/CDOSearchQueryProvider.java
index 92809dc4d80..2b058d2e536 100644
--- a/extraplugins/cdo/org.eclipse.papyrus.cdo.uml.search.ui/src/org/eclipse/papyrus/cdo/uml/search/internal/ui/query/CDOSearchQueryProvider.java
+++ b/extraplugins/cdo/org.eclipse.papyrus.cdo.uml.search.ui/src/org/eclipse/papyrus/cdo/uml/search/internal/ui/query/CDOSearchQueryProvider.java
@@ -267,7 +267,7 @@ public class CDOSearchQueryProvider implements IPapyrusQueryProvider {
boolean first = true;
for (URI uri : scope) {
- String path = "/" + CDOURIUtil.extractResourcePath(uri);
+ String path = CDOURIUtil.extractResourcePath(uri);
if (uri.hasTrailingPathSeparator() && !path.endsWith("/")) { //$NON-NLS-1$
path = path + "/"; //$NON-NLS-1$
}
diff --git a/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/palettes/ActivityDiag-GCM.Palette.xml b/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/palettes/ActivityDiag-GCM.Palette.xml
index cae011eeae5..9a1dea3b86a 100644
--- a/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/palettes/ActivityDiag-GCM.Palette.xml
+++ b/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/palettes/ActivityDiag-GCM.Palette.xml
@@ -1 +1,27 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?><paletteDefinition><content><drawer iconpath="/icons/drawer.gif" id="Drawer__1283327086671" name="MARTE/GCM"><aspectTool description="Create an element with a stereotype" iconpath="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/CallBehaviorAction.gif" id="createCallBehaviorAction2CreationTool_1283327647999" name="GCMInvocationAction (Call Behavior Action)" refToolId="createCallBehaviorAction11CreationTool"><postAction id="org.eclipse.papyrus.applystereotypeactionprovider"><stereotypesToApply><stereotype stereotypeName="MARTE::MARTE_DesignModel::GCM::GCMInvocationAction"/></stereotypesToApply></postAction></aspectTool><aspectTool description="Create an element with a stereotype" iconpath="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/CallOperationAction.gif" id="createCallOperationAction12CreationTool_1283327660625" name="GCMInvocationAction (Call Operation Action)" refToolId="createCallOperationAction12CreationTool"><postAction id="org.eclipse.papyrus.applystereotypeactionprovider"><stereotypesToApply><stereotype stereotypeName="MARTE::MARTE_DesignModel::GCM::GCMInvocationAction"/></stereotypesToApply></postAction></aspectTool></drawer></content></paletteDefinition> \ No newline at end of file
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<paletteDefinition>
+ <content>
+ <drawer iconpath="/icons/drawer.gif" id="Drawer__1283327086671" name="MARTE/GCM">
+ <aspectTool description="Create an element with a stereotype"
+ iconpath="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/CallBehaviorAction.gif"
+ id="createCallBehaviorAction2CreationTool_1283327647999" name="GCMInvocationAction (Call Behavior Action)"
+ refToolId="activity.nodes.invocationactionsgroup.callbehavioraction">
+ <postAction id="org.eclipse.papyrus.applystereotypeactionprovider">
+ <stereotypesToApply>
+ <stereotype stereotypeName="MARTE::MARTE_DesignModel::GCM::GCMInvocationAction"/>
+ </stereotypesToApply>
+ </postAction>
+ </aspectTool>
+ <aspectTool description="Create an element with a stereotype"
+ iconpath="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/CallOperationAction.gif"
+ id="createCallOperationAction12CreationTool_1283327660625" name="GCMInvocationAction (Call Operation Action)"
+ refToolId="activity.nodes.invocationactionsgroup.calloperationaction">
+ <postAction id="org.eclipse.papyrus.applystereotypeactionprovider">
+ <stereotypesToApply>
+ <stereotype stereotypeName="MARTE::MARTE_DesignModel::GCM::GCMInvocationAction"/>
+ </stereotypesToApply>
+ </postAction>
+ </aspectTool>
+ </drawer>
+ </content>
+</paletteDefinition> \ No newline at end of file
diff --git a/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/palettes/ActivityDiag-GQAM.Palette.xml b/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/palettes/ActivityDiag-GQAM.Palette.xml
index 88ea4cab193..aafee5844b4 100644
--- a/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/palettes/ActivityDiag-GQAM.Palette.xml
+++ b/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/palettes/ActivityDiag-GQAM.Palette.xml
@@ -1 +1,137 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?><paletteDefinition><content><drawer iconpath="/icons/drawer.gif" id="Drawer__1283328016472" name="MARTE/GQAM"><aspectTool description="Create an element with a stereotype" iconpath="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/CallBehaviorAction.gif" id="createCallBehaviorAction11CreationTool_1283328053749" name="GaAcqStep (Call Behavior Action)" refToolId="createCallBehaviorAction11CreationTool"><postAction id="org.eclipse.papyrus.applystereotypeactionprovider"><stereotypesToApply><stereotype stereotypeName="MARTE::MARTE_AnalysisModel::GQAM::GaAcqStep"/></stereotypesToApply></postAction></aspectTool><aspectTool description="Create an element with a stereotype" iconpath="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/CallOperationAction.gif" id="createCallOperationAction12CreationTool_1283328058561" name="GaAcqStep (Call Operation Action)" refToolId="createCallOperationAction12CreationTool"><postAction id="org.eclipse.papyrus.applystereotypeactionprovider"><stereotypesToApply><stereotype stereotypeName="MARTE::MARTE_AnalysisModel::GQAM::GaAcqStep"/></stereotypesToApply></postAction></aspectTool><aspectTool description="Create an element with a stereotype" iconpath="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/ControlFlow.gif" id="createControlFlow1CreationTool_1283328394693" name="GaCommStep (Control Flow)" refToolId="createControlFlow1CreationTool"><postAction id="org.eclipse.papyrus.applystereotypeactionprovider"><stereotypesToApply><stereotype stereotypeName="MARTE::MARTE_AnalysisModel::GQAM::GaCommStep"/></stereotypesToApply></postAction></aspectTool><aspectTool description="Create an element with a stereotype" iconpath="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/CallOperationAction.gif" id="createCallOperationAction12CreationTool_1283328402395" name="GaCommStep (Call Operation Action)" refToolId="createCallOperationAction12CreationTool"><postAction id="org.eclipse.papyrus.applystereotypeactionprovider"><stereotypesToApply><stereotype stereotypeName="MARTE::MARTE_AnalysisModel::GQAM::GaCommStep"/></stereotypesToApply></postAction></aspectTool><aspectTool description="Create an element with a stereotype" iconpath="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/CallBehaviorAction.gif" id="createCallBehaviorAction11CreationTool_1283328469751" name="GaRelStep (Call Behavior Action)" refToolId="createCallBehaviorAction11CreationTool"><postAction id="org.eclipse.papyrus.applystereotypeactionprovider"><stereotypesToApply><stereotype stereotypeName="MARTE::MARTE_AnalysisModel::GQAM::GaRelStep"/></stereotypesToApply></postAction></aspectTool><aspectTool description="Create an element with a stereotype" iconpath="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/CallOperationAction.gif" id="createCallOperationAction12CreationTool_1283328472204" name="GaRelStep (Call Operation Action)" refToolId="createCallOperationAction12CreationTool"><postAction id="org.eclipse.papyrus.applystereotypeactionprovider"><stereotypesToApply><stereotype stereotypeName="MARTE::MARTE_AnalysisModel::GQAM::GaRelStep"/></stereotypesToApply></postAction></aspectTool><aspectTool description="Create an element with a stereotype" iconpath="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/CallOperationAction.gif" id="createCallOperationAction12CreationTool_1283328479595" name="GaRequestedService (Call Operation Action)" refToolId="createCallOperationAction12CreationTool"><postAction id="org.eclipse.papyrus.applystereotypeactionprovider"><stereotypesToApply><stereotype stereotypeName="MARTE::MARTE_AnalysisModel::GQAM::GaRequestedService"/></stereotypesToApply></postAction></aspectTool><aspectTool description="Create an element with a stereotype" iconpath="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/StructuredActivityNode.gif" id="createStructuredActivityNode3CreationTool_1283328505406" name="GaScenario (Structured Activity Node)" refToolId="createStructuredActivityNode3CreationTool"><postAction id="org.eclipse.papyrus.applystereotypeactionprovider"><stereotypesToApply><stereotype stereotypeName="MARTE::MARTE_AnalysisModel::GQAM::GaScenario"/></stereotypesToApply></postAction></aspectTool><aspectTool description="Create an element with a stereotype" iconpath="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/StructuredActivityNode.gif" id="createStructuredActivityNode3CreationTool_1283328520312" name="GaAnalysisContext (Structured Activity Node)" refToolId="createStructuredActivityNode3CreationTool"><postAction id="org.eclipse.papyrus.applystereotypeactionprovider"><stereotypesToApply><stereotype stereotypeName="MARTE::MARTE_AnalysisModel::GQAM::GaAnalysisContext"/></stereotypesToApply></postAction></aspectTool><aspectTool description="Create an element with a stereotype" iconpath="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/CallBehaviorAction.gif" id="createCallBehaviorAction11CreationTool_1283328534686" name="GaStep (Call Behavior Action)" refToolId="createCallBehaviorAction11CreationTool"><postAction id="org.eclipse.papyrus.applystereotypeactionprovider"><stereotypesToApply><stereotype stereotypeName="MARTE::MARTE_AnalysisModel::GQAM::GaStep"/></stereotypesToApply></postAction></aspectTool><aspectTool description="Create an element with a stereotype" iconpath="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/CallOperationAction.gif" id="createCallOperationAction12CreationTool_1283328537795" name="GaStep (Call Operation Action)" refToolId="createCallOperationAction12CreationTool"><postAction id="org.eclipse.papyrus.applystereotypeactionprovider"><stereotypesToApply><stereotype stereotypeName="MARTE::MARTE_AnalysisModel::GQAM::GaStep"/></stereotypesToApply></postAction></aspectTool><aspectTool description="Create an element with a stereotype" iconpath="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/StructuredActivityNode.gif" id="createStructuredActivityNode3CreationTool_1283328732630" name="GaWorkloadBehavior (Structured Activity Node)" refToolId="createStructuredActivityNode3CreationTool"><postAction id="org.eclipse.papyrus.applystereotypeactionprovider"><stereotypesToApply><stereotype stereotypeName="MARTE::MARTE_AnalysisModel::GQAM::GaWorkloadBehavior"/></stereotypesToApply></postAction></aspectTool><aspectTool description="Create an element with a stereotype" iconpath="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/AcceptEventAction.gif" id="createAcceptEventAction6CreationTool_1283328741427" name="GaWorkloadEvent (Accept Event Action)" refToolId="createAcceptEventAction6CreationTool"><postAction id="org.eclipse.papyrus.applystereotypeactionprovider"><stereotypesToApply><stereotype stereotypeName="MARTE::MARTE_AnalysisModel::GQAM::GaWorkloadEvent"/></stereotypesToApply></postAction></aspectTool></drawer></content></paletteDefinition> \ No newline at end of file
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<paletteDefinition>
+ <content>
+ <drawer iconpath="/icons/drawer.gif" id="Drawer__1283328016472" name="MARTE/GQAM">
+ <aspectTool description="Create an element with a stereotype"
+ iconpath="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/CallBehaviorAction.gif"
+ id="createCallBehaviorAction11CreationTool_1283328053749" name="GaAcqStep (Call Behavior Action)"
+ refToolId="activity.nodes.invocationactionsgroup.callbehavioraction">
+ <postAction id="org.eclipse.papyrus.applystereotypeactionprovider">
+ <stereotypesToApply>
+ <stereotype stereotypeName="MARTE::MARTE_AnalysisModel::GQAM::GaAcqStep"/>
+ </stereotypesToApply>
+ </postAction>
+ </aspectTool>
+ <aspectTool description="Create an element with a stereotype"
+ iconpath="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/CallOperationAction.gif"
+ id="createCallOperationAction12CreationTool_1283328058561" name="GaAcqStep (Call Operation Action)"
+ refToolId="activity.nodes.invocationactionsgroup.calloperationaction">
+ <postAction id="org.eclipse.papyrus.applystereotypeactionprovider">
+ <stereotypesToApply>
+ <stereotype stereotypeName="MARTE::MARTE_AnalysisModel::GQAM::GaAcqStep"/>
+ </stereotypesToApply>
+ </postAction>
+ </aspectTool>
+ <aspectTool description="Create an element with a stereotype"
+ iconpath="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/ControlFlow.gif"
+ id="createControlFlow1CreationTool_1283328394693" name="GaCommStep (Control Flow)"
+ refToolId="activity.edges.controlflow">
+ <postAction id="org.eclipse.papyrus.applystereotypeactionprovider">
+ <stereotypesToApply>
+ <stereotype stereotypeName="MARTE::MARTE_AnalysisModel::GQAM::GaCommStep"/>
+ </stereotypesToApply>
+ </postAction>
+ </aspectTool>
+ <aspectTool description="Create an element with a stereotype"
+ iconpath="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/CallOperationAction.gif"
+ id="createCallOperationAction12CreationTool_1283328402395" name="GaCommStep (Call Operation Action)"
+ refToolId="activity.nodes.invocationactionsgroup.calloperationaction">
+ <postAction id="org.eclipse.papyrus.applystereotypeactionprovider">
+ <stereotypesToApply>
+ <stereotype stereotypeName="MARTE::MARTE_AnalysisModel::GQAM::GaCommStep"/>
+ </stereotypesToApply>
+ </postAction>
+ </aspectTool>
+ <aspectTool description="Create an element with a stereotype"
+ iconpath="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/CallBehaviorAction.gif"
+ id="createCallBehaviorAction11CreationTool_1283328469751" name="GaRelStep (Call Behavior Action)"
+ refToolId="activity.nodes.invocationactionsgroup.callbehavioraction">
+ <postAction id="org.eclipse.papyrus.applystereotypeactionprovider">
+ <stereotypesToApply>
+ <stereotype stereotypeName="MARTE::MARTE_AnalysisModel::GQAM::GaRelStep"/>
+ </stereotypesToApply>
+ </postAction>
+ </aspectTool>
+ <aspectTool description="Create an element with a stereotype"
+ iconpath="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/CallOperationAction.gif"
+ id="createCallOperationAction12CreationTool_1283328472204" name="GaRelStep (Call Operation Action)"
+ refToolId="activity.nodes.invocationactionsgroup.calloperationaction">
+ <postAction id="org.eclipse.papyrus.applystereotypeactionprovider">
+ <stereotypesToApply>
+ <stereotype stereotypeName="MARTE::MARTE_AnalysisModel::GQAM::GaRelStep"/>
+ </stereotypesToApply>
+ </postAction>
+ </aspectTool>
+ <aspectTool description="Create an element with a stereotype"
+ iconpath="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/CallOperationAction.gif"
+ id="createCallOperationAction12CreationTool_1283328479595" name="GaRequestedService (Call Operation Action)"
+ refToolId="activity.nodes.invocationactionsgroup.calloperationaction">
+ <postAction id="org.eclipse.papyrus.applystereotypeactionprovider">
+ <stereotypesToApply>
+ <stereotype stereotypeName="MARTE::MARTE_AnalysisModel::GQAM::GaRequestedService"/>
+ </stereotypesToApply>
+ </postAction>
+ </aspectTool>
+ <aspectTool description="Create an element with a stereotype"
+ iconpath="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/StructuredActivityNode.gif"
+ id="createStructuredActivityNode3CreationTool_1283328505406" name="GaScenario (Structured Activity Node)"
+ refToolId="activity.nodes.structuredactions.structuredactivitynode">
+ <postAction id="org.eclipse.papyrus.applystereotypeactionprovider">
+ <stereotypesToApply>
+ <stereotype stereotypeName="MARTE::MARTE_AnalysisModel::GQAM::GaScenario"/>
+ </stereotypesToApply>
+ </postAction>
+ </aspectTool>
+ <aspectTool description="Create an element with a stereotype"
+ iconpath="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/StructuredActivityNode.gif"
+ id="createStructuredActivityNode3CreationTool_1283328520312" name="GaAnalysisContext (Structured Activity Node)"
+ refToolId="activity.nodes.structuredactions.structuredactivitynode">
+ <postAction id="org.eclipse.papyrus.applystereotypeactionprovider">
+ <stereotypesToApply>
+ <stereotype stereotypeName="MARTE::MARTE_AnalysisModel::GQAM::GaAnalysisContext"/>
+ </stereotypesToApply>
+ </postAction>
+ </aspectTool>
+ <aspectTool description="Create an element with a stereotype"
+ iconpath="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/CallBehaviorAction.gif"
+ id="createCallBehaviorAction11CreationTool_1283328534686" name="GaStep (Call Behavior Action)"
+ refToolId="activity.nodes.invocationactionsgroup.callbehavioraction">
+ <postAction id="org.eclipse.papyrus.applystereotypeactionprovider">
+ <stereotypesToApply>
+ <stereotype stereotypeName="MARTE::MARTE_AnalysisModel::GQAM::GaStep"/>
+ </stereotypesToApply>
+ </postAction>
+ </aspectTool>
+ <aspectTool description="Create an element with a stereotype"
+ iconpath="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/CallOperationAction.gif"
+ id="createCallOperationAction12CreationTool_1283328537795" name="GaStep (Call Operation Action)"
+ refToolId="activity.nodes.invocationactionsgroup.calloperationaction">
+ <postAction id="org.eclipse.papyrus.applystereotypeactionprovider">
+ <stereotypesToApply>
+ <stereotype stereotypeName="MARTE::MARTE_AnalysisModel::GQAM::GaStep"/>
+ </stereotypesToApply>
+ </postAction>
+ </aspectTool>
+ <aspectTool description="Create an element with a stereotype"
+ iconpath="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/StructuredActivityNode.gif"
+ id="createStructuredActivityNode3CreationTool_1283328732630" name="GaWorkloadBehavior (Structured Activity Node)"
+ refToolId="activity.nodes.structuredactions.structuredactivitynode">
+ <postAction id="org.eclipse.papyrus.applystereotypeactionprovider">
+ <stereotypesToApply>
+ <stereotype stereotypeName="MARTE::MARTE_AnalysisModel::GQAM::GaWorkloadBehavior"/>
+ </stereotypesToApply>
+ </postAction>
+ </aspectTool>
+ <aspectTool description="Create an element with a stereotype"
+ iconpath="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/AcceptEventAction.gif"
+ id="createAcceptEventAction6CreationTool_1283328741427" name="GaWorkloadEvent (Accept Event Action)"
+ refToolId="activity.nodes.accepteventaction">
+ <postAction id="org.eclipse.papyrus.applystereotypeactionprovider">
+ <stereotypesToApply>
+ <stereotype stereotypeName="MARTE::MARTE_AnalysisModel::GQAM::GaWorkloadEvent"/>
+ </stereotypesToApply>
+ </postAction>
+ </aspectTool>
+ </drawer>
+ </content>
+</paletteDefinition> \ No newline at end of file
diff --git a/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/palettes/ActivityDiag-HLAM.Palette.xml b/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/palettes/ActivityDiag-HLAM.Palette.xml
index 556d41e1b6a..446876e23b4 100644
--- a/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/palettes/ActivityDiag-HLAM.Palette.xml
+++ b/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/palettes/ActivityDiag-HLAM.Palette.xml
@@ -1 +1,47 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?><paletteDefinition><content><drawer iconpath="/icons/drawer.gif" id="Drawer__1283327690798" name="MARTE/HLAM"><aspectTool description="Create an element with a stereotype" iconpath="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/CallBehaviorAction.gif" id="createCallBehaviorAction11CreationTool_1283327750223" name="RtAction (Call Behavior Action)" refToolId="createCallBehaviorAction11CreationTool"><postAction id="org.eclipse.papyrus.applystereotypeactionprovider"><stereotypesToApply><stereotype stereotypeName="MARTE::MARTE_DesignModel::HLAM::RtAction"/></stereotypesToApply></postAction></aspectTool><aspectTool description="Create an element with a stereotype" iconpath="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/CallOperationAction.gif" id="createCallOperationAction3CreationTool_1283327753051" name="RtAction (Call Operation Action)" refToolId="createCallOperationAction3CreationTool"><postAction id="org.eclipse.papyrus.applystereotypeactionprovider"><stereotypesToApply><stereotype stereotypeName="MARTE::MARTE_DesignModel::HLAM::RtAction"/></stereotypesToApply></postAction></aspectTool><aspectTool description="Create an element with a stereotype" iconpath="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/CallBehaviorAction.gif" id="createCallBehaviorAction11CreationTool_1283327764927" name="RtFeature (Call Behavior Action)" refToolId="createCallBehaviorAction11CreationTool"><postAction id="org.eclipse.papyrus.applystereotypeactionprovider"><stereotypesToApply><stereotype stereotypeName="MARTE::MARTE_DesignModel::HLAM::RtFeature"/></stereotypesToApply></postAction></aspectTool><aspectTool description="Create an element with a stereotype" iconpath="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/CallOperationAction.gif" id="createCallOperationAction3CreationTool_1283327770630" name="RtFeature (Call Operation Action)" refToolId="createCallOperationAction3CreationTool"><postAction id="org.eclipse.papyrus.applystereotypeactionprovider"><stereotypesToApply><stereotype stereotypeName="MARTE::MARTE_DesignModel::HLAM::RtFeature"/></stereotypesToApply></postAction></aspectTool></drawer></content></paletteDefinition> \ No newline at end of file
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<paletteDefinition>
+ <content>
+ <drawer iconpath="/icons/drawer.gif" id="Drawer__1283327690798" name="MARTE/HLAM">
+ <aspectTool description="Create an element with a stereotype"
+ iconpath="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/CallBehaviorAction.gif"
+ id="createCallBehaviorAction11CreationTool_1283327750223" name="RtAction (Call Behavior Action)"
+ refToolId="activity.nodes.invocationactionsgroup.callbehavioraction">
+ <postAction id="org.eclipse.papyrus.applystereotypeactionprovider">
+ <stereotypesToApply>
+ <stereotype stereotypeName="MARTE::MARTE_DesignModel::HLAM::RtAction"/>
+ </stereotypesToApply>
+ </postAction>
+ </aspectTool>
+ <aspectTool description="Create an element with a stereotype"
+ iconpath="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/CallOperationAction.gif"
+ id="createCallOperationAction3CreationTool_1283327753051" name="RtAction (Call Operation Action)"
+ refToolId="activity.nodes.invocationactionsgroup.calloperationaction">
+ <postAction id="org.eclipse.papyrus.applystereotypeactionprovider">
+ <stereotypesToApply>
+ <stereotype stereotypeName="MARTE::MARTE_DesignModel::HLAM::RtAction"/>
+ </stereotypesToApply>
+ </postAction>
+ </aspectTool>
+ <aspectTool description="Create an element with a stereotype"
+ iconpath="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/CallBehaviorAction.gif"
+ id="createCallBehaviorAction11CreationTool_1283327764927" name="RtFeature (Call Behavior Action)"
+ refToolId="activity.nodes.invocationactionsgroup.callbehavioraction">
+ <postAction id="org.eclipse.papyrus.applystereotypeactionprovider">
+ <stereotypesToApply>
+ <stereotype stereotypeName="MARTE::MARTE_DesignModel::HLAM::RtFeature"/>
+ </stereotypesToApply>
+ </postAction>
+ </aspectTool>
+ <aspectTool description="Create an element with a stereotype"
+ iconpath="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/CallOperationAction.gif"
+ id="createCallOperationAction3CreationTool_1283327770630" name="RtFeature (Call Operation Action)"
+ refToolId="activity.nodes.invocationactionsgroup.calloperationaction">
+ <postAction id="org.eclipse.papyrus.applystereotypeactionprovider">
+ <stereotypesToApply>
+ <stereotype stereotypeName="MARTE::MARTE_DesignModel::HLAM::RtFeature"/>
+ </stereotypesToApply>
+ </postAction>
+ </aspectTool>
+ </drawer>
+ </content>
+</paletteDefinition> \ No newline at end of file
diff --git a/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/palettes/ActivityDiag-PAM.Palette.xml b/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/palettes/ActivityDiag-PAM.Palette.xml
index d015a9f023f..0ed35b6a339 100644
--- a/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/palettes/ActivityDiag-PAM.Palette.xml
+++ b/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/palettes/ActivityDiag-PAM.Palette.xml
@@ -1 +1,107 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?><paletteDefinition><content><drawer iconpath="/icons/drawer.gif" id="Drawer__1283328866407" name="MARTE/PAM"><aspectTool description="Create an element with a stereotype" iconpath="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/CallOperationAction.gif" id="createCallOperationAction12CreationTool_1283328903845" name="PaCommStep (Call Operation Action)" refToolId="createCallOperationAction12CreationTool"><postAction id="org.eclipse.papyrus.applystereotypeactionprovider"><stereotypesToApply><stereotype stereotypeName="MARTE::MARTE_AnalysisModel::PAM::PaCommStep"/></stereotypesToApply></postAction></aspectTool><aspectTool description="Create an element with a stereotype" iconpath="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/ControlFlow.gif" id="createControlFlow1CreationTool_1283328911564" name="PaCommStep (Control Flow)" refToolId="createControlFlow1CreationTool"><postAction id="org.eclipse.papyrus.applystereotypeactionprovider"><stereotypesToApply><stereotype stereotypeName="MARTE::MARTE_AnalysisModel::PAM::PaCommStep"/></stereotypesToApply></postAction></aspectTool><aspectTool description="Create an element with a stereotype" iconpath="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/CallBehaviorAction.gif" id="createCallBehaviorAction11CreationTool_1283328923846" name="PaRequestedStep (Call Behavior Action)" refToolId="createCallBehaviorAction11CreationTool"><postAction id="org.eclipse.papyrus.applystereotypeactionprovider"><stereotypesToApply><stereotype stereotypeName="MARTE::MARTE_AnalysisModel::PAM::PaRequestedStep"/></stereotypesToApply></postAction></aspectTool><aspectTool description="Create an element with a stereotype" iconpath="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/CallOperationAction.gif" id="createCallOperationAction12CreationTool_1283328926518" name="PaRequestedStep (Call Operation Action)" refToolId="createCallOperationAction12CreationTool"><postAction id="org.eclipse.papyrus.applystereotypeactionprovider"><stereotypesToApply><stereotype stereotypeName="MARTE::MARTE_AnalysisModel::PAM::PaRequestedStep"/></stereotypesToApply></postAction></aspectTool><aspectTool description="Create an element with a stereotype" iconpath="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/CallBehaviorAction.gif" id="createCallBehaviorAction11CreationTool_1283328934861" name="PaResPassStep (Call Behavior Action)" refToolId="createCallBehaviorAction11CreationTool"><postAction id="org.eclipse.papyrus.applystereotypeactionprovider"><stereotypesToApply><stereotype stereotypeName="MARTE::MARTE_AnalysisModel::PAM::PaResPassStep"/></stereotypesToApply></postAction></aspectTool><aspectTool description="Create an element with a stereotype" iconpath="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/CallOperationAction.gif" id="createCallOperationAction12CreationTool_1283328937674" name="PaResPassStep (Call Operation Action)" refToolId="createCallOperationAction12CreationTool"><postAction id="org.eclipse.papyrus.applystereotypeactionprovider"><stereotypesToApply><stereotype stereotypeName="MARTE::MARTE_AnalysisModel::PAM::PaResPassStep"/></stereotypesToApply></postAction></aspectTool><aspectTool description="Create an element with a stereotype" iconpath="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/CallBehaviorAction.gif" id="createCallBehaviorAction11CreationTool_1283328946799" name="PaRunTInstance (Call Behavior Action)" refToolId="createCallBehaviorAction11CreationTool"><postAction id="org.eclipse.papyrus.applystereotypeactionprovider"><stereotypesToApply><stereotype stereotypeName="MARTE::MARTE_AnalysisModel::PAM::PaRunTInstance"/></stereotypesToApply></postAction></aspectTool><aspectTool description="Create an element with a stereotype" iconpath="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/CallOperationAction.gif" id="createCallOperationAction12CreationTool_1283328949143" name="PaRunTInstance (Call Operation Action)" refToolId="createCallOperationAction12CreationTool"><postAction id="org.eclipse.papyrus.applystereotypeactionprovider"><stereotypesToApply><stereotype stereotypeName="MARTE::MARTE_AnalysisModel::PAM::PaRunTInstance"/></stereotypesToApply></postAction></aspectTool><aspectTool description="Create an element with a stereotype" iconpath="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/CallBehaviorAction.gif" id="createCallBehaviorAction11CreationTool_1283328954752" name="PaStep (Call Behavior Action)" refToolId="createCallBehaviorAction11CreationTool"><postAction id="org.eclipse.papyrus.applystereotypeactionprovider"><stereotypesToApply><stereotype stereotypeName="MARTE::MARTE_AnalysisModel::PAM::PaStep"/></stereotypesToApply></postAction></aspectTool><aspectTool description="Create an element with a stereotype" iconpath="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/CallOperationAction.gif" id="createCallOperationAction12CreationTool_1283328957456" name="PaStep (Call Operation Action)" refToolId="createCallOperationAction12CreationTool"><postAction id="org.eclipse.papyrus.applystereotypeactionprovider"><stereotypesToApply><stereotype stereotypeName="MARTE::MARTE_AnalysisModel::PAM::PaStep"/></stereotypesToApply></postAction></aspectTool></drawer></content></paletteDefinition> \ No newline at end of file
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<paletteDefinition>
+ <content>
+ <drawer iconpath="/icons/drawer.gif" id="Drawer__1283328866407" name="MARTE/PAM">
+ <aspectTool description="Create an element with a stereotype"
+ iconpath="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/CallOperationAction.gif"
+ id="createCallOperationAction12CreationTool_1283328903845" name="PaCommStep (Call Operation Action)"
+ refToolId="activity.nodes.invocationactionsgroup.calloperationaction">
+ <postAction id="org.eclipse.papyrus.applystereotypeactionprovider">
+ <stereotypesToApply>
+ <stereotype stereotypeName="MARTE::MARTE_AnalysisModel::PAM::PaCommStep"/>
+ </stereotypesToApply>
+ </postAction>
+ </aspectTool>
+ <aspectTool description="Create an element with a stereotype"
+ iconpath="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/ControlFlow.gif"
+ id="createControlFlow1CreationTool_1283328911564" name="PaCommStep (Control Flow)"
+ refToolId="activity.edges.controlflow">
+ <postAction id="org.eclipse.papyrus.applystereotypeactionprovider">
+ <stereotypesToApply>
+ <stereotype stereotypeName="MARTE::MARTE_AnalysisModel::PAM::PaCommStep"/>
+ </stereotypesToApply>
+ </postAction>
+ </aspectTool>
+ <aspectTool description="Create an element with a stereotype"
+ iconpath="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/CallBehaviorAction.gif"
+ id="createCallBehaviorAction11CreationTool_1283328923846" name="PaRequestedStep (Call Behavior Action)"
+ refToolId="activity.nodes.invocationactionsgroup.callbehavioraction">
+ <postAction id="org.eclipse.papyrus.applystereotypeactionprovider">
+ <stereotypesToApply>
+ <stereotype stereotypeName="MARTE::MARTE_AnalysisModel::PAM::PaRequestedStep"/>
+ </stereotypesToApply>
+ </postAction>
+ </aspectTool>
+ <aspectTool description="Create an element with a stereotype"
+ iconpath="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/CallOperationAction.gif"
+ id="createCallOperationAction12CreationTool_1283328926518" name="PaRequestedStep (Call Operation Action)"
+ refToolId="activity.nodes.invocationactionsgroup.calloperationaction">
+ <postAction id="org.eclipse.papyrus.applystereotypeactionprovider">
+ <stereotypesToApply>
+ <stereotype stereotypeName="MARTE::MARTE_AnalysisModel::PAM::PaRequestedStep"/>
+ </stereotypesToApply>
+ </postAction>
+ </aspectTool>
+ <aspectTool description="Create an element with a stereotype"
+ iconpath="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/CallBehaviorAction.gif"
+ id="createCallBehaviorAction11CreationTool_1283328934861" name="PaResPassStep (Call Behavior Action)"
+ refToolId="activity.nodes.invocationactionsgroup.callbehavioraction">
+ <postAction id="org.eclipse.papyrus.applystereotypeactionprovider">
+ <stereotypesToApply>
+ <stereotype stereotypeName="MARTE::MARTE_AnalysisModel::PAM::PaResPassStep"/>
+ </stereotypesToApply>
+ </postAction>
+ </aspectTool>
+ <aspectTool description="Create an element with a stereotype"
+ iconpath="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/CallOperationAction.gif"
+ id="createCallOperationAction12CreationTool_1283328937674" name="PaResPassStep (Call Operation Action)"
+ refToolId="activity.nodes.invocationactionsgroup.calloperationaction">
+ <postAction id="org.eclipse.papyrus.applystereotypeactionprovider">
+ <stereotypesToApply>
+ <stereotype stereotypeName="MARTE::MARTE_AnalysisModel::PAM::PaResPassStep"/>
+ </stereotypesToApply>
+ </postAction>
+ </aspectTool>
+ <aspectTool description="Create an element with a stereotype"
+ iconpath="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/CallBehaviorAction.gif"
+ id="createCallBehaviorAction11CreationTool_1283328946799" name="PaRunTInstance (Call Behavior Action)"
+ refToolId="activity.nodes.invocationactionsgroup.callbehavioraction">
+ <postAction id="org.eclipse.papyrus.applystereotypeactionprovider">
+ <stereotypesToApply>
+ <stereotype stereotypeName="MARTE::MARTE_AnalysisModel::PAM::PaRunTInstance"/>
+ </stereotypesToApply>
+ </postAction>
+ </aspectTool>
+ <aspectTool description="Create an element with a stereotype"
+ iconpath="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/CallOperationAction.gif"
+ id="createCallOperationAction12CreationTool_1283328949143" name="PaRunTInstance (Call Operation Action)"
+ refToolId="activity.nodes.invocationactionsgroup.calloperationaction">
+ <postAction id="org.eclipse.papyrus.applystereotypeactionprovider">
+ <stereotypesToApply>
+ <stereotype stereotypeName="MARTE::MARTE_AnalysisModel::PAM::PaRunTInstance"/>
+ </stereotypesToApply>
+ </postAction>
+ </aspectTool>
+ <aspectTool description="Create an element with a stereotype"
+ iconpath="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/CallBehaviorAction.gif"
+ id="createCallBehaviorAction11CreationTool_1283328954752" name="PaStep (Call Behavior Action)"
+ refToolId="activity.nodes.invocationactionsgroup.callbehavioraction">
+ <postAction id="org.eclipse.papyrus.applystereotypeactionprovider">
+ <stereotypesToApply>
+ <stereotype stereotypeName="MARTE::MARTE_AnalysisModel::PAM::PaStep"/>
+ </stereotypesToApply>
+ </postAction>
+ </aspectTool>
+ <aspectTool description="Create an element with a stereotype"
+ iconpath="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/CallOperationAction.gif"
+ id="createCallOperationAction12CreationTool_1283328957456" name="PaStep (Call Operation Action)"
+ refToolId="activity.nodes.invocationactionsgroup.calloperationaction">
+ <postAction id="org.eclipse.papyrus.applystereotypeactionprovider">
+ <stereotypesToApply>
+ <stereotype stereotypeName="MARTE::MARTE_AnalysisModel::PAM::PaStep"/>
+ </stereotypesToApply>
+ </postAction>
+ </aspectTool>
+ </drawer>
+ </content>
+</paletteDefinition> \ No newline at end of file
diff --git a/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/palettes/ActivityDiag-SAM.Palette.xml b/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/palettes/ActivityDiag-SAM.Palette.xml
index 0f596572554..366cdbe09ab 100644
--- a/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/palettes/ActivityDiag-SAM.Palette.xml
+++ b/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/palettes/ActivityDiag-SAM.Palette.xml
@@ -1 +1,78 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?><paletteDefinition><content><drawer iconpath="/icons/drawer.gif" id="Drawer__1283328761723" name="MARTE/SAM"><aspectTool description="Create an element with a stereotype" iconpath="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/StructuredActivityNode.gif" id="createStructuredActivityNode3CreationTool_1283328732630_1283328806878" name="SaAnalysisContext (GaWorkloadBehavior (Structured Activity Node))" refToolId="createStructuredActivityNode3CreationTool_1283328732630"><postAction id="org.eclipse.papyrus.applystereotypeactionprovider"><stereotypesToApply><stereotype stereotypeName="MARTE::MARTE_AnalysisModel::SAM::SaAnalysisContext"/></stereotypesToApply></postAction></aspectTool><aspectTool description="Create an element with a stereotype" iconpath="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/CallBehaviorAction.gif" id="createCallBehaviorAction11CreationTool_1283328816034" name="SaCommStep (Call Behavior Action)" refToolId="createCallBehaviorAction11CreationTool"><postAction id="org.eclipse.papyrus.applystereotypeactionprovider"><stereotypesToApply><stereotype stereotypeName="MARTE::MARTE_AnalysisModel::SAM::SaCommStep"/></stereotypesToApply></postAction></aspectTool><aspectTool description="Create an element with a stereotype" iconpath="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/CallOperationAction.gif" id="createCallOperationAction12CreationTool_1283328818518" name="SaCommStep (Call Operation Action)" refToolId="createCallOperationAction12CreationTool"><postAction id="org.eclipse.papyrus.applystereotypeactionprovider"><stereotypesToApply><stereotype stereotypeName="MARTE::MARTE_AnalysisModel::SAM::SaCommStep"/></stereotypesToApply></postAction></aspectTool><aspectTool description="Create an element with a stereotype" iconpath="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/ActivityPartition.gif" id="createActivityPartition1CreationTool_1283328829143" name="SaEndtoEndFlow (Activity Partition)" refToolId="createActivityPartition1CreationTool"><postAction id="org.eclipse.papyrus.applystereotypeactionprovider"><stereotypesToApply><stereotype stereotypeName="MARTE::MARTE_AnalysisModel::SAM::SaEndtoEndFlow"/></stereotypesToApply></postAction></aspectTool><aspectTool description="Create an element with a stereotype" iconpath="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/StructuredActivityNode.gif" id="createStructuredActivityNode3CreationTool_1283328844205" name="SaEndtoEndFlow (Structured Activity Node)" refToolId="createStructuredActivityNode3CreationTool"><postAction id="org.eclipse.papyrus.applystereotypeactionprovider"><stereotypesToApply><stereotype stereotypeName="MARTE::MARTE_AnalysisModel::SAM::SaEndtoEndFlow"/></stereotypesToApply></postAction></aspectTool><aspectTool description="Create an element with a stereotype" iconpath="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/CallBehaviorAction.gif" id="createCallBehaviorAction11CreationTool_1283328858204" name="SaStep (Call Behavior Action)" refToolId="createCallBehaviorAction11CreationTool"><postAction id="org.eclipse.papyrus.applystereotypeactionprovider"><stereotypesToApply><stereotype stereotypeName="MARTE::MARTE_AnalysisModel::SAM::SaStep"/></stereotypesToApply></postAction></aspectTool><aspectTool description="Create an element with a stereotype" iconpath="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/CallOperationAction.gif" id="createCallOperationAction12CreationTool_1283328861517" name="SaStep (Call Operation Action)" refToolId="createCallOperationAction12CreationTool"><postAction id="org.eclipse.papyrus.applystereotypeactionprovider"><stereotypesToApply><stereotype stereotypeName="MARTE::MARTE_AnalysisModel::SAM::SaStep"/></stereotypesToApply></postAction></aspectTool></drawer></content></paletteDefinition> \ No newline at end of file
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<paletteDefinition>
+ <content>
+ <drawer iconpath="/icons/drawer.gif" id="Drawer__1283328761723" name="MARTE/SAM">
+ <aspectTool description="Create an element with a stereotype"
+ iconpath="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/StructuredActivityNode.gif"
+ id="createStructuredActivityNode3CreationTool_1283328732630_1283328806878"
+ name="SaAnalysisContext (GaWorkloadBehavior (Structured Activity Node))"
+ refToolId="createStructuredActivityNode3CreationTool_1283328732630">
+ <postAction id="org.eclipse.papyrus.applystereotypeactionprovider">
+ <stereotypesToApply>
+ <stereotype stereotypeName="MARTE::MARTE_AnalysisModel::SAM::SaAnalysisContext"/>
+ </stereotypesToApply>
+ </postAction>
+ </aspectTool>
+ <aspectTool description="Create an element with a stereotype"
+ iconpath="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/CallBehaviorAction.gif"
+ id="createCallBehaviorAction11CreationTool_1283328816034" name="SaCommStep (Call Behavior Action)"
+ refToolId="activity.nodes.invocationactionsgroup.callbehavioraction">
+ <postAction id="org.eclipse.papyrus.applystereotypeactionprovider">
+ <stereotypesToApply>
+ <stereotype stereotypeName="MARTE::MARTE_AnalysisModel::SAM::SaCommStep"/>
+ </stereotypesToApply>
+ </postAction>
+ </aspectTool>
+ <aspectTool description="Create an element with a stereotype"
+ iconpath="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/CallOperationAction.gif"
+ id="createCallOperationAction12CreationTool_1283328818518" name="SaCommStep (Call Operation Action)"
+ refToolId="activity.nodes.invocationactionsgroup.calloperationaction">
+ <postAction id="org.eclipse.papyrus.applystereotypeactionprovider">
+ <stereotypesToApply>
+ <stereotype stereotypeName="MARTE::MARTE_AnalysisModel::SAM::SaCommStep"/>
+ </stereotypesToApply>
+ </postAction>
+ </aspectTool>
+ <aspectTool description="Create an element with a stereotype"
+ iconpath="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/ActivityPartition.gif"
+ id="createActivityPartition1CreationTool_1283328829143" name="SaEndtoEndFlow (Activity Partition)"
+ refToolId="activity.nodes.activitygroup.activitypartition">
+ <postAction id="org.eclipse.papyrus.applystereotypeactionprovider">
+ <stereotypesToApply>
+ <stereotype stereotypeName="MARTE::MARTE_AnalysisModel::SAM::SaEndtoEndFlow"/>
+ </stereotypesToApply>
+ </postAction>
+ </aspectTool>
+ <aspectTool description="Create an element with a stereotype"
+ iconpath="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/StructuredActivityNode.gif"
+ id="createStructuredActivityNode3CreationTool_1283328844205" name="SaEndtoEndFlow (Structured Activity Node)"
+ refToolId="activity.nodes.structuredactions.structuredactivitynode">
+ <postAction id="org.eclipse.papyrus.applystereotypeactionprovider">
+ <stereotypesToApply>
+ <stereotype stereotypeName="MARTE::MARTE_AnalysisModel::SAM::SaEndtoEndFlow"/>
+ </stereotypesToApply>
+ </postAction>
+ </aspectTool>
+ <aspectTool description="Create an element with a stereotype"
+ iconpath="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/CallBehaviorAction.gif"
+ id="createCallBehaviorAction11CreationTool_1283328858204" name="SaStep (Call Behavior Action)"
+ refToolId="activity.nodes.invocationactionsgroup.callbehavioraction">
+ <postAction id="org.eclipse.papyrus.applystereotypeactionprovider">
+ <stereotypesToApply>
+ <stereotype stereotypeName="MARTE::MARTE_AnalysisModel::SAM::SaStep"/>
+ </stereotypesToApply>
+ </postAction>
+ </aspectTool>
+ <aspectTool description="Create an element with a stereotype"
+ iconpath="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/CallOperationAction.gif"
+ id="createCallOperationAction12CreationTool_1283328861517" name="SaStep (Call Operation Action)"
+ refToolId="activity.nodes.invocationactionsgroup.calloperationaction">
+ <postAction id="org.eclipse.papyrus.applystereotypeactionprovider">
+ <stereotypesToApply>
+ <stereotype stereotypeName="MARTE::MARTE_AnalysisModel::SAM::SaStep"/>
+ </stereotypesToApply>
+ </postAction>
+ </aspectTool>
+ </drawer>
+ </content>
+</paletteDefinition> \ No newline at end of file
diff --git a/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/palettes/ActivityDiag-Time.Palette.xml b/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/palettes/ActivityDiag-Time.Palette.xml
index 7603b3cfdda..5de74b9144a 100644
--- a/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/palettes/ActivityDiag-Time.Palette.xml
+++ b/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/palettes/ActivityDiag-Time.Palette.xml
@@ -1 +1,27 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?><paletteDefinition><content><drawer iconpath="/icons/drawer.gif" id="Drawer__1283326723712" name="MARTE/Time"><aspectTool description="Create an element with a stereotype" iconpath="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/DurationConstraint.gif" id="createLocalPostconditionDurationConstraint9CreationTool_1283326807805" name="TimedDurationConstraint" refToolId="createLocalPostconditionDurationConstraint37CreationTool"><postAction id="org.eclipse.papyrus.applystereotypeactionprovider"><stereotypesToApply><stereotype stereotypeName="MARTE::MARTE_Foundations::Time::TimedConstraint"/></stereotypesToApply></postAction></aspectTool><aspectTool description="Create an element with a stereotype" iconpath="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/CallOperationAction.gif" id="createCallOperationAction12CreationTool_1283326872887" name="TimedProcessing (Call Operation Action)" refToolId="createCallOperationAction12CreationTool"><postAction id="org.eclipse.papyrus.applystereotypeactionprovider"><stereotypesToApply><stereotype stereotypeName="MARTE::MARTE_Foundations::Time::TimedProcessing"/></stereotypesToApply></postAction></aspectTool></drawer></content></paletteDefinition> \ No newline at end of file
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<paletteDefinition>
+ <content>
+ <drawer iconpath="/icons/drawer.gif" id="Drawer__1283326723712" name="MARTE/Time">
+ <aspectTool description="Create an element with a stereotype"
+ iconpath="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/DurationConstraint.gif"
+ id="createLocalPostconditionDurationConstraint9CreationTool_1283326807805" name="TimedDurationConstraint"
+ refToolId="activity.nodes.createConstraintsGroup.localpostconditiondurationconstraint">
+ <postAction id="org.eclipse.papyrus.applystereotypeactionprovider">
+ <stereotypesToApply>
+ <stereotype stereotypeName="MARTE::MARTE_Foundations::Time::TimedConstraint"/>
+ </stereotypesToApply>
+ </postAction>
+ </aspectTool>
+ <aspectTool description="Create an element with a stereotype"
+ iconpath="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/CallOperationAction.gif"
+ id="createCallOperationAction12CreationTool_1283326872887" name="TimedProcessing (Call Operation Action)"
+ refToolId="activity.nodes.invocationactionsgroup.calloperationaction">
+ <postAction id="org.eclipse.papyrus.applystereotypeactionprovider">
+ <stereotypesToApply>
+ <stereotype stereotypeName="MARTE::MARTE_Foundations::Time::TimedProcessing"/>
+ </stereotypesToApply>
+ </postAction>
+ </aspectTool>
+ </drawer>
+ </content>
+</paletteDefinition> \ No newline at end of file
diff --git a/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/palettes/StateMachineDiag-CoreElements.Palette.xml b/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/palettes/StateMachineDiag-CoreElements.Palette.xml
index b0a7e025415..5fefd7c28ac 100644
--- a/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/palettes/StateMachineDiag-CoreElements.Palette.xml
+++ b/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/palettes/StateMachineDiag-CoreElements.Palette.xml
@@ -1 +1 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?><paletteDefinition><content><drawer iconpath="/icons/drawer.gif" id="Drawer__1286355073647" name="MARTE/CoreElements"><aspectTool description="Create an element with a stereotype" iconpath="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Transition_local.gif" id="createTransitionCreationTool_1286355130937" name="ModeTransition (Transition)" refToolId="createTransitionCreationTool"><postAction id="org.eclipse.papyrus.applystereotypeactionprovider"><stereotypesToApply><stereotype stereotypeName="MARTE::MARTE_Foundations::CoreElements::ModeTransition"/></stereotypesToApply></postAction></aspectTool><aspectTool description="Create an element with a stereotype" iconpath="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/State.gif" id="createStateCreationTool_1286355133577" name="Mode (State)" refToolId="createStateCreationTool"><postAction id="org.eclipse.papyrus.applystereotypeactionprovider"><stereotypesToApply><stereotype stereotypeName="MARTE::MARTE_Foundations::CoreElements::Mode"/></stereotypesToApply></postAction></aspectTool></drawer></content></paletteDefinition> \ No newline at end of file
+<?xml version="1.0" encoding="UTF-8" standalone="no"?><paletteDefinition><content><drawer iconpath="/icons/drawer.gif" id="Drawer__1286355073647" name="MARTE/CoreElements"><aspectTool description="Create an element with a stereotype" iconpath="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Transition_local.gif" id="createTransitionCreationTool_1286355130937" name="ModeTransition (Transition)" refToolId="statemachine.createEdgesGroup.transition"><postAction id="org.eclipse.papyrus.applystereotypeactionprovider"><stereotypesToApply><stereotype stereotypeName="MARTE::MARTE_Foundations::CoreElements::ModeTransition"/></stereotypesToApply></postAction></aspectTool><aspectTool description="Create an element with a stereotype" iconpath="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/State.gif" id="createStateCreationTool_1286355133577" name="Mode (State)" refToolId="statemachine.createNodesGroup.state"><postAction id="org.eclipse.papyrus.applystereotypeactionprovider"><stereotypesToApply><stereotype stereotypeName="MARTE::MARTE_Foundations::CoreElements::Mode"/></stereotypesToApply></postAction></aspectTool></drawer></content></paletteDefinition> \ No newline at end of file
diff --git a/extraplugins/req/org.eclipse.papyrus.req.reqif/src/org/eclipse/papyrus/req/reqif/transformation/BasicRequirementMerger.java b/extraplugins/req/org.eclipse.papyrus.req.reqif/src/org/eclipse/papyrus/req/reqif/transformation/BasicRequirementMerger.java
deleted file mode 100644
index 03648923a96..00000000000
--- a/extraplugins/req/org.eclipse.papyrus.req.reqif/src/org/eclipse/papyrus/req/reqif/transformation/BasicRequirementMerger.java
+++ /dev/null
@@ -1,425 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2015 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:
- * Mauricio Alferez (CEA LIST) mauricio.alferez@cea.fr - Initial API and implementation
- * Patrick Tessier (CEA LIST) patrick.tesseir@cea.fr- modification
- *
- *****************************************************************************/
-package org.eclipse.papyrus.req.reqif.transformation;
-
-import java.io.ByteArrayInputStream;
-import java.io.ByteArrayOutputStream;
-import java.io.ObjectInputStream;
-import java.io.ObjectOutputStream;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.List;
-
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.util.EcoreUtil;
-import org.eclipse.jface.dialogs.MessageDialog;
-import org.eclipse.swt.widgets.Shell;
-import org.eclipse.uml2.uml.Class;
-import org.eclipse.uml2.uml.Classifier;
-import org.eclipse.uml2.uml.Comment;
-import org.eclipse.uml2.uml.Element;
-import org.eclipse.uml2.uml.NamedElement;
-import org.eclipse.uml2.uml.Package;
-import org.eclipse.uml2.uml.PackageableElement;
-import org.eclipse.uml2.uml.Property;
-import org.eclipse.uml2.uml.Stereotype;
-import org.eclipse.uml2.uml.UMLFactory;
-/**
- * This is a basic merger in order to add requirement from right to left
- * could be improved by using hashmap
- * This algorithm is n2
- *
- */
-public class BasicRequirementMerger {
-
- protected Package leftPackage=null;
- protected Package rightPackage=null;
- protected String matchProperty=null;
- protected String changeableProperty=null;
- protected HashMap<String, Element> leftIndex= new HashMap<>();
- protected HashMap<String, Element> rightIndex= new HashMap<>();
-
- /**
- * Merge information from version2 into version1
- *
- * @param leftPackage
- * is the package where we will do the modifications
- * @param rightPackage
- * is the package that we will analyze
- * @param matchProperty
- * is the stereotype's property name used to determine if one
- * element in basePk is the same than other element in extPk. For
- * example, "id" is a good matchProperty when comparing SysML
- * Requirements
- * @param changeableProperty
- * is the property that we will change if the value of
- * copyAllPropertyValues is false. For example "text".
- * **/
- public BasicRequirementMerger(Package leftPackage, Package rightPackage, String matchProperty, String changeableProperty) {
- this.leftPackage=leftPackage;
- this.rightPackage=rightPackage;
- this.matchProperty=matchProperty;
- this.changeableProperty=changeableProperty;
- }
-
- /**
- *
- *@param checkPackageName
- * is an option. true means that the matched packaged elements
- * must be in packages with the same name.
- * @param copyAllPropertyValues
- * is an option. true means that the user wants to copy the name
- * and all the stereotype values. This option disables the
- * changeableProperty parameter.
- * @param deleteFromBase
- * is an option. True means that element that not match with right will be removed
- * @return true merge finishes successfully
- */
- public boolean merge(boolean checkPackageName, boolean copyAllPropertyValues, boolean deleteFromBase) {
- boolean merged = false;
- merged = updateAndAddFromRight(leftPackage, rightPackage, matchProperty, changeableProperty, checkPackageName, copyAllPropertyValues);
- if (merged && deleteFromBase == I_RI.DELETE_FROM_BASE) {
- deleteInsideLeft( matchProperty, checkPackageName, leftPackage,rightPackage);
- }
- return true;
- }
-
- private boolean deleteInsideLeft(String matchProperty, boolean checkPackageName, Package basePk, Package extPk) {
- List<PackageableElement> delList = new ArrayList<PackageableElement>();
- delList = (getElementsToBeDeleted(basePk, extPk, matchProperty,
- checkPackageName, delList));
- return delList.isEmpty() ? false : confirmDelete( basePk,
- delList, matchProperty);
- }
-
- /**
- * Prepare a list of Packageable Elements to be deleted from basePk
- *
- * @param version1
- * is the package where we will try to find elements to be
- * deleted because they are not anymore in the extPk (which is a
- * version of basePk that evolved separately).
- * @param version2
- * is the package where we will try to find elements that are not
- * in the basePk.
- * @param matchProperty
- * is the stereotype's property name used to determine if one
- * element in basePk is the same than other element in extPk. For
- * example, "id" is a good matchProperty when comparing SysML
- * Requirements
- * @param delList
- * empty list that will store the packageableElements to be
- * deleted.
- * @return list of packageableElements to be deleted.
- */
- private List<PackageableElement> getElementsToBeDeleted(
- org.eclipse.uml2.uml.Package version1,
- org.eclipse.uml2.uml.Package version2, String matchProperty,
- boolean checkPackageName, List<PackageableElement> delList) {
-
-// for (PackageableElement peInBasePk : version1.getPackagedElements()) {
-// if (peInBasePk instanceof org.eclipse.uml2.uml.Class
-// && peInBasePk.getAppliedStereotypes().size() > 0) {
-// Stereotype stOfPeInBasePk = peInBasePk.getAppliedStereotypes()
-// .get(0);
-// boolean foundMatch = false;
-// foundMatch = matchStereotypedPackagedElements(version2,
-// peInBasePk, stOfPeInBasePk, matchProperty, null,
-// checkPackageName, !I_RI.PERFORM_CHANGES,
-// !I_RI.COPY_All_PROPERTY_VALUES);
-// if (!foundMatch) {
-// delList.add(peInBasePk);
-// }
-// } else if (peInBasePk instanceof Package) {
-// return getElementsToBeDeleted((Package) peInBasePk, version2,
-// matchProperty, checkPackageName, delList);
-// }
-// }
- return delList;
- }
-
- /**
- * Confirm to delete or not a list of packageable elements
- *
- * @param window IWorkbenchWindow to receive the confirmation to delete the elements
- * @param baseModel package or model where the elements in delList will be deleted
- * @param delList list of elements to be deleted
- * @param matchProperty
- * is the stereotype's property name used to determine if one
- * element in basePk is the same than other element in
- * externalPk. For example "id" when comparing SysML
- * Requirements.
- * @return true if deletion finishes successfully
- */
- private boolean confirmDelete(Package baseModel,
- List<PackageableElement> delList, String matchProperty) {
- StringBuffer humanReadableList = new StringBuffer();
-
- for (PackageableElement pe : delList) {
- humanReadableList.append("\n"
- + matchProperty
- + I_RI.TOOL_PROPERTY_SEPARATOR
- + pe.getValue(pe.getAppliedStereotypes().get(0),
- matchProperty) + "\t"
- + I_RI.PACKAGED_ELEMENT_NAME_ATT
- + I_RI.TOOL_PROPERTY_SEPARATOR + pe.getName());
- }
- if (MessageDialog.openQuestion(new Shell(), I_RI.TOOL_TITLE,
- I_RI.TOOL_DEL_CONFIRM + humanReadableList)) {
- return deletePackagedElements(delList, baseModel, matchProperty);
- }
- return false;
- }
-
- /**
- * Delete a list of packageable elements without any confirmation from the user
- *
- * @param delList list of elements to be deleted
- * @param basePk
- * @param matchProperty
- * @return
- */
- private boolean deletePackagedElements(List<PackageableElement> delList,
- Package basePk, String matchProperty) {
- for (Iterator<PackageableElement> elementsToDelete = delList.iterator(); elementsToDelete
- .hasNext();) {
- PackageableElement del = elementsToDelete.next();
- Stereotype stOfDel = del.getAppliedStereotypes().get(0);
- String matchInDel = (String) del.getValue(stOfDel, matchProperty);
-
- for (Iterator<PackageableElement> elementsInBasePk = basePk
- .getPackagedElements().iterator(); elementsInBasePk
- .hasNext();) {
- PackageableElement peInBasePk = elementsInBasePk.next();
- if (peInBasePk instanceof org.eclipse.uml2.uml.Class
- && peInBasePk.getAppliedStereotypes().size() > 0) {
- Stereotype stOfmatchInBasePk = peInBasePk
- .getAppliedStereotypes().get(0);
- String matchInBasePk = (String) peInBasePk.getValue(
- stOfmatchInBasePk, matchProperty);
- if (matchInDel.trim().contentEquals(matchInBasePk.trim())) {
- peInBasePk.destroy();
- break;
- }
- } else if (peInBasePk instanceof Package) {
- return deletePackagedElements(delList,
- (Package) peInBasePk, matchProperty);
- }
- }
- }
- return true;
- }
-
-
- /**
- * Merge information from version2 into version1
- *
- * @param leftContainer
- * is the package where we will do the modifications
- * @param rightContainer
- * is the package that we will analyze
- * @param matchProperty
- * is the stereotype's property name used to determine if one
- * element in basePk is the same than other element in extPk. For
- * example, "id" is a good matchProperty when comparing SysML
- * Requirements
- * @param changeableProperty
- * is the property that we will change if the value of
- * copyAllPropertyValues is false. For example "text".
- * @param chkPkNameOption
- * is an option. true means that the matched packaged elements
- * must be in packages with the same name.
- * @param copyOption
- * is an option. true means that the user wants to copy the name
- * and all the stereotype values. This option disables the
- * changeableProperty parameter.
- * @return true merge finishes successfully
- */
- private boolean updateAndAddFromRight(org.eclipse.uml2.uml.Element leftContainer, org.eclipse.uml2.uml.Element rightContainer, String matchProperty,
- String changeableProperty, boolean chkPkNameOption, boolean copyOption) {
- for (Element subElementFromRight : rightContainer.getOwnedElements()) {
- Element foundLeftElement = null;
- if (subElementFromRight.getAppliedStereotypes().size() > 0) {
- Stereotype appliedStereotypeFromRight= subElementFromRight.getAppliedStereotypes().get(0);
-
- foundLeftElement = matchStereotypedPackagedElements(leftContainer,subElementFromRight, appliedStereotypeFromRight, matchProperty,
- changeableProperty);
- if(foundLeftElement!=null){
- copyConfig(subElementFromRight, appliedStereotypeFromRight, changeableProperty,foundLeftElement, appliedStereotypeFromRight, copyOption);
-
- }
- else {
- foundLeftElement = addElementInsideLeft(leftContainer, subElementFromRight, appliedStereotypeFromRight);
- }
- }
- if (subElementFromRight.getOwnedElements().size()>0) {
- return updateAndAddFromRight(foundLeftElement, subElementFromRight, matchProperty, changeableProperty, chkPkNameOption, copyOption);
- }
- }
- return true;
- }
-
- /**
- * Add a packageable element from right to left
- *
- * @param leftContainer
- * is the package where we will add new elements from rightPackage.
- * @param elementFromRight
- * Packageable element in Right package.
- * @param appliedSterotypeRight
- * stereotype of peInExtPk.
- * @return createdElement
- */
- private Element addElementInsideLeft(Element leftContainer,Element elementFromRight, Stereotype appliedSterotypeRight) {
- Element result= null;
- EObject stApplication_right = elementFromRight.getStereotypeApplication(appliedSterotypeRight);
- ArrayList<EObject> subsetToCopy=new ArrayList<EObject>();
- subsetToCopy.add(elementFromRight);
- subsetToCopy.add(elementFromRight.getStereotypeApplication(appliedSterotypeRight));
- Collection<EObject> copy=EcoreUtil.copyAll(subsetToCopy);
- for (EObject eObject : copy) {
- if( eObject instanceof Element){
- if( eObject instanceof Comment){
- (leftContainer).getOwnedComments().add((Comment) eObject);}
- else if( leftContainer instanceof Package && eObject instanceof PackageableElement ){
- ((Package)leftContainer).getPackagedElements().add((PackageableElement) eObject);}
- else if( leftContainer instanceof Classifier && eObject instanceof Classifier){
- ((Class)leftContainer).getNestedClassifiers().add((Classifier) eObject);}
- else{
- System.err.println("Impossible to add "+ eObject+ " inside"+ leftContainer);
- }
- result=(Element) eObject;
- }
- else{
- leftContainer.eResource().getContents().add(eObject);
- }
- }
- return result;
- }
-
- /**
- * Copy all not derived stereotype property values without changing the base
- * class
- *
- * @param peInExtPk
- * Packageable element in external package.
- * @param stOfExtPe
- * stereotype of peInExtPk.
- * @param peInBasePk
- * Packageable element in base package that will receive the new
- * values from peInExtPk.
- */
- private void copyAllStereotypePropertyValues(Element peInExtPk,
- Stereotype stOfExtPe, Element peInBasePk) {
- for (Property stProperty : stOfExtPe.getAllAttributes()) {
- if (!stProperty.isReadOnly() && !stProperty.isDerived()
- && !stProperty.getName().startsWith("base_")) {
- peInBasePk.setValue(stOfExtPe, stProperty.getName(),
- peInExtPk.getValue(stOfExtPe, stProperty.getName()));
- }
- }
- }
-
- /**
- * Matches two stereotyped packageable elements based on a matchProperty at the current level
- *
- * @param containerLeft
- * is the container where we look for elementRight
- * @param elementRight
- * is the stereotyped PackagedElement to be matched. For example,
- * the packaged element of type "org.eclipse.uml2.uml.Class"
- * stereotyped with "ReqType5".
- * @param appliedStereotypeRight
- * is the Stereotype that defines the matchProperty. For example,
- * the stereotype "ReqType5" defines the matchProperty "id".
- * @param matchProperty
- * is the stereotype's property name used to determine if one
- * element in basePk matches other element in extPk. For example,
- * the stereotype "Requirement" in the profile SysML Requirements
- * defines the property "id" that is used frequently as a
- * matchProperty.
- * @param changeableProperty
- * is the property whose value will be changed. For example the
- * property "text" in the stereotype "Requirement".
- * @param checkPackageName
- * is an option. true means that the matched packaged elements
- * must be in packages with the same name.
- * @param performChanges
- * is an option. true means that the user wants to actually
- * change the value of changeableProperty. false will disable the
- * copyAllPropertyValues option.
-
- * @return the element that matches
- */
- private Element matchStereotypedPackagedElements(Element containerLeft, Element elementRight,
- Stereotype appliedStereotypeRight, String matchProperty,String changeableProperty) {
- String matchPropertyValueRight = (String) elementRight.getValue(appliedStereotypeRight, matchProperty);
- if(matchPropertyValueRight!=null){
- for (Element subElementLeft : containerLeft.getOwnedElements()) {
- if (subElementLeft.getAppliedStereotypes().size() > 0) {
- Stereotype appliedStereotypeLeft = subElementLeft.getAppliedStereotypes().get(0);
- if (appliedStereotypeLeft.getName().equals(appliedStereotypeRight.getName())) {
- String matchPropertyValueLeft = (String) subElementLeft.getValue(appliedStereotypeLeft, matchProperty);
- if(matchPropertyValueLeft!=null){
- if (matchPropertyValueRight.trim().equals(matchPropertyValueLeft.trim())) {
- return subElementLeft;
- }
- }
- }
- }
- }
- }
- return null;
- }
-
- /**
- * Copy the name of an element and either one or all stereotype property
- * values depending on the parameter copyOption
- *
- * @param rightElement
- * is the packageable element in external package
- * @param AppliedStereotypeRight
- * is the stereotype of peInExtPk
- * @param changeableProperty
- * is the property to copy when the value of copyOption is false
- * @param leftElement
- * is the stereotyped packageable element whose value(s) will be
- * modified.
- * @param stOfPeInBasePk
- * is the stereotype of peInBasePk
- * @param copyOption
- * is the copy option. true means to copy all the stereotype
- * property values. false means to copy only the property in the
- * parameter changeableProperty.
- */
- private void copyConfig(Element rightElement, Stereotype AppliedStereotypeRight,
- String changeableProperty, Element leftElement,
- Stereotype appliedStereotype, boolean copyOption) {
- if (copyOption == I_RI.COPY_All_PROPERTY_VALUES) {
- if( leftElement instanceof NamedElement){
- ((NamedElement)leftElement).setName(((NamedElement)rightElement).getName());
- }
- for (Stereotype st : leftElement.getAppliedStereotypes()) {
- copyAllStereotypePropertyValues(rightElement, st, leftElement);
- }
- } else if (copyOption != I_RI.COPY_All_PROPERTY_VALUES) {
- leftElement.setValue(appliedStereotype, changeableProperty,
- rightElement.getValue(AppliedStereotypeRight, changeableProperty));
- }
- }
-
-}
diff --git a/extraplugins/req/org.eclipse.papyrus.req.reqif/src/org/eclipse/papyrus/req/reqif/transformation/I_RI.java b/extraplugins/req/org.eclipse.papyrus.req.reqif/src/org/eclipse/papyrus/req/reqif/transformation/I_RI.java
deleted file mode 100644
index 495a4d35d1b..00000000000
--- a/extraplugins/req/org.eclipse.papyrus.req.reqif/src/org/eclipse/papyrus/req/reqif/transformation/I_RI.java
+++ /dev/null
@@ -1,34 +0,0 @@
-package org.eclipse.papyrus.req.reqif.transformation;
-
-public interface I_RI {
- /** name of the stereotype "Requirement" */
- public static final String REQ = "Requirement";
- /** name of property "text" of the stereotype "Requirement" */
- public static final String REQ_TEXT_ATT = "text";
- /** name of property "id" of the stereotype "Requirement" */
- public static final String REQ_ID_ATT = "id";
- /** name of property "name" of PackagedElement */
- public static final String PACKAGED_ELEMENT_NAME_ATT = "name";
- /** Qualified name of stereotype Requirement */
- public static final String REQ_STEREOTYPE = "SysML::Requirements::Requirement";
- /** Delete from the base model the requirements that are not in the external model*/
- public static final boolean DELETE_FROM_BASE = true;
- /** Copy all contents without references to the original object during a merge process. If it is true, it will overwrite the "changeable parameter" parameter */
- public static final boolean COPY_All_PROPERTY_VALUES = true;
- /** Change values in properties when the matchStereotypedPackagedElements method finds a match */
- public static final boolean PERFORM_CHANGES = true;
- /** Check package name during matching*/
- public static final boolean CHECK_PACKAGE_NAME = true;
- /** name to show in at the beginning of user messages */
- public static final String TOOL_TITLE = "Papyrus SysML REQ Reimport";
- /** Confirmation message to make sure that the user really wants to delete requirements in base model*/
- public static final String TOOL_DEL_CONFIRM = "Do you really want to delete: ";
- /** Papyrus REQ reimport message when the tool finished without problems */
- public static final String TOOL_SUCCESS = "Successfull re-import";
- /** Papyrus REQ reimport message when the tool finished with problems */
- public static final String TOOL_FAIL = "UnSuccessfull re-import";
- /** Constant message when a File cannot be read*/
- public static final String TOOL_ERR_FILE_READ ="Not Readable files";
- /** Constant property value separator*/
- public static final String TOOL_PROPERTY_SEPARATOR =": ";
-}
diff --git a/extraplugins/req/org.eclipse.papyrus.req.reqif/src/org/eclipse/papyrus/req/reqif/transformation/ReqIFImporter.java b/extraplugins/req/org.eclipse.papyrus.req.reqif/src/org/eclipse/papyrus/req/reqif/transformation/ReqIFImporter.java
index c682503e91c..7cf3b6da8c3 100644
--- a/extraplugins/req/org.eclipse.papyrus.req.reqif/src/org/eclipse/papyrus/req/reqif/transformation/ReqIFImporter.java
+++ b/extraplugins/req/org.eclipse.papyrus.req.reqif/src/org/eclipse/papyrus/req/reqif/transformation/ReqIFImporter.java
@@ -43,6 +43,8 @@ import org.eclipse.papyrus.req.reqif.assistant.CreateOrSelectProfilDialog;
import org.eclipse.papyrus.req.reqif.assistant.SelectProfilDialog;
import org.eclipse.papyrus.req.reqif.integration.assistant.ChooseAttributeEnumerationDialog;
import org.eclipse.papyrus.req.reqif.preference.ReqIFPreferenceConstants;
+import org.eclipse.papyrus.req.reqif.util.BasicRequirementMerger;
+import org.eclipse.papyrus.req.reqif.util.IRequirementMerger;
import org.eclipse.papyrus.uml.extensionpoints.profile.IRegisteredProfile;
import org.eclipse.papyrus.uml.extensionpoints.profile.RegisteredProfile;
import org.eclipse.papyrus.uml.extensionpoints.utils.Util;
@@ -316,9 +318,9 @@ public abstract class ReqIFImporter extends ReqIFBaseTransformation {
}
targetUMLModel=reImportModel;
boolean importResult= importReqIFModel ( interactive);
- BasicRequirementMerger merger= new BasicRequirementMerger(firstVersion, targetUMLModel, I_RI.REQ_ID_ATT,null);
- merger.merge( !I_RI.CHECK_PACKAGE_NAME, I_RI.COPY_All_PROPERTY_VALUES, I_RI.DELETE_FROM_BASE);
-
+ IRequirementMerger merger= new BasicRequirementMerger(firstVersion, targetUMLModel, I_SysMLStereotype.REQUIREMENT_ID_ATT, true, domain);
+ merger.merge();
+ firstVersion.eResource().getContents().remove(targetUMLModel);
return importResult;
}
/**
diff --git a/extraplugins/req/org.eclipse.papyrus.req.reqif/src/org/eclipse/papyrus/req/reqif/util/BasicRequirementMerger.java b/extraplugins/req/org.eclipse.papyrus.req.reqif/src/org/eclipse/papyrus/req/reqif/util/BasicRequirementMerger.java
new file mode 100644
index 00000000000..02f1e354811
--- /dev/null
+++ b/extraplugins/req/org.eclipse.papyrus.req.reqif/src/org/eclipse/papyrus/req/reqif/util/BasicRequirementMerger.java
@@ -0,0 +1,391 @@
+/*****************************************************************************
+ * Copyright (c) 2015 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:
+ * Mauricio Alferez (CEA LIST) mauricio.alferez@cea.fr - Initial API and implementation
+ * Patrick Tessier (CEA LIST) patrick.tesseir@cea.fr- modification
+ *
+ *****************************************************************************/
+package org.eclipse.papyrus.req.reqif.util;
+
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.HashMap;
+import java.util.List;
+
+import org.eclipse.emf.common.command.Command;
+import org.eclipse.emf.ecore.EObject;
+import org.eclipse.emf.transaction.TransactionalEditingDomain;
+import org.eclipse.gmf.runtime.common.core.command.ICommand;
+import org.eclipse.gmf.runtime.emf.type.core.requests.DestroyElementRequest;
+import org.eclipse.papyrus.infra.services.edit.service.ElementEditServiceUtils;
+import org.eclipse.papyrus.infra.services.edit.service.IElementEditService;
+import org.eclipse.uml2.uml.Class;
+import org.eclipse.uml2.uml.Classifier;
+import org.eclipse.uml2.uml.Comment;
+import org.eclipse.uml2.uml.Element;
+import org.eclipse.uml2.uml.NamedElement;
+import org.eclipse.uml2.uml.Package;
+import org.eclipse.uml2.uml.PackageableElement;
+import org.eclipse.uml2.uml.Property;
+import org.eclipse.uml2.uml.Stereotype;
+/**
+ * This is a basic merger in order to add requirement from right to left
+ * could be improved by using hashmap
+ * This algorithm is n2
+ *
+ */
+public class BasicRequirementMerger implements IRequirementMerger {
+
+ protected Package leftPackage=null;
+ protected Package rightPackage=null;
+ protected String matchProperty=null;
+ protected String changeableProperty=null;
+ protected EqualityHelperWithoutContainment equalityHelper= new EqualityHelperWithoutContainment();
+ protected CopierWithoutContainment copier= new CopierWithoutContainment();
+ protected TransactionalEditingDomain domain;
+ protected ArrayList<Element> elementToDelete= new ArrayList<Element>();
+ protected ArrayList<Element> addedElements= new ArrayList<Element>();
+ protected boolean deleteElements=true;
+
+ /* (non-Javadoc)
+ * @see org.eclipse.papyrus.req.reqif.transformation.IRequirementMerger#getElementToDelete()
+ */
+ @Override
+ public ArrayList<Element> getElementToDelete() {
+ return elementToDelete;
+ }
+
+ /* (non-Javadoc)
+ * @see org.eclipse.papyrus.req.reqif.transformation.IRequirementMerger#getAddedElements()
+ */
+ @Override
+ public ArrayList<Element> getAddedElements() {
+ return addedElements;
+ }
+
+
+ /**
+ * Merge information from version2 into version1
+ *
+ * @param leftPackage
+ * is the package where we will do the modifications
+ * @param rightPackage
+ * is the package that we will analyze
+ * @param matchProperty
+ * is the stereotype's property name used to determine if one
+ * element in basePk is the same than other element in extPk. For
+ * example, "id" is a good matchProperty when comparing SysML
+ * Requirements
+ * @param changeableProperty
+ * is the property that we will change if the value of
+ * copyAllPropertyValues is false. For example "text".
+ * **/
+ public BasicRequirementMerger(Package leftPackage, Package rightPackage, String matchProperty, boolean deleteElements, TransactionalEditingDomain domain) {
+ this.leftPackage=leftPackage;
+ this.rightPackage=rightPackage;
+ this.matchProperty=matchProperty;
+ this.domain=domain;
+ this.deleteElements=deleteElements;
+ }
+
+ /* (non-Javadoc)
+ * @see org.eclipse.papyrus.req.reqif.transformation.IRequirementMerger#merge()
+ */
+ @Override
+ public boolean merge() {
+ boolean merged = false;
+ equalityHelper=new EqualityHelperWithoutContainment();
+ merged = updateAndAddFromRight(leftPackage, rightPackage, matchProperty);
+ equalityHelper=new EqualityHelperWithoutContainment();
+ if (merged ) {
+ deleteInsideLeft( matchProperty, leftPackage,rightPackage);
+ }
+ return true;
+ }
+
+ /**
+ *
+ * @param matchProperty the property if stereotype used to delete element
+ * @param checkPackageName
+ * @param leftPackage the package where element will be removed
+ * @param rightPackage the package that will be compared
+ */
+ protected void deleteInsideLeft(String matchProperty, Package leftPackage, Package rightPackage) {
+ elementToDelete = getElementsToBeDeleted(leftPackage, rightPackage, matchProperty, elementToDelete);
+ filterReq( matchProperty);
+ if(deleteElements){
+ deleteElements(elementToDelete, leftPackage);
+ }
+ }
+
+ /**
+ * filter elements that has an ID property
+ * @param matchProperty
+ */
+ protected void filterReq(String matchProperty) {
+ ArrayList<Element> result= new ArrayList<Element>();
+ for (Element elementToDelete : elementToDelete) {
+ if( elementToDelete.getAppliedStereotypes().size()>0){
+ Stereotype appliedStereotype=elementToDelete.getAppliedStereotypes().get(0);
+ if((elementToDelete.getStereotypeApplication(appliedStereotype)).eClass().getEStructuralFeature(matchProperty)!=null){
+ String idValue= (String) elementToDelete.getValue(appliedStereotype, matchProperty);
+ if( idValue!=null){
+ result.add(elementToDelete);
+ }
+ }
+ }
+ }
+ elementToDelete=result;
+
+ }
+
+ /**
+ * Prepare a list of Packageable Elements to be deleted from basePk
+ *
+ * @param version1
+ * is the package where we will try to find elements to be
+ * deleted because they are not anymore in the extPk (which is a
+ * version of basePk that evolved separately).
+ * @param version2
+ * is the package where we will try to find elements that are not
+ * in the basePk.
+ * @param matchProperty
+ * is the stereotype's property name used to determine if one
+ * element in basePk is the same than other element in extPk. For
+ * example, "id" is a good matchProperty when comparing SysML
+ * Requirements
+ * @param delList
+ * empty list that will store the packageableElements to be
+ * deleted.
+ * @return list of packageableElements to be deleted.
+ */
+ protected ArrayList<Element> getElementsToBeDeleted(
+ Element containerLeft, Element containerRight,
+ String matchProperty,ArrayList<Element> delList) {
+
+ for (Element elementLeft : containerLeft.getOwnedElements()) {
+ Element foundRightElement = null;
+ foundRightElement = lookforEquivalent(containerRight,elementLeft, matchProperty);
+ if(foundRightElement==null){
+ delList.add(elementLeft);
+ }
+ if (elementLeft.getOwnedElements().size()>0&&foundRightElement!=null) {
+ getElementsToBeDeleted(elementLeft, foundRightElement, matchProperty, delList);
+ }
+ }
+ return delList;
+ }
+
+
+ /**
+ * Delete a list of packageable elements without any confirmation from the user
+ *
+ * @param delList list of elements to be deleted
+ * @param basePk the container of all element it can be indirect.
+ * @param matchProperty
+ * @return true if no problems
+ */
+ protected boolean deleteElements(List<Element> delList, Package basePk) {
+ IElementEditService provider = ElementEditServiceUtils.getCommandProvider(basePk);
+ if(provider == null) {
+ return false;
+ }
+
+ for (Element elementToDelete : delList) {
+ if( elementToDelete!=null){
+ ICommand createGMFCommand = provider.getEditCommand(new DestroyElementRequest(domain, elementToDelete, false));
+
+ if(createGMFCommand != null) {
+ Command emfCommand = new org.eclipse.papyrus.commands.wrappers.GMFtoEMFCommandWrapper(createGMFCommand);
+ domain.getCommandStack().execute(emfCommand);
+ }
+ }
+ }
+ return true;
+ }
+
+
+ /**
+ * Merge information from right into left
+ *
+ * @param leftContainer
+ * is the package where we will do the modifications
+ * @param rightContainer
+ * is the package that we will analyze
+ * @param matchProperty
+ * is the stereotype's property name used to determine if one
+ * element in basePk is the same than other element in extPk. For
+ * example, "id" is a good matchProperty when comparing SysML
+ * Requirements
+ * @param changeableProperty
+ * is the property that we will change if the value of
+ * copyAllPropertyValues is false. For example "text".
+ * @param copyOption
+ * is an option. true means that the user wants to copy the name
+ * and all the stereotype values. This option disables the
+ * changeableProperty parameter.
+ * @return true merge finishes successfully
+ */
+ protected boolean updateAndAddFromRight(org.eclipse.uml2.uml.Element leftContainer, org.eclipse.uml2.uml.Element rightContainer, String matchProperty) {
+ for (Element subElementFromRight : rightContainer.getOwnedElements()) {
+ Element foundLeftElement = null;
+ foundLeftElement = lookforEquivalent(leftContainer,subElementFromRight, matchProperty);
+ if(foundLeftElement!=null){
+ copyConfig(subElementFromRight, foundLeftElement);
+
+ }
+ else {
+ foundLeftElement = addElementInsideLeft(leftContainer, subElementFromRight);
+ }
+
+ if (subElementFromRight.getOwnedElements().size()>0) {
+ updateAndAddFromRight(foundLeftElement, subElementFromRight, matchProperty);
+ }
+ }
+ return true;
+ }
+
+ /**
+ * Add an element from right to left
+ *
+ * @param leftContainer
+ * is the package where we will add new elements from rightPackage.
+ * @param elementFromRight
+ * element in Right package.
+ * @param appliedSterotypeRight
+ * stereotype of peInExtPk.
+ * @return createdElement
+ */
+ protected Element addElementInsideLeft(Element leftContainer,Element elementFromRight) {
+ Element result= null;
+ ArrayList<EObject> subsetToCopy=new ArrayList<EObject>();
+ subsetToCopy.add(elementFromRight);
+ for (EObject stereoAppli : elementFromRight.getStereotypeApplications()) {
+ subsetToCopy.add(stereoAppli);
+ }
+
+
+ Collection<EObject> copy=copier.copyAll(subsetToCopy);
+ copier.copyReferences();
+ for (EObject eObject : copy) {
+ if( eObject instanceof Element){
+ addedElements.add((Element)eObject);
+ if( eObject instanceof Comment){
+ (leftContainer).getOwnedComments().add((Comment) eObject);}
+ else if( leftContainer instanceof Package && eObject instanceof PackageableElement ){
+ ((Package)leftContainer).getPackagedElements().add((PackageableElement) eObject);}
+ else if( leftContainer instanceof Classifier && eObject instanceof Classifier){
+ ((Class)leftContainer).getNestedClassifiers().add((Classifier) eObject);}
+ else{
+ System.err.println("Impossible to add "+ eObject+ " inside"+ leftContainer);
+ }
+ result=(Element) eObject;
+ }
+ else{
+ leftContainer.eResource().getContents().add(eObject);
+ }
+ }
+ return result;
+ }
+
+ /**
+ * Copy all not derived stereotype property values without changing the base
+ * class
+ *
+ * @param peInExtPk
+ * Packageable element in external package.
+ * @param stOfExtPe
+ * stereotype of peInExtPk.
+ * @param peInBasePk
+ * Packageable element in base package that will receive the new
+ * values from peInExtPk.
+ */
+ protected void copyAllStereotypePropertyValues(Element peInExtPk,
+ Stereotype stOfExtPe, Element peInBasePk) {
+ for (Property stProperty : stOfExtPe.getAllAttributes()) {
+ if (!stProperty.isReadOnly() && !stProperty.isDerived() && !stProperty.getName().startsWith("base_")) {
+ peInBasePk.setValue(stOfExtPe, stProperty.getName(),peInExtPk.getValue(stOfExtPe, stProperty.getName()));
+ }
+ }
+ }
+
+ /**
+ * Matches two stereotyped packageable elements based on a matchProperty at the current level
+ *
+ * @param researchSpace
+ * is the container where we look for elementRight
+ * @param wantedElement
+ * is the stereotyped PackagedElement to be matched. For example,
+ * the packaged element of type "org.eclipse.uml2.uml.Class"
+ * stereotyped with "ReqType5".
+ * @param matchProperty
+ * is the stereotype's property name used to determine if one
+ * element in basePk matches other element in extPk. For example,
+ * the stereotype "Requirement" in the profile SysML Requirements
+ * defines the property "id" that is used frequently as a
+ * matchProperty.
+
+ * @return the element that matches
+ */
+ protected Element lookforEquivalent(Element researchSpace, Element wantedElement, String matchProperty) {
+
+ for (Element potentialElement : researchSpace.getOwnedElements()) {
+ if(equalityHelper.equals(potentialElement, wantedElement)){
+
+ if(wantedElement.getAppliedStereotypes().size()==0){
+ return potentialElement;
+ }
+ //they have a stereotype
+ Stereotype wantedAppliedStereotype=wantedElement.getAppliedStereotypes().get(0);
+ //have they the same applied stereotype?
+ if(!potentialElement.isStereotypeApplied(wantedAppliedStereotype)){
+ return null;
+ }
+ String wantedPropertyValue = null;
+ String potentialPropertyValueLeft=null;
+ if((wantedElement.getStereotypeApplication(wantedAppliedStereotype)).eClass().getEStructuralFeature(matchProperty)!=null){
+ wantedPropertyValue = (String) wantedElement.getValue(wantedAppliedStereotype, matchProperty);
+ }
+ if((potentialElement.getStereotypeApplication(wantedAppliedStereotype)).eClass().getEStructuralFeature(matchProperty)!=null){
+ potentialPropertyValueLeft = (String) potentialElement.getValue(wantedAppliedStereotype, matchProperty);
+ }
+ if(potentialPropertyValueLeft==null && wantedPropertyValue==null){
+ return potentialElement;
+ }
+ if(potentialPropertyValueLeft!=null&&wantedPropertyValue!=null){
+ if (wantedPropertyValue.trim().equals(potentialPropertyValueLeft.trim())) {
+ return potentialElement;
+ }
+ }
+ }
+
+ }
+ return null;
+ }
+
+ /**
+ * Copy the name of an element and either one or all stereotype property
+ * values depending on the parameter copyOption
+ *
+ * @param rightElement
+ * is the packageable element in external package
+ * @param leftElement
+ * is the stereotyped packageable element whose value(s) will be
+ * modified.
+ */
+ protected void copyConfig(Element rightElement, Element leftElement) {
+ if( leftElement instanceof NamedElement){
+ ((NamedElement)leftElement).setName(((NamedElement)rightElement).getName());
+ }
+ for (Stereotype st : leftElement.getAppliedStereotypes()) {
+ copyAllStereotypePropertyValues(rightElement, st, leftElement);
+ }
+ }
+}
diff --git a/extraplugins/req/org.eclipse.papyrus.req.reqif/src/org/eclipse/papyrus/req/reqif/util/CopierWithoutContainment.java b/extraplugins/req/org.eclipse.papyrus.req.reqif/src/org/eclipse/papyrus/req/reqif/util/CopierWithoutContainment.java
new file mode 100644
index 00000000000..b937a390e3d
--- /dev/null
+++ b/extraplugins/req/org.eclipse.papyrus.req.reqif/src/org/eclipse/papyrus/req/reqif/util/CopierWithoutContainment.java
@@ -0,0 +1,473 @@
+package org.eclipse.papyrus.req.reqif.util;
+
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.Iterator;
+import java.util.LinkedHashMap;
+import java.util.List;
+import java.util.Map;
+
+import org.eclipse.emf.ecore.EAttribute;
+import org.eclipse.emf.ecore.EClass;
+import org.eclipse.emf.ecore.EObject;
+import org.eclipse.emf.ecore.EReference;
+import org.eclipse.emf.ecore.EStructuralFeature;
+import org.eclipse.emf.ecore.InternalEObject;
+import org.eclipse.emf.ecore.util.EcoreUtil;
+import org.eclipse.emf.ecore.util.FeatureMap;
+import org.eclipse.emf.ecore.util.FeatureMapUtil;
+import org.eclipse.emf.ecore.util.InternalEList;
+
+/**
+ * A mapping building traverser of a collection of {@link EObject#eAllContents content trees};
+ * the map is from {@link EObject} to <code>EObject</code>, i.e., from original to copy;
+ * use {@link EcoreUtil#copy EcoreUtil.copy} or {@link EcoreUtil#copyAll EcoreUtil.copyAll} to do routine copies.
+ * Since this implementation extends a Map implementation, it acts as the result of the over all copy.
+ * The client can call {@link #copy copy} and {@link #copyAll copyAll} repeatedly.
+ * When all the objects have been copied,
+ * the client should call {@link #copyReferences copyReferences}
+ * to copy the {@link #copyReference appropriate} {@link EObject#eCrossReferences cross references}.
+ *<pre>
+ * Copier copier = new Copier();
+ * EObject result = copier.copy(eObject);
+ * Collection results = copier.copyAll(eObjects);
+ * copier.copyReferences();
+ *</pre>
+ * The copier delegates to {@link #copyContainment copyContainment}, {@link #copyAttribute copyAttribute} during the copy phase
+ * and to {@link #copyReference copyReference}, during the cross reference phase.
+ * This allows tailored handling through derivation.
+ */
+public class CopierWithoutContainment extends LinkedHashMap<EObject, EObject>
+{
+ private static final long serialVersionUID = 1L;
+
+ /**
+ * Whether proxies should be resolved during copying.
+ */
+ protected boolean resolveProxies = true;
+
+ /**
+ * Whether non-copied references should be used during copying.
+ */
+ protected boolean useOriginalReferences = true;
+
+ /**
+ * Creates an instance.
+ */
+ public CopierWithoutContainment()
+ {
+ super();
+ }
+
+ /**
+ * Creates an instance that resolves proxies or not as specified.
+ * @param resolveProxies whether proxies should be resolved while copying.
+ */
+ public CopierWithoutContainment(boolean resolveProxies)
+ {
+ this.resolveProxies = resolveProxies;
+ }
+
+ /**
+ * Creates an instance that resolves proxies or not and uses non-copied references or not as specified.
+ * @param resolveProxies whether proxies should be resolved while copying.
+ * @param useOriginalReferences whether non-copied references should be used while copying.
+ */
+ public CopierWithoutContainment(boolean resolveProxies, boolean useOriginalReferences)
+ {
+ this.resolveProxies = resolveProxies;
+ this.useOriginalReferences = useOriginalReferences;
+ }
+
+ /**
+ * Returns a collection containing a copy of each EObject in the given collection.
+ * @param eObjects the collection of objects to copy.
+ * @return the collection of copies.
+ */
+ public <T> Collection<T> copyAll(Collection<? extends T> eObjects)
+ {
+ Collection<T> result = new ArrayList<T>(eObjects.size());
+ for (Object object : eObjects)
+ {
+ @SuppressWarnings("unchecked") T t = (T)copy((EObject)object);
+ if (t != null)
+ {
+ result.add(t);
+ }
+ }
+ return result;
+ }
+
+ /**
+ * Returns a copy of the given eObject.
+ * @param eObject the object to copy.
+ * @return the copy.
+ */
+ public EObject copy(EObject eObject)
+ {
+ if (eObject == null)
+ {
+ return null;
+ }
+ else
+ {
+ EObject copyEObject = createCopy(eObject);
+ if (copyEObject != null)
+ {
+ put(eObject, copyEObject);
+ EClass eClass = eObject.eClass();
+ for (int i = 0, size = eClass.getFeatureCount(); i < size; ++i)
+ {
+ EStructuralFeature eStructuralFeature = eClass.getEStructuralFeature(i);
+ if (eStructuralFeature.isChangeable() && !eStructuralFeature.isDerived())
+ {
+ if (eStructuralFeature instanceof EAttribute)
+ {
+ copyAttribute((EAttribute)eStructuralFeature, eObject, copyEObject);
+ }
+ else
+ {
+ EReference eReference = (EReference)eStructuralFeature;
+ if (eReference.isContainment())
+ {
+ //copyContainment(eReference, eObject, copyEObject);
+ }
+ }
+ }
+ }
+
+ copyProxyURI(eObject, copyEObject);
+ }
+
+ return copyEObject;
+ }
+ }
+
+ /**
+ * Copies the proxy URI from the original to the copy, if present.
+ * @param eObject the object being copied.
+ * @param copyEObject the copy being initialized.
+ */
+ protected void copyProxyURI(EObject eObject, EObject copyEObject)
+ {
+ if (eObject.eIsProxy())
+ {
+ ((InternalEObject)copyEObject).eSetProxyURI(((InternalEObject)eObject).eProxyURI());
+ }
+ }
+
+ /**
+ * Returns a new instance of the object's target class.
+ * @param eObject the object to copy.
+ * @return a new instance of the target class.
+ * @see #getTarget(EObject)
+ * @see EcoreUtil#create(EClass)
+ */
+ protected EObject createCopy(EObject eObject)
+ {
+ EClass eClass = getTarget(eObject);
+ return eClass == null ? null : EcoreUtil.create(eClass);
+ }
+
+ /**
+ * Returns the target class used to create a copy instance for the given instance object.
+ * @param eObject the object to be copied.
+ * @return the target class used to create a copy instance.
+ * @since 2.10
+ */
+ protected EClass getTarget(EObject eObject)
+ {
+ return getTarget(eObject.eClass());
+ }
+
+ /**
+ * Returns the target class used to create a copy instance for objects of the given source class.
+ * @param eClass the source class.
+ * @return the target class used to create a copy instance.
+ * @see #getTarget(EStructuralFeature, EObject, EObject)
+ */
+ protected EClass getTarget(EClass eClass)
+ {
+ return eClass;
+ }
+
+ /**
+ * Returns a setting for the feature and copy instance to be populated with the original object's source feature's value.
+ * @param eStructuralFeature the source feature.
+ * @return the target feature used to populate a copy instance.
+ * @see #getTarget(EStructuralFeature)
+ * @see #getTarget(EObject)
+ * @since 2.10
+ */
+ protected EStructuralFeature.Setting getTarget(EStructuralFeature eStructuralFeature, EObject eObject, EObject copyEObject)
+ {
+ EStructuralFeature targetEStructuralFeature = getTarget(eStructuralFeature);
+ return targetEStructuralFeature == null ? null : ((InternalEObject)copyEObject).eSetting(targetEStructuralFeature);
+ }
+
+ /**
+ * Returns the target feature used to populate a copy instance from the given source feature.
+ * @param eStructuralFeature the source feature.
+ * @return the target feature used to populate a copy instance.
+ * @see #getTarget(EClass)
+ */
+ protected EStructuralFeature getTarget(EStructuralFeature eStructuralFeature)
+ {
+ return eStructuralFeature;
+ }
+
+ /**
+ * Called to handle the copying of a containment feature;
+ * this adds a list of copies or sets a single copy as appropriate for the multiplicity.
+ * @param eReference the feature to copy.
+ * @param eObject the object from which to copy.
+ * @param copyEObject the object to copy to.
+ */
+ protected void copyContainment(EReference eReference, EObject eObject, EObject copyEObject)
+ {
+ if (eObject.eIsSet(eReference))
+ {
+ EStructuralFeature.Setting setting = getTarget(eReference, eObject, copyEObject);
+ if (setting != null)
+ {
+ Object value = eObject.eGet(eReference);
+ if (eReference.isMany())
+ {
+ @SuppressWarnings("unchecked")
+ List<EObject> target = (List<EObject>)value;
+ setting.set(copyAll(target));
+ }
+ else
+ {
+ setting.set(copy((EObject)value));
+ }
+ }
+ }
+ }
+
+ /**
+ * Called to handle the copying of an attribute;
+ * this adds a list of values or sets a single value as appropriate for the multiplicity.
+ * @param eAttribute the attribute to copy.
+ * @param eObject the object from which to copy.
+ * @param copyEObject the object to copy to.
+ */
+ protected void copyAttribute(EAttribute eAttribute, EObject eObject, EObject copyEObject)
+ {
+ if (eObject.eIsSet(eAttribute))
+ {
+ if (FeatureMapUtil.isFeatureMap(eAttribute))
+ {
+ FeatureMap featureMap = (FeatureMap)eObject.eGet(eAttribute);
+ copyFeatureMap(featureMap);
+ }
+ else
+ {
+ EStructuralFeature.Setting setting = getTarget(eAttribute, eObject, copyEObject);
+ if (setting != null)
+ {
+ copyAttributeValue(eAttribute, eObject, eObject.eGet(eAttribute), setting);
+ }
+ }
+ }
+ }
+
+ /**
+ * Call to handle copying the contained objects within a feature map.
+ * @param featureMap the feature map the copy.
+ * @since 2.10
+ */
+ protected void copyFeatureMap(FeatureMap featureMap)
+ {
+ for (int i = 0, size = featureMap.size(); i < size; ++i)
+ {
+ EStructuralFeature feature = featureMap.getEStructuralFeature(i);
+ if (feature instanceof EReference && ((EReference)feature).isContainment())
+ {
+ Object value = featureMap.getValue(i);
+ if (value != null)
+ {
+ // The containment references are hooked up later during copyReferences.
+ //
+ copy((EObject)value);
+ }
+ }
+ }
+ }
+
+ /**
+ * Called to handle copying of an attribute's value to the target setting.
+ * @param eAttribute the attribute of the source object corresponding to the value.
+ * @param eObject the object being copied.
+ * @param value the value to be copied.
+ * @param setting the feature-value pair that is the target of of the copy.
+ * @since 2.10
+ */
+ protected void copyAttributeValue(EAttribute eAttribute, EObject eObject, Object value, EStructuralFeature.Setting setting)
+ {
+ setting.set(value);
+ }
+
+ /**
+ * Hooks up cross references; it delegates to {@link #copyReference copyReference}.
+ */
+ public void copyReferences()
+ {
+ for (Map.Entry<EObject, EObject> entry : entrySet())
+ {
+ EObject eObject = entry.getKey();
+ EObject copyEObject = entry.getValue();
+ EClass eClass = eObject.eClass();
+ for (int j = 0, size = eClass.getFeatureCount(); j < size; ++j)
+ {
+ EStructuralFeature eStructuralFeature = eClass.getEStructuralFeature(j);
+ if (eStructuralFeature.isChangeable() && !eStructuralFeature.isDerived())
+ {
+ if (eStructuralFeature instanceof EReference)
+ {
+ EReference eReference = (EReference)eStructuralFeature;
+ if (!eReference.isContainment() && !eReference.isContainer())
+ {
+ copyReference(eReference, eObject, copyEObject);
+ }
+ }
+ else if (FeatureMapUtil.isFeatureMap(eStructuralFeature))
+ {
+ FeatureMap copyFeatureMap = (FeatureMap)getTarget(eStructuralFeature, eObject, copyEObject);
+ if (copyFeatureMap != null)
+ {
+ FeatureMap featureMap = (FeatureMap)eObject.eGet(eStructuralFeature);
+ int copyFeatureMapSize = copyFeatureMap.size();
+ for (int k = 0, featureMapSize = featureMap.size(); k < featureMapSize; ++k)
+ {
+ EStructuralFeature feature = featureMap.getEStructuralFeature(k);
+ if (feature instanceof EReference)
+ {
+ Object referencedEObject = featureMap.getValue(k);
+ Object copyReferencedEObject = get(referencedEObject);
+ if (copyReferencedEObject == null && referencedEObject != null)
+ {
+ EReference reference = (EReference)feature;
+ if (!useOriginalReferences || reference.isContainment() || reference.getEOpposite() != null)
+ {
+ continue;
+ }
+ copyReferencedEObject = referencedEObject;
+ }
+
+ // If we can't add it, it must already be in the list so find it and move it to the end.
+ //
+ if (!copyFeatureMap.add(feature, copyReferencedEObject))
+ {
+ for (int l = 0; l < copyFeatureMapSize; ++l)
+ {
+ if (copyFeatureMap.getEStructuralFeature(l) == feature && copyFeatureMap.getValue(l) == copyReferencedEObject)
+ {
+ copyFeatureMap.move(copyFeatureMap.size() - 1, l);
+ --copyFeatureMapSize;
+ break;
+ }
+ }
+ }
+ }
+ else
+ {
+ copyFeatureMap.add(getTarget(featureMap.getEStructuralFeature(k)), featureMap.getValue(k));
+ }
+ }
+ }
+ }
+ }
+ }
+ }
+ }
+
+ /**
+ * Called to handle the copying of a cross reference;
+ * this adds values or sets a single value as appropriate for the multiplicity
+ * while omitting any bidirectional reference that isn't in the copy map.
+ * @param eReference the reference to copy.
+ * @param eObject the object from which to copy.
+ * @param copyEObject the object to copy to.
+ */
+ protected void copyReference(EReference eReference, EObject eObject, EObject copyEObject)
+ {
+ if (eObject.eIsSet(eReference))
+ {
+ EStructuralFeature.Setting setting = getTarget(eReference, eObject, copyEObject);
+ if (setting != null)
+ {
+ Object value = eObject.eGet(eReference, resolveProxies);
+ if (eReference.isMany())
+ {
+ @SuppressWarnings("unchecked") InternalEList<EObject> source = (InternalEList<EObject>)value;
+ @SuppressWarnings("unchecked") InternalEList<EObject> target = (InternalEList<EObject>)setting;
+ if (source.isEmpty())
+ {
+ target.clear();
+ }
+ else
+ {
+ boolean isBidirectional = eReference.getEOpposite() != null;
+ int index = 0;
+ for (Iterator<EObject> k = resolveProxies ? source.iterator() : source.basicIterator(); k.hasNext();)
+ {
+ EObject referencedEObject = k.next();
+ EObject copyReferencedEObject = get(referencedEObject);
+ if (copyReferencedEObject == null)
+ {
+ if (useOriginalReferences && !isBidirectional)
+ {
+ target.addUnique(index, referencedEObject);
+ ++index;
+ }
+ }
+ else
+ {
+ if (isBidirectional)
+ {
+ int position = target.indexOf(copyReferencedEObject);
+ if (position == -1)
+ {
+ target.addUnique(index, copyReferencedEObject);
+ }
+ else if (index != position)
+ {
+ target.move(index, copyReferencedEObject);
+ }
+ }
+ else
+ {
+ target.addUnique(index, copyReferencedEObject);
+ }
+ ++index;
+ }
+ }
+ }
+ }
+ else
+ {
+ if (value == null)
+ {
+ setting.set(null);
+ }
+ else
+ {
+ Object copyReferencedEObject = get(value);
+ if (copyReferencedEObject == null)
+ {
+ if (useOriginalReferences && eReference.getEOpposite() == null)
+ {
+ setting.set(value);
+ }
+ }
+ else
+ {
+ setting.set(copyReferencedEObject);
+ }
+ }
+ }
+ }
+ }
+ }
+}
diff --git a/extraplugins/req/org.eclipse.papyrus.req.reqif/src/org/eclipse/papyrus/req/reqif/util/EqualityHelperWithoutContainment.java b/extraplugins/req/org.eclipse.papyrus.req.reqif/src/org/eclipse/papyrus/req/reqif/util/EqualityHelperWithoutContainment.java
new file mode 100644
index 00000000000..40837da1678
--- /dev/null
+++ b/extraplugins/req/org.eclipse.papyrus.req.reqif/src/org/eclipse/papyrus/req/reqif/util/EqualityHelperWithoutContainment.java
@@ -0,0 +1,341 @@
+package org.eclipse.papyrus.req.reqif.util;
+
+import java.util.HashMap;
+import java.util.List;
+
+import org.eclipse.emf.ecore.EAttribute;
+import org.eclipse.emf.ecore.EClass;
+import org.eclipse.emf.ecore.EObject;
+import org.eclipse.emf.ecore.EReference;
+import org.eclipse.emf.ecore.EStructuralFeature;
+import org.eclipse.emf.ecore.InternalEObject;
+import org.eclipse.emf.ecore.util.FeatureMap;
+import org.eclipse.emf.ecore.util.FeatureMapUtil;
+
+public class EqualityHelperWithoutContainment extends HashMap<EObject, EObject>
+{
+ private static final long serialVersionUID = 1L;
+
+ /**
+ * Returns whether <code>eObject1</code> and <code>eObject2</code> are {@link EqualityHelper equal}
+ * in the context of this helper instance.
+ * @return whether <code>eObject1</code> and <code>eObject2</code> are equal.
+ * @since 2.1.0
+ */
+ public boolean equals(EObject eObject1, EObject eObject2)
+ {
+ // If the first object is null, the second object must be null.
+ //
+ if (eObject1 == null)
+ {
+ return eObject2 == null;
+ }
+
+ // We know the first object isn't null, so if the second one is, it can't be equal.
+ //
+ if (eObject2 == null)
+ {
+ return false;
+ }
+
+ // Both eObject1 and eObject2 are not null.
+ // If eObject1 has been compared already...
+ //
+ Object eObject1MappedValue = get(eObject1);
+ if (eObject1MappedValue != null)
+ {
+ // Then eObject2 must be that previous match.
+ //
+ return eObject1MappedValue == eObject2;
+ }
+
+ // If eObject2 has been compared already...
+ //
+ Object eObject2MappedValue = get(eObject2);
+ if (eObject2MappedValue != null)
+ {
+ // Then eObject1 must be that match.
+ //
+ return eObject2MappedValue == eObject1;
+ }
+
+ // Neither eObject1 nor eObject2 have been compared yet.
+
+ // If eObject1 and eObject2 are the same instance...
+ //
+ if (eObject1 == eObject2)
+ {
+ // Match them and return true.
+ //
+ put(eObject1, eObject2);
+ put(eObject2, eObject1);
+ return true;
+ }
+
+ // If eObject1 is a proxy...
+ //
+ if (eObject1.eIsProxy())
+ {
+ // Then the other object must be a proxy with the same URI.
+ //
+ if (((InternalEObject)eObject1).eProxyURI().equals(((InternalEObject)eObject2).eProxyURI()))
+ {
+ put(eObject1, eObject2);
+ put(eObject2, eObject1);
+ return true;
+ }
+ else
+ {
+ return false;
+ }
+ }
+ // If eObject1 isn't a proxy but eObject2 is, they can't be equal.
+ //
+ else if (eObject2.eIsProxy())
+ {
+ return false;
+ }
+
+ // If they don't have the same class, they can't be equal.
+ //
+ EClass eClass = eObject1.eClass();
+ if (eClass != eObject2.eClass())
+ {
+ return false;
+ }
+
+ // Assume from now on that they match.
+ //
+ put(eObject1, eObject2);
+ put(eObject2, eObject1);
+
+ // Check all the values.
+ //
+ for (int i = 0, size = eClass.getFeatureCount(); i < size; ++i)
+ {
+ // Ignore derived features.
+ //
+ EStructuralFeature feature = eClass.getEStructuralFeature(i);
+ if (!feature.isDerived())
+ {
+ if( feature instanceof EReference){
+ if(! ((EReference)feature).isContainment()){
+ if (!haveEqualFeature(eObject1, eObject2, feature))
+ {
+ remove(eObject1);
+ remove(eObject2);
+ return false;
+ }
+ }
+ }
+ else{
+
+ if (!haveEqualFeature(eObject1, eObject2, feature))
+ {
+ remove(eObject1);
+ remove(eObject2);
+ return false;
+ }
+ }
+ }
+ }
+
+ // There's no reason they aren't equal, so they are.
+ //
+ return true;
+ }
+
+ /**
+ * Returns whether <code>list1</code> and <code>list2</code> contain
+ * {@link #equals(EObject, EObject) equal} {@link EObject}s at the same index.
+ * It is assumed that list1 and list2 only contain EObjects.
+ * @return whether <code>list1</code> and <code>list2</code> contain equal objects.
+ * @since 2.1.0
+ */
+ public boolean equals(List<EObject> list1, List<EObject> list2)
+ {
+ int size = list1.size();
+ if (size != list2.size())
+ {
+ return false;
+ }
+
+ for (int i = 0; i < size; i++)
+ {
+ EObject eObject1 = list1.get(i);
+ EObject eObject2 = list2.get(i);
+ if (!equals(eObject1, eObject2))
+ {
+ return false;
+ }
+ }
+
+ return true;
+ }
+
+ /**
+ * Returns whether the two objects have {@link EqualityHelper equal}
+ * {@link EObject#eIsSet(EStructuralFeature) isSet} states and {@link EObject#eGet(EStructuralFeature) value}s for the feature.
+ * @return whether the two objects have equal isSet states and values for the feature.
+ * @since 2.2.0
+ * @see #equals(EObject, EObject)
+ * @see #equals(List, List)
+ */
+ protected boolean haveEqualFeature(EObject eObject1, EObject eObject2, EStructuralFeature feature)
+ {
+ // If the set states are the same, and the values of the feature are the structurally equal, they are equal.
+ //
+ final boolean isSet1 = eObject1.eIsSet(feature);
+ final boolean isSet2 = eObject2.eIsSet(feature);
+ if (isSet1 && isSet2)
+ {
+ return
+ feature instanceof EReference ?
+ haveEqualReference(eObject1, eObject2, (EReference)feature) :
+ haveEqualAttribute(eObject1, eObject2, (EAttribute)feature);
+ }
+ else
+ {
+ return isSet1 == isSet2;
+ }
+ }
+
+ /**
+ * Returns whether the two objects have {@link EqualityHelper equal} {@link EObject#eGet(EStructuralFeature) value}s for the reference.
+ * @return whether the two objects have equal values for the reference.
+ * @since 2.1.0
+ * @see #equals(EObject, EObject)
+ * @see #equals(List, List)
+ */
+ @SuppressWarnings("unchecked")
+ protected boolean haveEqualReference(EObject eObject1, EObject eObject2, EReference reference)
+ {
+ Object value1 = eObject1.eGet(reference);
+ Object value2 = eObject2.eGet(reference);
+
+ return
+ reference.isMany() ?
+ equals((List<EObject>)value1, (List<EObject>)value2) :
+ equals((EObject)value1, (EObject)value2);
+ }
+
+
+ /**
+ * Returns whether the two objects have {@link EqualityHelper equal} {@link EObject#eGet(EStructuralFeature) value}s for the attribute.
+ * @return whether the two objects have equal values for the attribute.
+ * @since 2.1.0
+ * @see #equalFeatureMaps(FeatureMap, FeatureMap)
+ */
+ protected boolean haveEqualAttribute(EObject eObject1, EObject eObject2, EAttribute attribute)
+ {
+ Object value1 = eObject1.eGet(attribute);
+ Object value2 = eObject2.eGet(attribute);
+
+ // If the first value is null, the second value must be null.
+ //
+ if (value1 == null)
+ {
+ return value2 == null;
+ }
+
+ // Since the first value isn't null, if the second one is, they aren't equal.
+ //
+ if (value2 == null)
+ {
+ return false;
+ }
+
+ // If this is a feature map...
+ //
+ if (FeatureMapUtil.isFeatureMap(attribute))
+ {
+ // The feature maps must be equal.
+ //
+ FeatureMap featureMap1 = (FeatureMap)value1;
+ FeatureMap featureMap2 = (FeatureMap)value2;
+ return equalFeatureMaps(featureMap1, featureMap2);
+ }
+ else
+ {
+ // The values must be Java equal.
+ //
+ return equalValues(value1, value2);
+ }
+ }
+
+ /**
+ * Returns whether value1 and value2 are structurally equal.
+ * The default implementation only checks for Java equality.
+ * @param value1 the first non-null value.
+ * @param value2 the second potentially null value.
+ * @return whether value1 and value2 are structurally equal.
+ * @since 2.10
+ */
+ protected boolean equalValues(Object value1, Object value2)
+ {
+ return value1.equals(value2);
+ }
+
+ /**
+ * Returns whether the two feature maps are {@link EqualityHelper equal}.
+ * @return whether the two feature maps are equal.
+ * @since 2.1.0
+ */
+ protected boolean equalFeatureMaps(FeatureMap featureMap1, FeatureMap featureMap2)
+ {
+ // If they don't have the same size, the feature maps aren't equal.
+ //
+ int size = featureMap1.size();
+ if (size != featureMap2.size())
+ {
+ return false;
+ }
+
+ // Compare entries in order.
+ //
+ for (int i = 0; i < size; i++)
+ {
+ // If entries don't have the same feature, the feature maps aren't equal.
+ //
+ EStructuralFeature feature = featureMap1.getEStructuralFeature(i);
+ if (feature != featureMap2.getEStructuralFeature(i))
+ {
+ return false;
+ }
+
+ Object value1 = featureMap1.getValue(i);
+ Object value2 = featureMap2.getValue(i);
+
+ if (!equalFeatureMapValues(value1, value2, feature))
+ {
+ return false;
+ }
+ }
+
+ // There is no reason they aren't equals.
+ //
+ return true;
+ }
+
+ /**
+ * Returns whether the two values of a feature map are {@link EqualityHelper equal}.
+ * @return whether the two values of a feature map are equal.
+ * @since 2.2.0
+ */
+ protected boolean equalFeatureMapValues(Object value1, Object value2, EStructuralFeature feature)
+ {
+ if (feature instanceof EReference)
+ {
+ // If the referenced EObjects aren't equal, the feature maps aren't equal.
+ //
+ return equals((EObject)value1, (EObject)value2);
+ }
+ else
+ {
+ // If the values aren't Java equal, the feature maps aren't equal.
+ //
+ return value1 == null ? value2 == null : equalValues(value1, value2);
+ }
+ }
+
+} // EqualityHelper \ No newline at end of file
diff --git a/extraplugins/req/org.eclipse.papyrus.req.reqif/src/org/eclipse/papyrus/req/reqif/util/IRequirementMerger.java b/extraplugins/req/org.eclipse.papyrus.req.reqif/src/org/eclipse/papyrus/req/reqif/util/IRequirementMerger.java
new file mode 100644
index 00000000000..1594fd14e9c
--- /dev/null
+++ b/extraplugins/req/org.eclipse.papyrus.req.reqif/src/org/eclipse/papyrus/req/reqif/util/IRequirementMerger.java
@@ -0,0 +1,33 @@
+package org.eclipse.papyrus.req.reqif.util;
+
+import java.util.ArrayList;
+
+import org.eclipse.uml2.uml.Element;
+
+public interface IRequirementMerger {
+
+ /**
+ *
+ * @return the list that must be deleted during merge
+ */
+ ArrayList<Element> getElementToDelete();
+
+ /**
+ *
+ * @return the list of added element during merge
+ */
+ ArrayList<Element> getAddedElements();
+
+ /**
+ *
+ * @param copyAllPropertyValues
+ * is an option. true means that the user wants to copy the name
+ * and all the stereotype values. This option disables the
+ * changeableProperty parameter.
+ * @param deleteFromBase
+ * is an option. True means that element that not match with right will be removed
+ * @return true merge finishes successfully
+ */
+ boolean merge();
+
+} \ No newline at end of file
diff --git a/extraplugins/robotml/org.eclipse.papyrus.robotml/palettes/Palette_SM_RobotML.xml b/extraplugins/robotml/org.eclipse.papyrus.robotml/palettes/Palette_SM_RobotML.xml
index 55cc251b3bf..1304081d547 100644
--- a/extraplugins/robotml/org.eclipse.papyrus.robotml/palettes/Palette_SM_RobotML.xml
+++ b/extraplugins/robotml/org.eclipse.papyrus.robotml/palettes/Palette_SM_RobotML.xml
@@ -7,7 +7,7 @@
<aspectTool description="State"
iconpath="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/State.gif"
id="createStateCreationTool_1315919977929" name="State"
- refToolId="createStateCreationTool">
+ refToolId="statemachine.createNodesGroup.state">
<postAction id="org.eclipse.papyrus.applystereotypeactionprovider">
<stereotypesToApply>
<stereotype stereotypeName="RobotML::State"></stereotype>
@@ -18,14 +18,14 @@
<aspectTool description="FinalState"
iconpath="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/FinalState.gif"
id="createFinalStateCreationTool_1315920419625" name="FinalState"
- refToolId="createFinalStateCreationTool" >
+ refToolId="statemachine.createNodesGroup.finalstate" >
</aspectTool>
<aspectTool description="InitialState"
iconpath="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Pseudostate_initial.gif"
id="createInitialCreationTool_1315920509328" name="InitialState"
- refToolId="createInitialCreationTool" >
+ refToolId="statemachine.createNodesGroup.initial" >
<postAction id="org.eclipse.papyrus.applystereotypeactionprovider">
<stereotypesToApply>
<stereotype stereotypeName="RobotML::State"></stereotype>
@@ -37,7 +37,7 @@
<aspectTool description="Transition"
iconpath="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Transition_local.gif"
id="createTransitionCreationTool_1315920536016" name="Transition"
- refToolId="createTransitionCreationTool" >
+ refToolId="statemachine.createEdgesGroup.transition" >
<postAction id="org.eclipse.papyrus.applystereotypeactionprovider">
<stereotypesToApply>
<stereotype stereotypeName="RobotML::Transition"></stereotype>
diff --git a/extraplugins/sysml14/org.eclipse.papyrus.sysml14.diagram.blockdefinition/resources/palette/blockDiagram.paletteconfiguration b/extraplugins/sysml14/org.eclipse.papyrus.sysml14.diagram.blockdefinition/resources/palette/blockDiagram.paletteconfiguration
index b6b418e93a6..65dbb0d210b 100644
--- a/extraplugins/sysml14/org.eclipse.papyrus.sysml14.diagram.blockdefinition/resources/palette/blockDiagram.paletteconfiguration
+++ b/extraplugins/sysml14/org.eclipse.papyrus.sysml14.diagram.blockdefinition/resources/palette/blockDiagram.paletteconfiguration
@@ -276,11 +276,7 @@
pluginID="org.eclipse.uml2.uml.edit"
iconPath="/icons/full/obj16/Dependency.gif"/>
<elementDescriptors
- elementTypeId="org.eclipse.papyrus.uml.diagram.clazz.Dependency_2014"/>
- <elementDescriptors
elementTypeId="org.eclipse.papyrus.uml.diagram.clazz.Dependency_4008"/>
- <elementDescriptors
- elementTypeId="org.eclipse.papyrus.uml.diagram.clazz.Dependency_4018"/>
</ownedConfigurations>
<ownedConfigurations
xsi:type="paletteconfiguration:ToolConfiguration"
diff --git a/extraplugins/sysml14/org.eclipse.papyrus.sysml14.diagram.requirement/resources/configuration/RequirementDiagram.configuration b/extraplugins/sysml14/org.eclipse.papyrus.sysml14.diagram.requirement/resources/configuration/RequirementDiagram.configuration
index 25d16a14f0a..612cde1e0a1 100644
--- a/extraplugins/sysml14/org.eclipse.papyrus.sysml14.diagram.requirement/resources/configuration/RequirementDiagram.configuration
+++ b/extraplugins/sysml14/org.eclipse.papyrus.sysml14.diagram.requirement/resources/configuration/RequirementDiagram.configuration
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<configuration:PapyrusConfiguration xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:configuration="http://www.eclipse.org/papyrus/infra/viewpoints/configuration" xmi:id="_ko07IErbEeSdQKzSRatBjg">
<viewpoints xsi:type="configuration:PapyrusViewpoint" xmi:id="_xogdoErbEeSdQKzSRatBjg" name="Default Papyrus Viewpoint">
- <modelKinds xsi:type="configuration:PapyrusDiagram" xmi:id="_ZrBf4JaBEeS8eNvSwD0lgA" name="SysML 1.4 Requirement" icon="platform:/plugin/org.eclipse.papyrus.sysml.diagram.requirement/icons/obj16/Diagram_Requirement.gif" implementationID="PapyrusUMLClassDiagram" categories="_lfthYMykEeSuYbPdZwWlyw" customPalette="platform:/plugin/org.eclipse.papyrus.sysml14.diagram.requirement/resources/palette/requirementDiagram.paletteconfiguration">
+ <modelKinds xsi:type="configuration:PapyrusDiagram" xmi:id="_ZrBf4JaBEeS8eNvSwD0lgA" name="SysML 1.4 Requirement" icon="platform:/plugin/org.eclipse.papyrus.sysml.diagram.requirement/icons/obj16/Diagram_Requirement.gif" implementationID="PapyrusUMLClassDiagram" categories="_lfthYMykEeSuYbPdZwWlyw" customPalette="platform:/plugin/org.eclipse.papyrus.sysml14.diagram.requirement/resources/palette/requirementDiagram.paletteconfiguration" customStyle="platform:/plugin/org.eclipse.papyrus.sysml14.diagram.requirement/resources/style/requirementdiagram.css">
<profiles href="http://www.eclipse.org/papyrus/1.4/SysML#/"/>
<modelRules xmi:id="_ZrBf4ZaBEeS8eNvSwD0lgA">
<element href="http://www.eclipse.org/uml2/5.0.0/UML#//Package"/>
diff --git a/extraplugins/sysml14/org.eclipse.papyrus.sysml14.diagram.requirement/resources/palette/requirementDiagram.paletteconfiguration b/extraplugins/sysml14/org.eclipse.papyrus.sysml14.diagram.requirement/resources/palette/requirementDiagram.paletteconfiguration
index d8a92ce6e3c..2c7f3987bf5 100644
--- a/extraplugins/sysml14/org.eclipse.papyrus.sysml14.diagram.requirement/resources/palette/requirementDiagram.paletteconfiguration
+++ b/extraplugins/sysml14/org.eclipse.papyrus.sysml14.diagram.requirement/resources/palette/requirementDiagram.paletteconfiguration
@@ -10,6 +10,34 @@
description="Nodes">
<ownedConfigurations
xsi:type="paletteconfiguration:ToolConfiguration"
+ id="org.eclipse.papyrus.sysML.Comment"
+ label="Comment"
+ description="Create a comment">
+ <icon
+ pluginID="org.eclipse.uml2.uml.edit"
+ iconPath="icons/full/obj16/Comment.gif"/>
+ <elementDescriptors
+ elementTypeId="org.eclipse.papyrus.uml.diagram.clazz.Comment_2012"/>
+ <elementDescriptors
+ elementTypeId="org.eclipse.papyrus.uml.diagram.clazz.Comment_3028"/>
+ </ownedConfigurations>
+ <ownedConfigurations
+ xsi:type="paletteconfiguration:ToolConfiguration"
+ id="org.eclipse.papyrus.sysML.Constraint"
+ label="Constraint"
+ description="Create a constraint">
+ <icon
+ pluginID="org.eclipse.uml2.uml.edit"
+ iconPath="icons/full/obj16/Constraint.gif"/>
+ <elementDescriptors
+ elementTypeId="org.eclipse.papyrus.uml.diagram.clazz.Constraint_2011"/>
+ <elementDescriptors
+ elementTypeId="org.eclipse.papyrus.uml.diagram.clazz.Constraint_3029"/>
+ <elementDescriptors
+ elementTypeId="org.eclipse.papyrus.sysML.Constraint_Label"/>
+ </ownedConfigurations>
+ <ownedConfigurations
+ xsi:type="paletteconfiguration:ToolConfiguration"
id="org.eclipse.papyrus.sysML.Package"
label="Package"
description="Create a package">
@@ -23,6 +51,19 @@
</ownedConfigurations>
<ownedConfigurations
xsi:type="paletteconfiguration:ToolConfiguration"
+ id="org.eclipse.papyrus.sysML.Problem"
+ label="Problem"
+ description="Create a Problem">
+ <icon
+ pluginID="org.eclipse.papyrus.sysml"
+ iconPath="icons/modelelements/Problem.gif"/>
+ <elementDescriptors
+ elementTypeId="org.eclipse.papyrus.sysML.Problem_2012"/>
+ <elementDescriptors
+ elementTypeId="org.eclipse.papyrus.sysML.Problem_3028"/>
+ </ownedConfigurations>
+ <ownedConfigurations
+ xsi:type="paletteconfiguration:ToolConfiguration"
id="org.eclipse.papyrus.sysML.Requirement"
label="Requirement"
description="Create a Requirement">
@@ -42,19 +83,6 @@
</ownedConfigurations>
<ownedConfigurations
xsi:type="paletteconfiguration:ToolConfiguration"
- id="org.eclipse.papyrus.sysML.Problem"
- label="Problem"
- description="Create a Problem">
- <icon
- pluginID="org.eclipse.papyrus.sysml"
- iconPath="icons/modelelements/Problem.gif"/>
- <elementDescriptors
- elementTypeId="org.eclipse.papyrus.sysML.Problem_2012"/>
- <elementDescriptors
- elementTypeId="org.eclipse.papyrus.sysML.Problem_3028"/>
- </ownedConfigurations>
- <ownedConfigurations
- xsi:type="paletteconfiguration:ToolConfiguration"
id="org.eclipse.papyrus.sysML.Rationale"
label="Rationale"
description="Create a Rationale">
@@ -104,6 +132,30 @@
</ownedConfigurations>
<ownedConfigurations
xsi:type="paletteconfiguration:ToolConfiguration"
+ id="org.eclipse.papyrus.sysML.Dependency"
+ label="Dependency"
+ description="Create a dependency"
+ kind="ConnectionTool">
+ <icon
+ pluginID="org.eclipse.uml2.uml.edit"
+ iconPath="/icons/full/obj16/Dependency.gif"/>
+ <elementDescriptors
+ elementTypeId="org.eclipse.papyrus.uml.diagram.clazz.Dependency_4008"/>
+ </ownedConfigurations>
+ <ownedConfigurations
+ xsi:type="paletteconfiguration:ToolConfiguration"
+ id="org.eclipse.papyrus.sysML.ContainmentLink"
+ label="Containment Link"
+ description="Create a Containment Link"
+ kind="ConnectionTool">
+ <icon
+ pluginID="org.eclipse.papyrus.uml.diagram.clazz"
+ iconPath="/icons/obj16/ContainmentConnection.gif"/>
+ <elementDescriptors
+ elementTypeId="org.eclipse.papyrus.uml.diagram.clazz.ContainmentLink_4023"/>
+ </ownedConfigurations>
+ <ownedConfigurations
+ xsi:type="paletteconfiguration:ToolConfiguration"
id="org.eclipse.papyrus.sysML.DeriveReqt_Abstraction"
label="DeriveReqt"
description="Create a DeriveReqt Abstraction"
@@ -116,26 +168,27 @@
</ownedConfigurations>
<ownedConfigurations
xsi:type="paletteconfiguration:ToolConfiguration"
- id="org.eclipse.papyrus.sysML.Satisfy_Abstraction"
- label="Satisfy"
- description="Create a Satisfy"
+ id="org.eclipse.papyrus.sysML.Link"
+ label="Link"
+ description="Create a Link"
kind="ConnectionTool">
<icon
- pluginID="org.eclipse.papyrus.sysml"
- iconPath="icons/requirements/Satisfy.gif"/>
+ pluginID="org.eclipse.papyrus.uml.diagram.clazz"
+ iconPath="icons/obj16/Link.gif"/>
<elementDescriptors
- elementTypeId="org.eclipse.papyrus.sysML.Satisfy_Abstraction_4006"/>
+ elementTypeId="org.eclipse.papyrus.uml.diagram.clazz.Link_4016"/>
</ownedConfigurations>
<ownedConfigurations
xsi:type="paletteconfiguration:ToolConfiguration"
- id="org.eclipse.papyrus.sysML.Verify_Abstraction"
- label="Verify"
- description="Create a Verify">
+ id="org.eclipse.papyrus.sysML.PackageImport"
+ label="PackageImport"
+ description="Create a PackageImport"
+ kind="ConnectionTool">
<icon
- pluginID="org.eclipse.papyrus.sysml"
- iconPath="icons/requirements/Verify.gif"/>
+ pluginID="org.eclipse.uml2.uml.edit"
+ iconPath="/icons/full/obj16/PackageImport.gif"/>
<elementDescriptors
- elementTypeId="org.eclipse.papyrus.sysML.Verify_Abstraction_4006"/>
+ elementTypeId="org.eclipse.papyrus.uml.diagram.clazz.PackageImport_4010"/>
</ownedConfigurations>
<ownedConfigurations
xsi:type="paletteconfiguration:ToolConfiguration"
@@ -151,6 +204,18 @@
</ownedConfigurations>
<ownedConfigurations
xsi:type="paletteconfiguration:ToolConfiguration"
+ id="org.eclipse.papyrus.sysML.Satisfy_Abstraction"
+ label="Satisfy"
+ description="Create a Satisfy"
+ kind="ConnectionTool">
+ <icon
+ pluginID="org.eclipse.papyrus.sysml"
+ iconPath="icons/requirements/Satisfy.gif"/>
+ <elementDescriptors
+ elementTypeId="org.eclipse.papyrus.sysML.Satisfy_Abstraction_4006"/>
+ </ownedConfigurations>
+ <ownedConfigurations
+ xsi:type="paletteconfiguration:ToolConfiguration"
id="org.eclipse.papyrus.sysML.Trace_Abstraction"
label="Trace"
description="Create a Trace"
@@ -163,15 +228,14 @@
</ownedConfigurations>
<ownedConfigurations
xsi:type="paletteconfiguration:ToolConfiguration"
- id="org.eclipse.papyrus.sysML.Link"
- label="Link"
- description="Create a Link"
- kind="ConnectionTool">
+ id="org.eclipse.papyrus.sysML.Verify_Abstraction"
+ label="Verify"
+ description="Create a Verify">
<icon
- pluginID="org.eclipse.papyrus.uml.diagram.clazz"
- iconPath="icons/obj16/Link.gif"/>
+ pluginID="org.eclipse.papyrus.sysml"
+ iconPath="icons/requirements/Verify.gif"/>
<elementDescriptors
- elementTypeId="org.eclipse.papyrus.uml.diagram.clazz.Link_4016"/>
+ elementTypeId="org.eclipse.papyrus.sysML.Verify_Abstraction_4006"/>
</ownedConfigurations>
</drawerConfigurations>
<drawerConfigurations
diff --git a/extraplugins/sysml14/org.eclipse.papyrus.sysml14.diagram.requirement/resources/style/requirementdiagram.css b/extraplugins/sysml14/org.eclipse.papyrus.sysml14.diagram.requirement/resources/style/requirementdiagram.css
new file mode 100644
index 00000000000..3472fca2fcc
--- /dev/null
+++ b/extraplugins/sysml14/org.eclipse.papyrus.sysml14.diagram.requirement/resources/style/requirementdiagram.css
@@ -0,0 +1,66 @@
+/*****************************************************************************
+ * Copyright (c) 2015 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:
+ * Benoit Maggi (CEA LIST) benoit.maggi@cea.fr
+ *****************************************************************************/
+Class{
+ fontName: "Segoe UI";
+ fillColor: #C3D7DD;
+ transparency: 0;
+ gradient: #FFFFFF vertical;
+ lineColor: #000000;
+ elementIcon: false;
+}
+
+Compartment {
+ visible:false;
+}
+
+Package > Compartment[kind="packagedelements"] {
+ visible:true;
+ showTitle:false;
+}
+
+Class[appliedStereotypes~="Requirement"] > Compartment[type=StereotypeCompartment] {
+ visible:true;
+ showTitle:true;
+}
+
+Class[appliedStereotypes~="Requirement"] > Compartment[type=StereotypeCompartment] > [property="derived"]{
+ visible:false;
+}
+
+Class[appliedStereotypes~="Requirement"] > Compartment[type=StereotypeCompartment] > [property="derivedFrom"]{
+ visible:false;
+}
+
+Class[appliedStereotypes~="Requirement"] > Compartment[type=StereotypeCompartment] > [property="satisfiedBy"]{
+ visible:false;
+}
+
+Class[appliedStereotypes~="Requirement"] > Compartment[type=StereotypeCompartment] > [property="refinedBy"]{
+ visible:false;
+}
+
+Class[appliedStereotypes~="Requirement"] > Compartment[type=StereotypeCompartment] > [property="tracedTo"]{
+ visible:false;
+}
+
+Class[appliedStereotypes~="Requirement"] > Compartment[type=StereotypeCompartment] > [property="verifiedBy"]{
+ visible:false;
+}
+
+Class[appliedStereotypes~="Requirement"] > Compartment[type=StereotypeCompartment] > [property="master"]{
+ visible:false;
+}
+
+Class[appliedStereotypes~="Requirement"] > Compartment[kind="operations"] {
+ visible:true;
+ showTitle:false;
+}
diff --git a/extraplugins/umlrt/org.eclipse.papyrus.umlrt.ui/palettes/UML-RT.CapsuleDiagram.paletteconfiguration b/extraplugins/umlrt/org.eclipse.papyrus.umlrt.ui/palettes/UML-RT.CapsuleDiagram.paletteconfiguration
index 3166965a827..782af09ea60 100644
--- a/extraplugins/umlrt/org.eclipse.papyrus.umlrt.ui/palettes/UML-RT.CapsuleDiagram.paletteconfiguration
+++ b/extraplugins/umlrt/org.eclipse.papyrus.umlrt.ui/palettes/UML-RT.CapsuleDiagram.paletteconfiguration
@@ -2,7 +2,7 @@
<paletteconfiguration:PaletteConfiguration xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:paletteconfiguration="http://www.eclipse.org/papyrus/diagram/paletteconfiguration/0.7" id="palettemodel" label="UMLRealTime">
<drawerConfigurations id="UML-RT" label="UML-RT" description="UML-RT">
<ownedConfigurations xsi:type="paletteconfiguration:ToolConfiguration" id="palettemodel.org.eclipse.papyrus.umlrt.Capsule" label="Capsule" description="Create a Capsule">
- <icon pluginID="" iconPath="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Class.gif"/>
+ <icon pluginID="org.eclipse.uml2.uml.edit" iconPath="icons/full/obj16/Class.gif"/>
<elementDescriptors elementTypeId="org.eclipse.papyrus.umlrt.Capsule_2008"/>
<elementDescriptors elementTypeId="org.eclipse.papyrus.umlrt.Capsule_3004"/>
<elementDescriptors elementTypeId="org.eclipse.papyrus.umlrt.Capsule_3008"/>
@@ -10,7 +10,7 @@
<elementDescriptors elementTypeId="org.eclipse.papyrus.umlrt.Capsule_3014"/>
</ownedConfigurations>
<ownedConfigurations xsi:type="paletteconfiguration:ToolConfiguration" id="palettemodel.org.eclipse.papyrus.umlrt.CapsulePart" label="CapsulePart" description="Create a CapsulePart">
- <icon iconPath="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Property.gif"/>
+ <icon pluginID="org.eclipse.uml2.uml.edit" iconPath="icons/full/obj16/Property.gif"/>
<elementDescriptors elementTypeId="org.eclipse.papyrus.umlrt.CapsulePart_3002"/>
<elementDescriptors elementTypeId="org.eclipse.papyrus.umlrt.CapsulePart_3005"/>
<elementDescriptors elementTypeId="org.eclipse.papyrus.umlrt.CapsulePart_3006"/>
@@ -18,20 +18,6 @@
<elementDescriptors elementTypeId="org.eclipse.papyrus.umlrt.CapsulePart_3018"/>
<elementDescriptors elementTypeId="org.eclipse.papyrus.umlrt.CapsulePart_3041"/>
</ownedConfigurations>
- <ownedConfigurations xsi:type="paletteconfiguration:ToolConfiguration" id="palettemodel.org.eclipse.papyrus.umlrt.ProtocolContainer" label="ProtocolContainer" description="Create a ProtocolContainer">
- <icon iconPath="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Package.gif"/>
- <elementDescriptors elementTypeId="org.eclipse.papyrus.umlrt.ProtocolContainer_2007"/>
- <elementDescriptors elementTypeId="org.eclipse.papyrus.umlrt.ProtocolContainer_3009"/>
- <elementDescriptors elementTypeId="org.eclipse.papyrus.umlrt.ProtocolContainer_PapyrusUMLClassDiagram"/>
- </ownedConfigurations>
- <ownedConfigurations xsi:type="paletteconfiguration:ToolConfiguration" id="palettemodel.org.eclipse.papyrus.umlrt.RTMessageSet" label="RTMessageSet" description="Create a RTMessageSet">
- <icon iconPath="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Interface.gif"/>
- <elementDescriptors elementTypeId="org.eclipse.papyrus.umlrt.RTMessageSet_2004"/>
- <elementDescriptors elementTypeId="org.eclipse.papyrus.umlrt.RTMessageSet_3023"/>
- <elementDescriptors elementTypeId="org.eclipse.papyrus.umlrt.RTMessageSet_3036"/>
- <elementDescriptors elementTypeId="org.eclipse.papyrus.umlrt.RTMessageSet_3037"/>
- <elementDescriptors elementTypeId="org.eclipse.papyrus.umlrt.RTMessageSet_3038"/>
- </ownedConfigurations>
</drawerConfigurations>
<requiredProfiles>UMLRealTime</requiredProfiles>
</paletteconfiguration:PaletteConfiguration>
diff --git a/extraplugins/umlrt/org.eclipse.papyrus.umlrt/elementtypes/uml-rt.elementtypesconfigurations b/extraplugins/umlrt/org.eclipse.papyrus.umlrt/elementtypes/uml-rt.elementtypesconfigurations
index c0bec3b2c6c..0cdfde7ac77 100644
--- a/extraplugins/umlrt/org.eclipse.papyrus.umlrt/elementtypes/uml-rt.elementtypesconfigurations
+++ b/extraplugins/umlrt/org.eclipse.papyrus.umlrt/elementtypes/uml-rt.elementtypesconfigurations
@@ -20,6 +20,13 @@
iconPath="/icons/full/obj16/Class.gif"
bundleId="org.eclipse.uml2.uml.edit"/>
<specializedTypesID>org.eclipse.papyrus.uml.Class</specializedTypesID>
+ <editHelperAdviceConfiguration
+ xmi:id="_jrBH8P7pEeSx0Yn0jzU15g"
+ name="org.eclipse.papyrus.umlrt.custom.advice.CapsuleEditHelperAdvice"
+ description="Advice for Capsule"
+ identifier="org.eclipse.papyrus.umlrt.custom.advice.CapsuleEditHelperAdvice"
+ editHelperAdviceClassName="org.eclipse.papyrus.umlrt.custom.advice.CapsuleEditHelperAdvice"
+ inheritance="all"/>
<matcherConfiguration
xsi:type="stereotypeapplicationmatcherconfiguration:StereotypeApplicationMatcherConfiguration"
xmi:id="_ubJcs6eUEeSUR5jX0TaAcA">
@@ -55,7 +62,7 @@
<editHelperAdviceConfiguration
xmi:id="_Z9YkQM2BEeSdoOwgSyouYw"
name="org.eclipse.papyrus.umlrt.custom.advice.ProtocolEditHelperAdvice"
- description="advice for Protocol"
+ description="Advice for Protocol"
identifier="org.eclipse.papyrus.umlrt.custom.advice.ProtocolEditHelperAdvice"
editHelperAdviceClassName="org.eclipse.papyrus.umlrt.custom.advice.ProtocolEditHelperAdvice"
inheritance="all"/>
diff --git a/extraplugins/umlrt/org.eclipse.papyrus.umlrt/src/org/eclipse/papyrus/umlrt/custom/advice/CapsuleEditHelperAdvice.java b/extraplugins/umlrt/org.eclipse.papyrus.umlrt/src/org/eclipse/papyrus/umlrt/custom/advice/CapsuleEditHelperAdvice.java
new file mode 100644
index 00000000000..bcc1ef0b9bc
--- /dev/null
+++ b/extraplugins/umlrt/org.eclipse.papyrus.umlrt/src/org/eclipse/papyrus/umlrt/custom/advice/CapsuleEditHelperAdvice.java
@@ -0,0 +1,69 @@
+/*****************************************************************************
+ * Copyright (c) 2015 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: Onder Gurcan <onder.gurcan@cea.fr>
+ *
+ *****************************************************************************/
+
+package org.eclipse.papyrus.umlrt.custom.advice;
+
+import org.eclipse.core.commands.ExecutionException;
+import org.eclipse.core.runtime.IAdaptable;
+import org.eclipse.core.runtime.IProgressMonitor;
+import org.eclipse.gmf.runtime.common.core.command.CommandResult;
+import org.eclipse.gmf.runtime.common.core.command.ICommand;
+import org.eclipse.gmf.runtime.emf.type.core.commands.ConfigureElementCommand;
+import org.eclipse.gmf.runtime.emf.type.core.edithelper.AbstractEditHelperAdvice;
+import org.eclipse.gmf.runtime.emf.type.core.requests.ConfigureRequest;
+import org.eclipse.papyrus.uml.tools.utils.NamedElementUtil;
+import org.eclipse.uml2.uml.Class;
+
+
+/**
+ * The helperadvice class used for UMLRealTime::Protocol.
+ *
+ * @author Onder Gurcan <onder.gurcan@cea.fr>
+ *
+ */
+public class CapsuleEditHelperAdvice extends AbstractEditHelperAdvice {
+
+ private enum Relation {
+ CHILD, SIBLING, PARENT;
+ }
+
+
+ /**
+ * @see org.eclipse.gmf.runtime.emf.type.core.edithelper.AbstractEditHelperAdvice#getBeforeConfigureCommand(org.eclipse.gmf.runtime.emf.type.core.requests.ConfigureRequest)
+ *
+ * @param request
+ * @return
+ */
+ @Override
+ protected ICommand getBeforeConfigureCommand(ConfigureRequest request) {
+ final Class capsule = (Class) request.getElementToConfigure();
+ final String name = NamedElementUtil.getDefaultNameWithIncrementFromBase("Capsule", capsule.eContainer().eContents());
+
+ return new ConfigureElementCommand(request) {
+ private IProgressMonitor progressMonitor;
+ private IAdaptable info;
+
+ @Override
+ protected CommandResult doExecuteWithResult(IProgressMonitor progressMonitor, IAdaptable info) throws ExecutionException {
+ this.progressMonitor = progressMonitor;
+ this.info = info;
+
+ capsule.setIsActive(true);
+ capsule.setName(name);
+
+ return CommandResult.newOKCommandResult(capsule);
+ }
+
+ };
+ }
+}
diff --git a/features/papyrus-dev-features/org.eclipse.papyrus.dev.feature/feature.xml b/features/papyrus-dev-features/org.eclipse.papyrus.dev.feature/feature.xml
index efc4813e2ba..7ff4ac7ccb3 100644
--- a/features/papyrus-dev-features/org.eclipse.papyrus.dev.feature/feature.xml
+++ b/features/papyrus-dev-features/org.eclipse.papyrus.dev.feature/feature.xml
@@ -122,4 +122,39 @@ http://www.eclipse.org/legal/epl-v10.html
version="0.0.0"
unpack="false"/>
+ <plugin
+ id="org.eclipse.b3.aggregator"
+ download-size="0"
+ install-size="0"
+ version="0.0.0"
+ unpack="false"/>
+
+ <plugin
+ id="org.eclipse.b3.aggregator.legacy"
+ download-size="0"
+ install-size="0"
+ version="0.0.0"
+ unpack="false"/>
+
+ <plugin
+ id="org.eclipse.b3.cli"
+ download-size="0"
+ install-size="0"
+ version="0.0.0"
+ unpack="false"/>
+
+ <plugin
+ id="org.eclipse.b3.p2"
+ download-size="0"
+ install-size="0"
+ version="0.0.0"
+ unpack="false"/>
+
+ <plugin
+ id="org.eclipse.b3.util"
+ download-size="0"
+ install-size="0"
+ version="0.0.0"
+ unpack="false"/>
+
</feature>
diff --git a/features/papyrus-extra-features/org.eclipse.papyrus.extra.feature/feature.xml b/features/papyrus-extra-features/org.eclipse.papyrus.extra.feature/feature.xml
index 7c8050aacb7..0360ff7ac43 100644
--- a/features/papyrus-extra-features/org.eclipse.papyrus.extra.feature/feature.xml
+++ b/features/papyrus-extra-features/org.eclipse.papyrus.extra.feature/feature.xml
@@ -1,11 +1,11 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<feature
- id="org.eclipse.papyrus.extra.feature"
- label="%featureName"
- version="1.1.0.qualifier"
- provider-name="%providerName">
-
- <copyright url="http://www.eclipse.org/legal/epl-v10.html">
+<?xml version="1.0" encoding="UTF-8"?>
+<feature
+ id="org.eclipse.papyrus.extra.feature"
+ label="%featureName"
+ version="1.1.0.qualifier"
+ provider-name="%providerName">
+
+ <copyright url="http://www.eclipse.org/legal/epl-v10.html">
Copyright (c) 2008-2013 CEA LIST, Atos Origin, Conselleria de
Infraestructuras y Transporte, Generalitat de la Comunitat Valenciana
and others
@@ -13,111 +13,107 @@ 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
- </copyright>
-
- <license url="%licenseURL">
- %license
- </license>
-
- <includes
- id="org.eclipse.papyrus.extra.migration.feature"
- version="0.0.0"/>
-
- <includes
- id="org.eclipse.papyrus.uml.export.feature"
- version="0.0.0"/>
-
- <includes
- id="org.eclipse.papyrus.extra.cdo.feature"
- version="0.0.0"/>
-
- <includes
- id="org.eclipse.papyrus.extra.diagramtemplate.feature"
- version="0.0.0"/>
-
- <includes
- id="org.eclipse.papyrus.extra.dsml.validation.feature"
- version="0.0.0"/>
-
- <includes
- id="org.eclipse.papyrus.extra.eastadl.feature"
- version="0.0.0"/>
-
- <includes
- id="org.eclipse.papyrus.extra.marte.feature"
- version="0.0.0"/>
-
- <includes
- id="org.eclipse.papyrus.extra.marte.properties.feature"
- version="0.0.0"/>
-
- <includes
- id="org.eclipse.papyrus.extra.marte.textedit.feature"
- version="0.0.0"/>
-
- <includes
- id="org.eclipse.papyrus.extra.uml.compare.feature"
- version="0.0.0"/>
-
- <includes
- id="org.eclipse.papyrus.extra.umlrt.feature"
- version="0.0.0"/>
-
- <includes
- id="org.eclipse.papyrus.java.generator.feature"
- version="0.0.0"/>
-
- <includes
- id="org.eclipse.papyrus.java.reverse.feature"
- version="0.0.0"/>
-
- <includes
- id="org.eclipse.papyrus.extra.robotml.feature"
- version="0.0.0"/>
-
- <includes
- id="org.eclipse.papyrus.extra.qompass.designer.basic.feature"
- version="0.0.0"/>
-
- <includes
- id="org.eclipse.papyrus.extra.qompass.designer.tracing.feature"
- version="0.0.0"/>
-
- <includes
- id="org.eclipse.papyrus.extra.cpp.feature"
- version="0.0.0"/>
-
- <includes
- id="org.eclipse.papyrus.java.profile.feature"
- version="0.0.0"/>
-
- <includes
- id="org.eclipse.papyrus.robotml.generators.intempora.rtmaps.feature"
- version="0.0.0"/>
-
- <includes
- id="org.eclipse.papyrus.layers.feature"
- version="0.0.0"/>
-
- <includes
- id="org.eclipse.papyrus.extra.moka.feature"
- version="0.0.0"/>
-
- <includes
- id="org.eclipse.papyrus.migration.rsa.feature"
- version="0.0.0"/>
-
- <includes
- id="org.eclipse.papyrus.uml.diagram.ecore.feature"
- version="0.0.0"/>
-
- <includes
- id="org.eclipse.papyrus.extra.epf.richtext.feature"
- version="0.0.0"/>
-
- <includes
- id="org.eclipse.papyrus.uml.alf.extra.feature"
- version="0.0.0"/>
-
-</feature>
+http://www.eclipse.org/legal/epl-v10.html
+ </copyright>
+
+ <license url="%licenseURL">
+ %license
+ </license>
+
+ <includes
+ id="org.eclipse.papyrus.extra.migration.feature"
+ version="0.0.0"/>
+
+ <includes
+ id="org.eclipse.papyrus.uml.export.feature"
+ version="0.0.0"/>
+
+ <includes
+ id="org.eclipse.papyrus.extra.cdo.feature"
+ version="0.0.0"/>
+
+ <includes
+ id="org.eclipse.papyrus.extra.diagramtemplate.feature"
+ version="0.0.0"/>
+
+ <includes
+ id="org.eclipse.papyrus.extra.dsml.validation.feature"
+ version="0.0.0"/>
+
+ <includes
+ id="org.eclipse.papyrus.extra.eastadl.feature"
+ version="0.0.0"/>
+
+ <includes
+ id="org.eclipse.papyrus.extra.marte.feature"
+ version="0.0.0"/>
+
+ <includes
+ id="org.eclipse.papyrus.extra.marte.properties.feature"
+ version="0.0.0"/>
+
+ <includes
+ id="org.eclipse.papyrus.extra.marte.textedit.feature"
+ version="0.0.0"/>
+
+ <includes
+ id="org.eclipse.papyrus.extra.uml.compare.feature"
+ version="0.0.0"/>
+
+ <includes
+ id="org.eclipse.papyrus.extra.umlrt.feature"
+ version="0.0.0"/>
+
+ <includes
+ id="org.eclipse.papyrus.java.generator.feature"
+ version="0.0.0"/>
+
+ <includes
+ id="org.eclipse.papyrus.java.reverse.feature"
+ version="0.0.0"/>
+
+ <includes
+ id="org.eclipse.papyrus.extra.robotml.feature"
+ version="0.0.0"/>
+
+ <includes
+ id="org.eclipse.papyrus.extra.qompass.designer.basic.feature"
+ version="0.0.0"/>
+
+ <includes
+ id="org.eclipse.papyrus.extra.qompass.designer.tracing.feature"
+ version="0.0.0"/>
+
+ <includes
+ id="org.eclipse.papyrus.extra.cpp.feature"
+ version="0.0.0"/>
+
+ <includes
+ id="org.eclipse.papyrus.java.profile.feature"
+ version="0.0.0"/>
+
+ <includes
+ id="org.eclipse.papyrus.robotml.generators.intempora.rtmaps.feature"
+ version="0.0.0"/>
+
+ <includes
+ id="org.eclipse.papyrus.layers.feature"
+ version="0.0.0"/>
+
+ <includes
+ id="org.eclipse.papyrus.extra.moka.feature"
+ version="0.0.0"/>
+
+ <includes
+ id="org.eclipse.papyrus.migration.rsa.feature"
+ version="0.0.0"/>
+
+ <includes
+ id="org.eclipse.papyrus.uml.diagram.ecore.feature"
+ version="0.0.0"/>
+
+ <includes
+ id="org.eclipse.papyrus.uml.alf.extra.feature"
+ version="0.0.0"/>
+
+</feature>
diff --git a/plugins/developer/org.eclipse.papyrus.def/xtend/aspects/impl/diagram/editparts/CompartmentEditPart.xtend b/plugins/developer/org.eclipse.papyrus.def/xtend/aspects/impl/diagram/editparts/CompartmentEditPart.xtend
index a8f6d37b299..8ec2edaf53e 100644
--- a/plugins/developer/org.eclipse.papyrus.def/xtend/aspects/impl/diagram/editparts/CompartmentEditPart.xtend
+++ b/plugins/developer/org.eclipse.papyrus.def/xtend/aspects/impl/diagram/editparts/CompartmentEditPart.xtend
@@ -17,6 +17,7 @@ import com.google.inject.Inject
import com.google.inject.Singleton
import org.eclipse.gmf.codegen.gmfgen.GenCompartment
import xpt.diagram.editparts.Common
+import org.eclipse.papyrus.papyrusgmfgenextension.ExtendedGenView
//DOCUMENTATION: PapyrusGenCode
//Overload only the creation of editPolicies in order to add the paste edit policy
@@ -48,5 +49,21 @@ import xpt.diagram.editparts.Common
return super.getTargetEditPart(request);
}
'''
+
+ override createFigure(GenCompartment it) {
+ if (hasExternalSuperClass(it,'org.eclipse.papyrus.uml.diagram.activity.edit.part.ShapeCompartmentWithoutScrollbarsEditPart')) {
+ '''
+ @Override
+ public org.eclipse.draw2d.IFigure createFigure() {
+ return super.createFigure();
+ }
+ '''
+ } else {
+ super.createFigure(it);
+ }
+ }
+ def boolean hasExternalSuperClass(GenCompartment it, String className) {
+ return it.eResource.allContents.filter(typeof(ExtendedGenView)).filter [v | (v.genView.contains(it) && v.superOwnedEditPart.equals(className))].size > 0;
+ }
}
diff --git a/plugins/developer/org.eclipse.papyrus.releng.tools/META-INF/MANIFEST.MF b/plugins/developer/org.eclipse.papyrus.releng.tools/META-INF/MANIFEST.MF
index 077329f875c..c54e3230dea 100644
--- a/plugins/developer/org.eclipse.papyrus.releng.tools/META-INF/MANIFEST.MF
+++ b/plugins/developer/org.eclipse.papyrus.releng.tools/META-INF/MANIFEST.MF
@@ -5,11 +5,11 @@ Require-Bundle: org.eclipse.core.runtime,
org.eclipse.core.resources,
org.eclipse.b3.aggregator;bundle-version="0.2.0",
org.eclipse.b3.aggregator.legacy;bundle-version="0.2.0",
- org.eclipse.oomph.setup.targlets;bundle-version="1.0.0";resolution:=optional,
+ org.eclipse.oomph.setup.targlets;bundle-version="1.0.0",
org.eclipse.oomph.p2;bundle-version="1.0.0",
- org.eclipse.emf.edit;bundle-version="2.10.0";resolution:=optional,
+ org.eclipse.emf.edit;bundle-version="2.10.0",
com.google.guava;bundle-version="11.0.0",
- org.eclipse.oomph.workingsets;bundle-version="1.0.0";resolution:=optional
+ org.eclipse.oomph.workingsets;bundle-version="1.0.0"
Bundle-Vendor: %Bundle-Vendor
Bundle-ActivationPolicy: lazy
Bundle-Version: 1.1.0.qualifier
diff --git a/plugins/developer/org.eclipse.papyrus.uml.developer.mde/META-INF/MANIFEST.MF b/plugins/developer/org.eclipse.papyrus.uml.developer.mde/META-INF/MANIFEST.MF
index e3822fd03af..cac56edaa66 100644
--- a/plugins/developer/org.eclipse.papyrus.uml.developer.mde/META-INF/MANIFEST.MF
+++ b/plugins/developer/org.eclipse.papyrus.uml.developer.mde/META-INF/MANIFEST.MF
@@ -15,7 +15,11 @@ Require-Bundle: org.eclipse.ui,
org.eclipse.papyrus.infra.gmfdiag.common;bundle-version="1.1.0",
org.eclipse.core.resources,
org.eclipse.papyrus.infra.hyperlink;bundle-version="1.1.0",
- org.eclipse.papyrus.infra.core.log;bundle-version="1.1.0"
+ org.eclipse.papyrus.infra.core.log;bundle-version="1.1.0",
+ org.eclipse.emf.ecore.edit;bundle-version="2.9.0",
+ org.eclipse.papyrus.infra.tools;bundle-version="1.1.0",
+ com.google.guava;bundle-version="11.0.0",
+ org.eclipse.uml2.uml.profile.standard;bundle-version="1.0.100"
Bundle-Vendor: %providerName
Bundle-ActivationPolicy: lazy
Bundle-Version: 1.1.0.qualifier
diff --git a/plugins/developer/org.eclipse.papyrus.uml.developer.mde/resource/developermodel.uml b/plugins/developer/org.eclipse.papyrus.uml.developer.mde/resource/developermodel.uml
index 1303d4b0ed5..2eb62c83b5d 100644
--- a/plugins/developer/org.eclipse.papyrus.uml.developer.mde/resource/developermodel.uml
+++ b/plugins/developer/org.eclipse.papyrus.uml.developer.mde/resource/developermodel.uml
@@ -1,55 +1,83 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<xmi:XMI xmi:version="20131001" xmlns:xmi="http://www.omg.org/spec/XMI/20131001" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" xmlns:structure="http://DeveloperProcess/schemas/structure/_VA9p4McPEeO9CYUoXDRplw/1" xmlns:uml="http://www.eclipse.org/uml2/5.0.0/UML" xsi:schemaLocation="http://DeveloperProcess/schemas/structure/_VA9p4McPEeO9CYUoXDRplw/1 pathmap://DEVELOPER_PROFILES/developerprocess.profile.uml#_VA-4AMcPEeO9CYUoXDRplw">
- <uml:Model xmi:id="_HpQmkMbbEeOtJ6H27Db7nA" name="MySystem">
- <packageImport xmi:type="uml:PackageImport" xmi:id="_HpRNoMbbEeOtJ6H27Db7nA">
- <importedPackage xmi:type="uml:Model" href="pathmap://UML_LIBRARIES/UMLPrimitiveTypes.library.uml#_0"/>
- </packageImport>
- <packagedElement xmi:type="uml:Model" xmi:id="_Auq_wMbrEeOfGc4OdhO4dw" name="Requirements"/>
- <packagedElement xmi:type="uml:Model" xmi:id="_BZKHMMbrEeOfGc4OdhO4dw" name="UseCases">
- <packagedElement xmi:type="uml:Abstraction" xmi:id="_cX1UIMbrEeOfGc4OdhO4dw" name="useCasesAbstraction" client="_BZKHMMbrEeOfGc4OdhO4dw" supplier="_Auq_wMbrEeOfGc4OdhO4dw"/>
- <packagedElement xmi:type="uml:Component" xmi:id="_9-BAkMbrEeOfGc4OdhO4dw" name="MySystem"/>
- </packagedElement>
- <packagedElement xmi:type="uml:Model" xmi:id="_BnjvkMbrEeOfGc4OdhO4dw" name="Design">
- <packagedElement xmi:type="uml:Abstraction" xmi:id="_c-r4wMbrEeOfGc4OdhO4dw" name="DesignAbstraction" client="_BnjvkMbrEeOfGc4OdhO4dw" supplier="_BZKHMMbrEeOfGc4OdhO4dw"/>
- </packagedElement>
- <packagedElement xmi:type="uml:Model" xmi:id="_ByGLoMbrEeOfGc4OdhO4dw" name="Test">
- <packagedElement xmi:type="uml:Dependency" xmi:id="_l-MxcMbrEeOfGc4OdhO4dw" name="Dependency1" client="_ByGLoMbrEeOfGc4OdhO4dw" supplier="_BZKHMMbrEeOfGc4OdhO4dw"/>
- <packagedElement xmi:type="uml:Dependency" xmi:id="_mtL-YMbrEeOfGc4OdhO4dw" name="Dependency2" client="_ByGLoMbrEeOfGc4OdhO4dw" supplier="_BnjvkMbrEeOfGc4OdhO4dw"/>
- </packagedElement>
- <profileApplication xmi:type="uml:ProfileApplication" xmi:id="_yLz7oMbcEeOfGc4OdhO4dw">
- <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_yL73cMbcEeOfGc4OdhO4dw" source="http://www.eclipse.org/uml2/2.0.0/UML">
- <references xmi:type="ecore:EPackage" href="pathmap://DEVELOPER_PROFILES/developerprocess.profile.uml#_VA6mkMcPEeO9CYUoXDRplw"/>
- </eAnnotations>
- <appliedProfile xmi:type="uml:Profile" href="pathmap://DEVELOPER_PROFILES/developerprocess.profile.uml#_kWqjAMbXEeO09JBvNFZRNw"/>
- </profileApplication>
- <profileApplication xmi:type="uml:ProfileApplication" xmi:id="_yL9soMbcEeOfGc4OdhO4dw">
- <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_yL-TsMbcEeOfGc4OdhO4dw" source="http://www.eclipse.org/uml2/2.0.0/UML">
- <references xmi:type="ecore:EPackage" href="pathmap://DEVELOPER_PROFILES/developerprocess.profile.uml#_VA-4AMcPEeO9CYUoXDRplw"/>
- </eAnnotations>
- <appliedProfile xmi:type="uml:Profile" href="pathmap://DEVELOPER_PROFILES/developerprocess.profile.uml#_qCT3MMbXEeO09JBvNFZRNw"/>
- </profileApplication>
- <profileApplication xmi:type="uml:ProfileApplication" xmi:id="_yMClIMbcEeOfGc4OdhO4dw">
- <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_yMDMMMbcEeOfGc4OdhO4dw" source="http://www.eclipse.org/uml2/2.0.0/UML">
- <references xmi:type="ecore:EPackage" href="pathmap://DEVELOPER_PROFILES/developerprocess.profile.uml#_VBAtMccPEeO9CYUoXDRplw"/>
- </eAnnotations>
- <appliedProfile xmi:type="uml:Profile" href="pathmap://DEVELOPER_PROFILES/developerprocess.profile.uml#_2LNtQMbYEeO09JBvNFZRNw"/>
- </profileApplication>
- <profileApplication xmi:type="uml:ProfileApplication" xmi:id="_szDMkMbvEeO9CYUoXDRplw">
- <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_sz9LgMbvEeO9CYUoXDRplw" source="http://www.eclipse.org/uml2/2.0.0/UML">
- <references xmi:type="ecore:EPackage" href="http://www.eclipse.org/papyrus/0.7.0/SysML#//requirements"/>
- </eAnnotations>
- <appliedProfile xmi:type="uml:Profile" href="pathmap://SysML_PROFILES/SysML.profile.uml#_OOJC4LX8EduFmqQsrNB9lw"/>
- </profileApplication>
- <profileApplication xmi:type="uml:ProfileApplication" xmi:id="_7pPJAMn1EeOZsdollP-xSA">
- <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_7qdRAMn1EeOZsdollP-xSA" source="http://www.eclipse.org/uml2/2.0.0/UML">
- <references xmi:type="ecore:EPackage" href="pathmap://DEVELOPER_PROFILES/Document.profile.uml#_qR44IMn0EeO9CYUoXDRplw"/>
- </eAnnotations>
- <appliedProfile xmi:type="uml:Profile" href="pathmap://DEVELOPER_PROFILES/Document.profile.uml#_D0JcUMnzEeO9CYUoXDRplw"/>
- </profileApplication>
- </uml:Model>
- <structure:Project xmi:id="_-C7yQMbqEeOfGc4OdhO4dw" base_Model="_HpQmkMbbEeOtJ6H27Db7nA"/>
- <structure:Requirements xmi:id="_Jp8RoMbrEeOfGc4OdhO4dw" base_Model="_Auq_wMbrEeOfGc4OdhO4dw"/>
- <structure:UseCases xmi:id="_L8fjEMbrEeOfGc4OdhO4dw" base_Model="_BZKHMMbrEeOfGc4OdhO4dw"/>
- <structure:Design xmi:id="_NgIgEMbrEeOfGc4OdhO4dw" base_Model="_BnjvkMbrEeOfGc4OdhO4dw"/>
- <structure:Tests xmi:id="_ObTu4MbrEeOfGc4OdhO4dw" base_Model="_ByGLoMbrEeOfGc4OdhO4dw"/>
-</xmi:XMI>
+<?xml version="1.0" encoding="UTF-8"?>
+<xmi:XMI xmi:version="20131001" xmlns:xmi="http://www.omg.org/spec/XMI/20131001" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" xmlns:structure="http://DeveloperProcess/schemas/structure/_rpmLUHVxEeSZ-fQGFkyJeQ/6" xmlns:uml="http://www.eclipse.org/uml2/5.0.0/UML" xsi:schemaLocation="http://DeveloperProcess/schemas/structure/_rpmLUHVxEeSZ-fQGFkyJeQ/6 pathmap://DEVELOPER_PROFILES/developerprocess.profile.uml#_rpmyYHVxEeSZ-fQGFkyJeQ">
+ <uml:Model xmi:id="_HpQmkMbbEeOtJ6H27Db7nA" name="MySystem">
+ <packageImport xmi:type="uml:PackageImport" xmi:id="_HpRNoMbbEeOtJ6H27Db7nA">
+ <importedPackage xmi:type="uml:Model" href="pathmap://UML_LIBRARIES/UMLPrimitiveTypes.library.uml#_0"/>
+ </packageImport>
+ <packagedElement xmi:type="uml:Model" xmi:id="_Auq_wMbrEeOfGc4OdhO4dw" name="Requirements"/>
+ <packagedElement xmi:type="uml:Model" xmi:id="_BZKHMMbrEeOfGc4OdhO4dw" name="UseCases">
+ <packagedElement xmi:type="uml:Abstraction" xmi:id="_cX1UIMbrEeOfGc4OdhO4dw" name="useCasesAbstraction" client="_BZKHMMbrEeOfGc4OdhO4dw" supplier="_Auq_wMbrEeOfGc4OdhO4dw"/>
+ <packagedElement xmi:type="uml:Component" xmi:id="_9-BAkMbrEeOfGc4OdhO4dw" name="MySystem"/>
+ </packagedElement>
+ <packagedElement xmi:type="uml:Model" xmi:id="_BnjvkMbrEeOfGc4OdhO4dw" name="Design">
+ <packagedElement xmi:type="uml:Abstraction" xmi:id="_c-r4wMbrEeOfGc4OdhO4dw" name="DesignAbstraction" client="_BnjvkMbrEeOfGc4OdhO4dw" supplier="_BZKHMMbrEeOfGc4OdhO4dw"/>
+ </packagedElement>
+ <packagedElement xmi:type="uml:Model" xmi:id="_ByGLoMbrEeOfGc4OdhO4dw" name="Test">
+ <packagedElement xmi:type="uml:Dependency" xmi:id="_l-MxcMbrEeOfGc4OdhO4dw" name="Dependency1" client="_ByGLoMbrEeOfGc4OdhO4dw" supplier="_BZKHMMbrEeOfGc4OdhO4dw"/>
+ <packagedElement xmi:type="uml:Dependency" xmi:id="_mtL-YMbrEeOfGc4OdhO4dw" name="Dependency2" client="_ByGLoMbrEeOfGc4OdhO4dw" supplier="_BnjvkMbrEeOfGc4OdhO4dw"/>
+ </packagedElement>
+ <profileApplication xmi:type="uml:ProfileApplication" xmi:id="_yLz7oMbcEeOfGc4OdhO4dw">
+ <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_Vz8WYACJEeWudc8agGQ04Q" source="PapyrusVersion">
+ <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_Vz8WYQCJEeWudc8agGQ04Q" key="Version" value="0.0.7"/>
+ <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_Vz8WYgCJEeWudc8agGQ04Q" key="Comment" value=""/>
+ <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_Vz8WYwCJEeWudc8agGQ04Q" key="Copyright" value=""/>
+ <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_Vz8WZACJEeWudc8agGQ04Q" key="Date" value="2014-11-26"/>
+ <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_Vz8WZQCJEeWudc8agGQ04Q" key="Author" value=""/>
+ </eAnnotations>
+ <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_yL73cMbcEeOfGc4OdhO4dw" source="http://www.eclipse.org/uml2/2.0.0/UML">
+ <references xmi:type="ecore:EPackage" href="pathmap://DEVELOPER_PROFILES/developerprocess.profile.uml#_rplkQXVxEeSZ-fQGFkyJeQ"/>
+ </eAnnotations>
+ <appliedProfile xmi:type="uml:Profile" href="pathmap://DEVELOPER_PROFILES/developerprocess.profile.uml#_kWqjAMbXEeO09JBvNFZRNw"/>
+ </profileApplication>
+ <profileApplication xmi:type="uml:ProfileApplication" xmi:id="_yL9soMbcEeOfGc4OdhO4dw">
+ <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_Vz_ZsACJEeWudc8agGQ04Q" source="PapyrusVersion">
+ <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_Vz_ZsQCJEeWudc8agGQ04Q" key="Version" value="0.0.7"/>
+ <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_Vz_ZsgCJEeWudc8agGQ04Q" key="Comment" value=""/>
+ <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_Vz_ZswCJEeWudc8agGQ04Q" key="Copyright" value=""/>
+ <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_Vz_ZtACJEeWudc8agGQ04Q" key="Date" value="2014-11-26"/>
+ <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_Vz_ZtQCJEeWudc8agGQ04Q" key="Author" value=""/>
+ </eAnnotations>
+ <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_yL-TsMbcEeOfGc4OdhO4dw" source="http://www.eclipse.org/uml2/2.0.0/UML">
+ <references xmi:type="ecore:EPackage" href="pathmap://DEVELOPER_PROFILES/developerprocess.profile.uml#_rpmyYHVxEeSZ-fQGFkyJeQ"/>
+ </eAnnotations>
+ <appliedProfile xmi:type="uml:Profile" href="pathmap://DEVELOPER_PROFILES/developerprocess.profile.uml#_qCT3MMbXEeO09JBvNFZRNw"/>
+ </profileApplication>
+ <profileApplication xmi:type="uml:ProfileApplication" xmi:id="_yMClIMbcEeOfGc4OdhO4dw">
+ <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_V0AAwACJEeWudc8agGQ04Q" source="PapyrusVersion">
+ <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_V0AAwQCJEeWudc8agGQ04Q" key="Version" value="0.0.7"/>
+ <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_V0AAwgCJEeWudc8agGQ04Q" key="Comment" value=""/>
+ <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_V0AAwwCJEeWudc8agGQ04Q" key="Copyright" value=""/>
+ <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_V0AAxACJEeWudc8agGQ04Q" key="Date" value="2014-11-26"/>
+ <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_V0AAxQCJEeWudc8agGQ04Q" key="Author" value=""/>
+ </eAnnotations>
+ <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_yMDMMMbcEeOfGc4OdhO4dw" source="http://www.eclipse.org/uml2/2.0.0/UML">
+ <references xmi:type="ecore:EPackage" href="pathmap://DEVELOPER_PROFILES/developerprocess.profile.uml#_rpnZcXVxEeSZ-fQGFkyJeQ"/>
+ </eAnnotations>
+ <appliedProfile xmi:type="uml:Profile" href="pathmap://DEVELOPER_PROFILES/developerprocess.profile.uml#_2LNtQMbYEeO09JBvNFZRNw"/>
+ </profileApplication>
+ <profileApplication xmi:type="uml:ProfileApplication" xmi:id="_szDMkMbvEeO9CYUoXDRplw">
+ <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_sz9LgMbvEeO9CYUoXDRplw" source="http://www.eclipse.org/uml2/2.0.0/UML">
+ <references xmi:type="ecore:EPackage" href="http://www.eclipse.org/papyrus/0.7.0/SysML#//requirements"/>
+ </eAnnotations>
+ <appliedProfile xmi:type="uml:Profile" href="pathmap://SysML_PROFILES/SysML.profile.uml#_OOJC4LX8EduFmqQsrNB9lw"/>
+ </profileApplication>
+ <profileApplication xmi:type="uml:ProfileApplication" xmi:id="_7pPJAMn1EeOZsdollP-xSA">
+ <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_V0AAxgCJEeWudc8agGQ04Q" source="PapyrusVersion">
+ <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_V0AAxwCJEeWudc8agGQ04Q" key="Version" value="0.0.11"/>
+ <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_V0AAyACJEeWudc8agGQ04Q" key="Comment" value=""/>
+ <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_V0AAyQCJEeWudc8agGQ04Q" key="Copyright" value=""/>
+ <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_V0AAygCJEeWudc8agGQ04Q" key="Date" value="2014-11-14"/>
+ <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_V0AAywCJEeWudc8agGQ04Q" key="Author" value=""/>
+ </eAnnotations>
+ <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_7qdRAMn1EeOZsdollP-xSA" source="http://www.eclipse.org/uml2/2.0.0/UML">
+ <references xmi:type="ecore:EPackage" href="pathmap://DEVELOPER_PROFILES/Document.profile.uml#_RQrLoWwBEeSIYu1Ih2FYyQ"/>
+ </eAnnotations>
+ <appliedProfile xmi:type="uml:Profile" href="pathmap://DEVELOPER_PROFILES/Document.profile.uml#_D0JcUMnzEeO9CYUoXDRplw"/>
+ </profileApplication>
+ </uml:Model>
+ <structure:Project xmi:id="_-C7yQMbqEeOfGc4OdhO4dw" base_Model="_HpQmkMbbEeOtJ6H27Db7nA"/>
+ <structure:Requirements xmi:id="_Jp8RoMbrEeOfGc4OdhO4dw" base_Model="_Auq_wMbrEeOfGc4OdhO4dw"/>
+ <structure:UseCases xmi:id="_L8fjEMbrEeOfGc4OdhO4dw" base_Model="_BZKHMMbrEeOfGc4OdhO4dw"/>
+ <structure:Design xmi:id="_NgIgEMbrEeOfGc4OdhO4dw" base_Model="_BnjvkMbrEeOfGc4OdhO4dw"/>
+ <structure:Tests xmi:id="_ObTu4MbrEeOfGc4OdhO4dw" base_Model="_ByGLoMbrEeOfGc4OdhO4dw"/>
+</xmi:XMI>
diff --git a/plugins/developer/org.eclipse.papyrus.uml.developer.mde/src/org/eclipse/papyrus/uml/developper/mde/LinkUtil.java b/plugins/developer/org.eclipse.papyrus.uml.developer.mde/src/org/eclipse/papyrus/uml/developper/mde/LinkUtil.java
new file mode 100644
index 00000000000..2508f75063a
--- /dev/null
+++ b/plugins/developer/org.eclipse.papyrus.uml.developer.mde/src/org/eclipse/papyrus/uml/developper/mde/LinkUtil.java
@@ -0,0 +1,162 @@
+/*****************************************************************************
+ * Copyright (c) 2015 Christian W. Damus 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:
+ * Christian W. Damus - Initial API and implementation
+ *
+ *****************************************************************************/
+
+package org.eclipse.papyrus.uml.developper.mde;
+
+import java.util.List;
+import java.util.regex.MatchResult;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
+
+import org.eclipse.papyrus.infra.emf.utils.EMFFunctions;
+import org.eclipse.papyrus.uml.developper.mde.handler.IDMAbstractHandler;
+import org.eclipse.uml2.uml.NamedElement;
+import org.eclipse.uml2.uml.UMLPackage;
+
+import com.google.common.base.Function;
+import com.google.common.base.Strings;
+import com.google.common.collect.ImmutableList;
+
+/**
+ * An utility for generating and parsing simple textual hyperlinks.
+ */
+public class LinkUtil {
+ private static final Pattern HYPERLINK_PATTERN = Pattern.compile("\\$\\{link:([^\\|]+)\\|([^\\|]*)\\|([^\\}]*)\\}");
+
+ private final Function<? super NamedElement, String> titleFunction;
+ private final Function<? super NamedElement, String> nameFunction = EMFFunctions.getFeature(UMLPackage.Literals.NAMED_ELEMENT__NAME, String.class);
+ private final Function<NamedElement, String> hyperlinkFunction = new Function<NamedElement, String>() {
+
+ @Override
+ public String apply(NamedElement input) {
+ return createHyperlink(input, titleFunction.apply(input), nameFunction.apply(input));
+ }
+ };
+
+ /**
+ * Initializes me with the function that I use to obtain titles for links to model elements.
+ *
+ * @param titleFunction
+ * my element title function
+ */
+ public LinkUtil(Function<? super NamedElement, String> titleFunction) {
+ super();
+
+ this.titleFunction = titleFunction;
+ }
+
+ public static String createHyperlink(NamedElement element, String title, String name) {
+ return String.format("${link:%s|%s|%s}", element.eResource().getURIFragment(element), title, name);
+ }
+
+ public Function<? super NamedElement, String> getHyperlinkFunction() {
+ return hyperlinkFunction;
+ }
+
+ public static List<Hyperlink> parseHyperlinks(CharSequence text, int start, int end) {
+ ImmutableList.Builder<Hyperlink> result = ImmutableList.builder();
+
+ for (Matcher m = HYPERLINK_PATTERN.matcher(text.subSequence(start, end)); m.find();) {
+ result.add(new Hyperlink(m, start));
+ }
+
+ return result.build();
+ }
+
+ /**
+ * Transcodes a length of {@code text} with any potential encoded hyperlinks into a format suitable for the
+ * output of the generation pipeline.
+ *
+ * @param text
+ * a string of (comment) text from the documentation model
+ * @param start
+ * the starting offset (inclusive) in the {@code text} to process
+ * @param end
+ * the ending offset (exclusive) in the {@code text} to process
+ * @param transcoder
+ * a function that generates the textual representation of an hyperlink in the output format
+ *
+ * @return the transcoded text, or {@code null} if it had no embedded hyperlinks
+ */
+ public static String transcodeHyperlinks(CharSequence text, int start, int end, Function<? super Hyperlink, String> transcoder) {
+ String result = null;
+
+ List<Hyperlink> hyperlinks = parseHyperlinks(text, start, end);
+ if (!hyperlinks.isEmpty()) {
+ StringBuilder buf = new StringBuilder(3 * text.length() / 2);
+ int offset = start;
+
+ for (Hyperlink next : hyperlinks) {
+ // Up to the start of the hyperlink
+ buf.append(text, offset, next.offset());
+
+ // Output representation of the hyperlink
+ buf.append(transcoder.apply(next));
+
+ // Prepare for next
+ offset = next.offset() + next.length();
+ }
+
+ // Remainder of the string
+ buf.append(text, offset, end);
+
+ result = buf.toString();
+ }
+
+ return result;
+ }
+
+ //
+ // Nested types
+ //
+
+ public static final class Hyperlink {
+ private final int offset;
+ private final int length;
+ private final String href;
+ private final String title;
+ private final String text;
+
+ Hyperlink(MatchResult match, int offset) {
+ super();
+
+ this.offset = offset + match.start();
+ this.length = match.end() - match.start();
+
+ this.href = match.group(1);
+ this.title = match.group(2);
+ this.text = match.group(3);
+ }
+
+ public int offset() {
+ return offset;
+ }
+
+ public int length() {
+ return length;
+ }
+
+ public String href() {
+ String result = IDMAbstractHandler.getDocHREF(href);
+ return (result == null) ? href : result;
+ }
+
+ public String title() {
+ return Strings.isNullOrEmpty(title) ? text : title;
+ }
+
+ public String text() {
+ return text;
+ }
+ }
+}
diff --git a/plugins/developer/org.eclipse.papyrus.uml.developer.mde/src/org/eclipse/papyrus/uml/developper/mde/command/CreateDocumentModelCommand.java b/plugins/developer/org.eclipse.papyrus.uml.developer.mde/src/org/eclipse/papyrus/uml/developper/mde/command/CreateDocumentModelCommand.java
index 6afb56c7ae6..f0151a6c91c 100644
--- a/plugins/developer/org.eclipse.papyrus.uml.developer.mde/src/org/eclipse/papyrus/uml/developper/mde/command/CreateDocumentModelCommand.java
+++ b/plugins/developer/org.eclipse.papyrus.uml.developer.mde/src/org/eclipse/papyrus/uml/developper/mde/command/CreateDocumentModelCommand.java
@@ -1,5 +1,5 @@
/*****************************************************************************
- * Copyright (c) 2014 CEA LIST.
+ * Copyright (c) 2014, 2015 CEA LIST, Christian W. Damus, and others.
*
*
* All rights reserved. This program and the accompanying materials
@@ -9,6 +9,7 @@
*
* Contributors:
* Patrick Tessier (CEA LIST) Patrick.tessier@cea.fr - Initial API and implementation
+ * Christian W. Damus - bug 468079
*
*****************************************************************************/
package org.eclipse.papyrus.uml.developper.mde.command;
@@ -17,12 +18,17 @@ import java.io.File;
import java.util.ArrayList;
import java.util.Iterator;
import java.util.List;
+import java.util.Map;
import org.eclipse.core.runtime.CoreException;
import org.eclipse.core.runtime.NullProgressMonitor;
import org.eclipse.core.runtime.Path;
+import org.eclipse.emf.common.notify.AdapterFactory;
import org.eclipse.emf.ecore.EObject;
+import org.eclipse.emf.ecore.provider.EModelElementItemProvider;
import org.eclipse.emf.ecore.util.EcoreUtil;
+import org.eclipse.emf.edit.domain.AdapterFactoryEditingDomain;
+import org.eclipse.emf.edit.provider.IItemLabelProvider;
import org.eclipse.emf.transaction.RecordingCommand;
import org.eclipse.emf.transaction.TransactionalEditingDomain;
import org.eclipse.gmf.runtime.diagram.core.preferences.PreferencesHint;
@@ -37,18 +43,25 @@ import org.eclipse.papyrus.infra.hyperlink.object.HyperLinkDocument;
import org.eclipse.papyrus.infra.hyperlink.object.HyperLinkObject;
import org.eclipse.papyrus.infra.hyperlink.util.HyperLinkException;
import org.eclipse.papyrus.infra.hyperlink.util.HyperLinkHelpersRegistrationUtil;
+import org.eclipse.papyrus.infra.tools.util.TypeUtils;
import org.eclipse.papyrus.uml.developper.mde.I_DeveloperIDMStereotype;
import org.eclipse.papyrus.uml.developper.mde.I_DocumentStereotype;
+import org.eclipse.papyrus.uml.developper.mde.LinkUtil;
import org.eclipse.papyrus.uml.developper.mde.handler.IDMAbstractHandler;
import org.eclipse.papyrus.views.modelexplorer.NavigatorUtils;
import org.eclipse.uml2.uml.Actor;
import org.eclipse.uml2.uml.Association;
import org.eclipse.uml2.uml.Behavior;
+import org.eclipse.uml2.uml.BehavioredClassifier;
import org.eclipse.uml2.uml.Class;
import org.eclipse.uml2.uml.Classifier;
+import org.eclipse.uml2.uml.Collaboration;
import org.eclipse.uml2.uml.Comment;
+import org.eclipse.uml2.uml.DataType;
import org.eclipse.uml2.uml.Dependency;
+import org.eclipse.uml2.uml.DirectedRelationship;
import org.eclipse.uml2.uml.Element;
+import org.eclipse.uml2.uml.Interface;
import org.eclipse.uml2.uml.Model;
import org.eclipse.uml2.uml.NamedElement;
import org.eclipse.uml2.uml.Package;
@@ -57,6 +70,17 @@ import org.eclipse.uml2.uml.PackageableElement;
import org.eclipse.uml2.uml.Stereotype;
import org.eclipse.uml2.uml.UMLFactory;
import org.eclipse.uml2.uml.UseCase;
+import org.eclipse.uml2.uml.profile.standard.Trace;
+import org.eclipse.uml2.uml.util.UMLUtil;
+
+import com.google.common.base.Function;
+import com.google.common.base.Joiner;
+import com.google.common.base.Strings;
+import com.google.common.collect.BiMap;
+import com.google.common.collect.HashBiMap;
+import com.google.common.collect.ImmutableList;
+import com.google.common.collect.Iterables;
+import com.google.common.collect.Maps;
/**
* this command transform a model to document model
@@ -78,6 +102,11 @@ public class CreateDocumentModelCommand extends RecordingCommand {
protected int nbUnverifiedRequirement = 0;
protected int nbRequirement = 0;
+ private AdapterFactory adapterFactory;
+
+ private LinkUtil linkUtil;
+
+ private BiMap<Diagram, String> diagramFileNames = HashBiMap.create();
/**
*
@@ -97,6 +126,14 @@ public class CreateDocumentModelCommand extends RecordingCommand {
hyperLinkHelpers.addAll(HyperLinkHelpersRegistrationUtil.INSTANCE.getAllRegisteredHyperLinkHelper());
hyperlinkHelperFactory = new HyperLinkHelperFactory(hyperLinkHelpers);
+
+ adapterFactory = ((AdapterFactoryEditingDomain) domain).getAdapterFactory();
+ linkUtil = new LinkUtil(new Function<NamedElement, String>() {
+ @Override
+ public String apply(NamedElement input) {
+ return title(input);
+ }
+ });
}
@Override
@@ -151,7 +188,7 @@ public class CreateDocumentModelCommand extends RecordingCommand {
// Get the requirements model package from the model
Model requirementsModel = getStereotypedPackage(I_DeveloperIDMStereotype.REQUIREMENTS_STEREOTYPE);
- // For each requirements, creates a line in the table
+ // For each requirements, creates a line in the table
if (requirementsModel != null) {
Package requirementsCoverageOUT = createSection(documentModel, "Requirements Coverage");
generateTableCoverage(requirementsModel, requirementsCoverageOUT);
@@ -159,6 +196,8 @@ public class CreateDocumentModelCommand extends RecordingCommand {
// Generate content of the Table of Contents package
generateTableOfContents(documentModel);
+
+ diagramFileNames.clear();
}
@@ -177,8 +216,8 @@ public class CreateDocumentModelCommand extends RecordingCommand {
Package toc = (Package) documentModel.getPackagedElement("Table of Contents");
Stereotype tableOfContentStereotype = toc.getAppliedStereotype(I_DocumentStereotype.TABLEOFCONTENT_STEREOTYPE);
if (!(section.isStereotypeApplied(tableOfContentStereotype))) {
- Package chapter = createSection(toc, ((Package)section).getName());
- IDMAbstractHandler.Toc2DocElt.put(chapter, (Package) section);
+ Package chapter = createSection(toc, ((Package) section).getName());
+ IDMAbstractHandler.putTOCPackage(chapter, (Package) section);
setTableOfContents(section, chapter);
}
}
@@ -200,10 +239,10 @@ public class CreateDocumentModelCommand extends RecordingCommand {
Element cddElement = elements.next();
Stereotype sectionStereotype = cddElement.getAppliedStereotype(I_DocumentStereotype.SECTION_STEREOTYPE);
if (sectionStereotype != null) {
- Package chapter = createSection(chapterPackage, ((Package)cddElement).getName());
- IDMAbstractHandler.Toc2DocElt.put(chapter, (Package) cddElement);
+ Package chapter = createSection(chapterPackage, ((Package) cddElement).getName());
+ IDMAbstractHandler.putTOCPackage(chapter, (Package) cddElement);
setTableOfContents(cddElement, chapter);
- }
+ }
}
}
}
@@ -213,14 +252,14 @@ public class CreateDocumentModelCommand extends RecordingCommand {
for (Iterator<EObject> itereq = requirementsIn.eAllContents(); itereq.hasNext();) {
EObject packageableElement = itereq.next();
if (packageableElement instanceof PackageImport) {
- PackageImport importedPackage = (PackageImport)packageableElement;
+ PackageImport importedPackage = (PackageImport) packageableElement;
if (importedPackage.getAppliedStereotype(I_DeveloperIDMStereotype.REQUIREMENTS_STEREOTYPE) != null) {
Model importedRequirementPackageIn = (Model) importedPackage.getImportedPackage();
generateRequirements(importedRequirementPackageIn, requirementsOUT);
}
- } else if (packageableElement instanceof Element){
+ } else if (packageableElement instanceof Element) {
Element currentReq = (Element) packageableElement;
- Stereotype reqStereotype = currentReq.getApplicableStereotype(SYS_ML_REQUIREMENTS_REQUIREMENT);
+ Stereotype reqStereotype = currentReq.getAppliedStereotype(SYS_ML_REQUIREMENTS_REQUIREMENT);
if (reqStereotype != null) {
String out = "- " + ((org.eclipse.uml2.uml.Class) currentReq).getName() + " (id=" + currentReq.getValue(reqStereotype, "id") + "): "; //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$
out = out + "\n " + currentReq.getValue(reqStereotype, "text"); //$NON-NLS-1$ //$NON-NLS-2$
@@ -229,7 +268,7 @@ public class CreateDocumentModelCommand extends RecordingCommand {
Stereotype contentStereotype = comment.getApplicableStereotype(I_DocumentStereotype.CONTENT_STEREOTYPE);
comment.applyStereotype(contentStereotype);
comment.setBody(out);
- IDMAbstractHandler.elt2DocElt.put(currentReq, comment);
+ IDMAbstractHandler.putDocElement(currentReq, comment);
}
}
}
@@ -248,17 +287,15 @@ public class CreateDocumentModelCommand extends RecordingCommand {
}
for (PackageableElement packageableElement : useCaseIN.getPackagedElements()) {
- if( (packageableElement instanceof Classifier) &&(!(packageableElement instanceof Actor)) &&(!(packageableElement instanceof Association) )){
+ if ((packageableElement instanceof Classifier) && (!(packageableElement instanceof Actor)) && (!(packageableElement instanceof Association))) {
Classifier subjectIn = (Classifier) packageableElement;
Package subSectionOUT = createSection(useCaseModelOUT, subjectIn.getName());
generateUseCaseFromSubject(copyImageUtil, subjectIn, subSectionOUT);
}
}
-
-
}
- protected void generateUseCaseFromSubject(CopyToImageUtil copyImageUtil, Classifier subjectIN, Package useCaseModelOUT){
+ protected void generateUseCaseFromSubject(CopyToImageUtil copyImageUtil, Classifier subjectIN, Package useCaseModelOUT) {
// createRef diagram
if (containedDiagrams(subjectIN).size() > 0) {
Diagram currentDiagram = containedDiagrams(subjectIN).get(0);
@@ -273,14 +310,16 @@ public class CreateDocumentModelCommand extends RecordingCommand {
for (Iterator<EObject> iterator = subjectIN.eAllContents(); iterator.hasNext();) {
EObject packageableElement = iterator.next();
if (packageableElement instanceof UseCase) {
- Package useCaseSectionOUT = createSection(useCaseModelOUT, ((UseCase) packageableElement).getName());
+ UseCase useCase = (UseCase) packageableElement;
+ Package useCaseSectionOUT = createSection(useCaseModelOUT, useCase.getName());
+ generateTraceability(useCaseSectionOUT, useCase);
- for (Iterator<Comment> iteComment = ((UseCase) packageableElement).getOwnedComments().iterator(); iteComment.hasNext();) {
+ for (Iterator<Comment> iteComment = useCase.getOwnedComments().iterator(); iteComment.hasNext();) {
Comment currentComment = iteComment.next();
transformToContentWithUser(copyImageUtil, useCaseSectionOUT, currentComment);
}
} else if (packageableElement instanceof PackageImport) {
- PackageImport importedPackage = (PackageImport)packageableElement;
+ PackageImport importedPackage = (PackageImport) packageableElement;
if (importedPackage.getAppliedStereotype(I_DeveloperIDMStereotype.USECASES_STEREOTYPE) != null) {
Model importedUseCasesPackageIn = (Model) importedPackage.getImportedPackage();
generateUseCases(copyImageUtil, importedUseCasesPackageIn, useCaseModelOUT);
@@ -299,8 +338,7 @@ public class CreateDocumentModelCommand extends RecordingCommand {
}
transformToContentComment(HowToSection, currentComment);
createImageFromHyperLink(copyImageUtil, HowToSection, currentComment);
- }
- else {
+ } else {
transformToContentComment(useCaseSectionOUT, currentComment);
createImageFromHyperLink(copyImageUtil, useCaseSectionOUT, currentComment);
}
@@ -308,12 +346,12 @@ public class CreateDocumentModelCommand extends RecordingCommand {
protected void generateDesign(CopyToImageUtil copyImageUtil, Package designPackageIn, Package designPackageOUT) {
- if(designPackageIn.getPackageImports().size()>0){
+ if (designPackageIn.getPackageImports().size() > 0) {
for (PackageImport packageImport : designPackageIn.getPackageImports()) {
if (packageImport.getAppliedStereotype(I_DeveloperIDMStereotype.DESIGN_STEREOTYPE) != null) {
- Package importedDesignPackageIn = (Package) packageImport.getImportedPackage();
+ Package importedDesignPackageIn = packageImport.getImportedPackage();
Package subSectionOUT = createSection(designPackageOUT, importedDesignPackageIn.getName());
- IDMAbstractHandler.elt2DocElt.put((Element) importedDesignPackageIn, subSectionOUT);
+ IDMAbstractHandler.putDocElement(importedDesignPackageIn, subSectionOUT);
generateDesign(copyImageUtil, importedDesignPackageIn, subSectionOUT);
}
}
@@ -332,27 +370,183 @@ public class CreateDocumentModelCommand extends RecordingCommand {
for (Iterator<PackageableElement> iterator = designPackageIn.getPackagedElements().iterator(); iterator.hasNext();) {
EObject packageableElement = iterator.next();
- if (packageableElement instanceof Class) {
- Package designSectionOUT = createSection(designPackageOUT, ((Class)packageableElement).getName());
- IDMAbstractHandler.elt2DocElt.put((Element) packageableElement, designSectionOUT);
- for (Iterator<Comment> iteComment = ((Class) packageableElement).getOwnedComments().iterator(); iteComment.hasNext();) {
+ if ((packageableElement instanceof Class) || (packageableElement instanceof Interface) || (packageableElement instanceof DataType)) {
+ final Classifier classifier = (Classifier) packageableElement;
+ Package designSectionOUT = createSection(designPackageOUT, title(classifier));
+ IDMAbstractHandler.putDocElement(classifier, designSectionOUT);
+ generateTaxonomy(designSectionOUT, classifier);
+ generateTraceability(designSectionOUT, classifier);
+ for (Iterator<Comment> iteComment = classifier.getOwnedComments().iterator(); iteComment.hasNext();) {
Comment currentComment = iteComment.next();
transformToContentWithUser(copyImageUtil, designSectionOUT, currentComment);
}
}
+
+ if (packageableElement instanceof Collaboration) {
+ generateDesignCollaboration(copyImageUtil, designPackageOUT, (Collaboration) packageableElement);
+ }
+
if (packageableElement instanceof Package) {
- Package designSectionOUT = createSection(designPackageOUT, ((Package)packageableElement).getName());
- IDMAbstractHandler.elt2DocElt.put((Element) packageableElement, designSectionOUT);
- generateDesign(copyImageUtil, (Package)packageableElement, designSectionOUT);
+ Package package_ = (Package) packageableElement;
+ Package designSectionOUT = createSection(designPackageOUT, title(package_));
+ generateTraceability(designSectionOUT, package_);
+ IDMAbstractHandler.putDocElement(package_, designSectionOUT);
+ generateDesign(copyImageUtil, package_, designSectionOUT);
+ }
+
+ }
+
+ }
+
+ protected void generateDesignCollaboration(CopyToImageUtil copyImageUtil, Package designPackage, Collaboration collaboration) {
+ Package designSectionOUT = createSection(designPackage, title(collaboration));
+ IDMAbstractHandler.putDocElement(collaboration, designSectionOUT);
+
+ generateTraceability(designSectionOUT, collaboration);
+
+ for (Diagram diagram : containedDiagrams(collaboration)) {
+ generateImg(copyImageUtil, designSectionOUT, diagram);
+ }
+
+ for (Comment comment : collaboration.getOwnedComments()) {
+ transformToContentWithUser(copyImageUtil, designSectionOUT, comment);
+ }
+
+ // Look for interaction diagrams
+
+ for (Behavior behavior : collaboration.getOwnedBehaviors()) {
+ Package behaviorSection = createSection(designSectionOUT, title(behavior));
+ IDMAbstractHandler.putDocElement(behavior, behaviorSection);
+
+ for (Comment comment : behavior.getOwnedComments()) {
+ transformToContentWithUser(copyImageUtil, behaviorSection, comment);
+ }
+ for (Diagram diagram : containedDiagrams(behavior)) {
+ generateImg(copyImageUtil, behaviorSection, diagram);
+ }
+ }
+ }
+
+ protected String title(NamedElement element) {
+ return String.format("%s %s", getMetaclassLabel(element), element.getLabel());
+ }
+
+ protected String getMetaclassLabel(Element element) {
+ String result;
+
+ // If the element has a stereotype, prefer that
+ Stereotype stereotype = Iterables.getFirst(element.getAppliedStereotypes(), null);
+ if (stereotype != null) {
+ result = stereotype.getLabel();
+ } else {
+ EModelElementItemProvider itemProvider = TypeUtils.as(adapterFactory.adapt(element, IItemLabelProvider.class), EModelElementItemProvider.class);
+ if (itemProvider == null) {
+ result = element.eClass().getName();
+ } else {
+ result = itemProvider.getResourceLocator().getString(String.format("_UI_%s_type", element.eClass().getName())); //$NON-NLS-1$
+ }
+ }
+
+ return result;
+ }
+
+ protected void generateTaxonomy(Package designSection, Classifier classifier) {
+ String taxonomy = ""; //$NON-NLS-1$
+
+ if (!classifier.getGenerals().isEmpty()) {
+ taxonomy = taxonomy + " - specializes " + Joiner.on(", ").join(
+ Iterables.transform(classifier.getGenerals(), linkUtil.getHyperlinkFunction()));
+ }
+
+ if (classifier instanceof BehavioredClassifier) {
+ BehavioredClassifier behaviored = (BehavioredClassifier) classifier;
+ if (!behaviored.getImplementedInterfaces().isEmpty()) {
+ if (!taxonomy.isEmpty()) {
+ taxonomy = taxonomy + "\n\n"; //$NON-NLS-1$
+ }
+
+ taxonomy = taxonomy + " - realizes " + Joiner.on(", ").join(
+ Iterables.transform(behaviored.getImplementedInterfaces(), linkUtil.getHyperlinkFunction()));
+ }
+ }
+
+ if (!taxonomy.isEmpty()) {
+ Comment comment = designSection.createOwnedComment();
+ Stereotype contentStereotype = comment.getApplicableStereotype(I_DocumentStereotype.CONTENT_STEREOTYPE);
+ comment.applyStereotype(contentStereotype);
+ comment.setBody(taxonomy);
+ }
+ }
+
+ protected void generateTraceability(Package sectionPackage, NamedElement concept) {
+ String traceability = ""; //$NON-NLS-1$
+
+ List<NamedElement> traceTo = getTracesTo(concept);
+ if (!traceTo.isEmpty()) {
+ traceability = traceability + " - traces to " + Joiner.on(", ").join(
+ Iterables.transform(traceTo, linkUtil.getHyperlinkFunction()));
+ }
+
+ List<NamedElement> traceFrom = getTracesFrom(concept);
+ if (!traceFrom.isEmpty()) {
+ if (!traceability.isEmpty()) {
+ traceability = traceability + "\n\n"; //$NON-NLS-1$
}
+ traceability = traceability + " - traces from " + Joiner.on(", ").join(
+ Iterables.transform(traceFrom, linkUtil.getHyperlinkFunction()));
}
+ if (!traceability.isEmpty()) {
+ Comment comment = sectionPackage.createOwnedComment();
+ Stereotype contentStereotype = comment.getApplicableStereotype(I_DocumentStereotype.CONTENT_STEREOTYPE);
+ comment.applyStereotype(contentStereotype);
+ comment.setBody(traceability);
+ }
}
+ /**
+ * Gets the elements that a {@code concept} traces to via {@literal «trace» Abstractions}.
+ *
+ * @param concept
+ * a concept in the model
+ * @return its trace-to elements
+ */
+ protected List<NamedElement> getTracesTo(NamedElement concept) {
+ ImmutableList.Builder<NamedElement> result = ImmutableList.builder();
+
+ for (DirectedRelationship next : concept.getSourceDirectedRelationships()) {
+ Trace trace = UMLUtil.getStereotypeApplication(next, Trace.class);
+ if (trace != null) {
+ result.addAll(trace.getBase_Abstraction().getSuppliers());
+ }
+ }
+
+ return result.build();
+ }
+
+ /**
+ * Gets the elements that a {@code concept} traces from via {@literal «trace» Abstractions}.
+ *
+ * @param concept
+ * a concept in the model
+ * @return its trace-from elements
+ */
+ protected List<NamedElement> getTracesFrom(NamedElement concept) {
+ ImmutableList.Builder<NamedElement> result = ImmutableList.builder();
+
+ for (DirectedRelationship next : concept.getTargetDirectedRelationships()) {
+ Trace trace = UMLUtil.getStereotypeApplication(next, Trace.class);
+ if (trace != null) {
+ result.addAll(trace.getBase_Abstraction().getClients());
+ }
+ }
+
+ return result.build();
+ }
protected void generateTests(CopyToImageUtil copyImageUtil, Package testIN, Package testModelOUT) {
- if(testIN.getPackageImports().size()>0){
+ if (testIN.getPackageImports().size() > 0) {
for (PackageImport packageImport : testIN.getPackageImports()) {
if (packageImport.getAppliedStereotype(I_DeveloperIDMStereotype.EXECUTABLETEST_STEREOTYPE) != null
|| packageImport.getAppliedStereotype(SYS_ML_REQUIREMENTS_TESTCASE) != null
@@ -370,31 +564,26 @@ public class CreateDocumentModelCommand extends RecordingCommand {
}
for (Iterator<Comment> iteComment = (testIN).getOwnedComments().iterator(); iteComment.hasNext();) {
Comment currentComment = iteComment.next();
- createImageFromHyperLink(copyImageUtil, testModelOUT, currentComment);
transformToContentComment(testModelOUT, currentComment);
+ createImageFromHyperLink(copyImageUtil, testModelOUT, currentComment);
}
for (Iterator<PackageableElement> iterator = testIN.getPackagedElements().iterator(); iterator.hasNext();) {
EObject packageableElement = iterator.next();
if (packageableElement instanceof Package) {
- Package testCaseSectionOUT = createSection(testModelOUT, ((Package) packageableElement).getName());
- IDMAbstractHandler.elt2DocElt.put((Element) packageableElement, testCaseSectionOUT);
- generateTests(copyImageUtil, (Package)packageableElement, testCaseSectionOUT);
- for (Iterator<Comment> iteComment = ((Package) packageableElement).getOwnedComments().iterator(); iteComment.hasNext();) {
+ Package package_ = (Package) packageableElement;
+ Package testCaseSectionOUT = createSection(testModelOUT, title(package_));
+ IDMAbstractHandler.putDocElement(package_, testCaseSectionOUT);
+ generateTests(copyImageUtil, package_, testCaseSectionOUT);
+ } else if (packageableElement instanceof Classifier && !(packageableElement instanceof Association)) {
+ Classifier classifier = (Classifier) packageableElement;
+ Package testCaseSectionOUT = createSection(testModelOUT, title(classifier));
+ IDMAbstractHandler.putDocElement(classifier, testCaseSectionOUT);
+ for (Iterator<Comment> iteComment = classifier.getOwnedComments().iterator(); iteComment.hasNext();) {
Comment currentComment = iteComment.next();
- createImageFromHyperLink(copyImageUtil, testCaseSectionOUT, currentComment);
transformToContentComment(testCaseSectionOUT, currentComment);
- }
- }
- else if (packageableElement instanceof Behavior ||packageableElement instanceof Classifier) {
-
- Package testCaseSectionOUT = createSection(testModelOUT, ((NamedElement) packageableElement).getName());
- IDMAbstractHandler.elt2DocElt.put((Element) packageableElement, testCaseSectionOUT);
- for (Iterator<Comment> iteComment = ((NamedElement) packageableElement).getOwnedComments().iterator(); iteComment.hasNext();) {
- Comment currentComment = iteComment.next();
createImageFromHyperLink(copyImageUtil, testCaseSectionOUT, currentComment);
- transformToContentComment(testCaseSectionOUT, currentComment);
}
}
@@ -404,14 +593,14 @@ public class CreateDocumentModelCommand extends RecordingCommand {
/**
*
* Generate the Requirements Coverage "Section" Package in the document model.
- * First, retrieves the requirements package in the model.
+ * First, retrieves the requirements package in the model.
* Then, for each requirement, create a comment with "Line" stereotype.
* A line has cells, and those cells are represented by a comment with the "Cell" stereotype.
* And a cell has contents, those contents are represented by a comment with the "CellContent" stereotype
*
* @param documentModel
*/
- protected void generateTableCoverage(Model requirementsModel, Package requirementsCoverageOUT) {
+ protected void generateTableCoverage(Model requirementsModel, Package requirementsCoverageOUT) {
// Create the comment with the table stereotype
Comment table = requirementsCoverageOUT.createOwnedComment();
@@ -443,11 +632,11 @@ public class CreateDocumentModelCommand extends RecordingCommand {
Stereotype cellStereotype = table.getApplicableStereotype(I_DocumentStereotype.CELL_STEREOTYPE);
Stereotype lineStereotype = table.getApplicableStereotype(I_DocumentStereotype.LINE_STEREOTYPE);
- // Iterates for each requirements
+ // Iterates for each requirements
for (Iterator<EObject> itereq = requirementsModel.eAllContents(); itereq.hasNext();) {
EObject packageableElement = itereq.next();
if (packageableElement instanceof PackageImport) {
- PackageImport importedPackage = (PackageImport)packageableElement;
+ PackageImport importedPackage = (PackageImport) packageableElement;
if (importedPackage.getAppliedStereotype(I_DeveloperIDMStereotype.REQUIREMENTS_STEREOTYPE) != null) {
Model importedRequirementPackageIn = (Model) importedPackage.getImportedPackage();
setTableCoverage(importedRequirementPackageIn, requirementsCoverageOUT, table, unsatisfiedRequirementComment, unverifiedRequirementComment);
@@ -488,7 +677,8 @@ public class CreateDocumentModelCommand extends RecordingCommand {
@SuppressWarnings("unchecked")
List<NamedElement> cddSatisfiedBy = (List<NamedElement>) currentReq.getValue(reqStereotype, "satisfiedBy");
- /* If the requirement is unsatisfied,
+ /*
+ * If the requirement is unsatisfied,
* add it to the unsatisfiedRequirement list (for tracability)
* creates a comment with the cellContentStereotype (to add reference in the documentation)
*/
@@ -501,14 +691,16 @@ public class CreateDocumentModelCommand extends RecordingCommand {
unsatisfiedReq.setBody((String) currentReq.getValue(reqStereotype, "id"));
}
- /* Iterate on satisfied elements of the requirements.
+ /*
+ * Iterate on satisfied elements of the requirements.
* For each one, create the cellContent.
- * Then, add it to the SatisfiedBy cell of the table */
+ * Then, add it to the SatisfiedBy cell of the table
+ */
for (Iterator<NamedElement> iterSatisified = cddSatisfiedBy.iterator(); iterSatisified.hasNext();) {
NamedElement satisfiedElement = iterSatisified.next();
Comment satisfiedByCellContent = satisfiedByCell.createOwnedComment();
- satisfiedByCellContent.applyStereotype(refContentStereotype);
+ satisfiedByCellContent.applyStereotype(refContentStereotype);
satisfiedByCellContent.setValue(refContentStereotype, I_DocumentStereotype.REF_CONTENT_REF_ATT, satisfiedElement);
satisfiedByCellContent.setBody(satisfiedElement.getName());
@@ -516,14 +708,15 @@ public class CreateDocumentModelCommand extends RecordingCommand {
satisfiedByCell.setBody("Satisfied elements");
- // Generate VerifiedBy cell of the table
+ // Generate VerifiedBy cell of the table
Comment verifiedByCell = lineComment.createOwnedComment();
verifiedByCell.applyStereotype(cellStereotype);
@SuppressWarnings("unchecked")
List<NamedElement> cddVerifiededBy = (List<NamedElement>) currentReq.getValue(reqStereotype, "verifiedBy");
- /* If the requirement is unverified,
+ /*
+ * If the requirement is unverified,
* add it to the unverifiedRequirement list (for tracability)
* creates a comment with the cellContentStereotype (to add reference in the documentation)
*/
@@ -536,24 +729,25 @@ public class CreateDocumentModelCommand extends RecordingCommand {
unverifiedReq.setBody((String) currentReq.getValue(reqStereotype, "id"));
}
- /* Iterate on verified elements of the requirements.
+ /*
+ * Iterate on verified elements of the requirements.
* For each one, create the cellContent.
- * Then, add it to the VerifiedBy cell of the table
+ * Then, add it to the VerifiedBy cell of the table
*/
for (Iterator<NamedElement> iterVerified = cddVerifiededBy.iterator(); iterVerified.hasNext();) {
NamedElement verifiedElement = iterVerified.next();
Comment verifiedByCellContent = verifiedByCell.createOwnedComment();
- verifiedByCellContent.applyStereotype(refContentStereotype);
+ verifiedByCellContent.applyStereotype(refContentStereotype);
verifiedByCellContent.setValue(refContentStereotype, I_DocumentStereotype.REF_CONTENT_REF_ATT, verifiedElement);
- verifiedByCellContent.setBody(verifiedElement.getName()) ;
+ verifiedByCellContent.setBody(verifiedElement.getName());
}
verifiedByCell.setBody("Verified elements");
}
- unsatisfiedRequirementComment.setBody("Unsatisfied requirements (" + nbUnsatisfiedRequirement + " out of " + nbRequirement + ") : ");
+ unsatisfiedRequirementComment.setBody("Unsatisfied requirements (" + nbUnsatisfiedRequirement + " out of " + nbRequirement + ") : ");
unverifiedRequirementComment.setBody("Unverified requirements (" + nbUnverifiedRequirement + " out of " + nbRequirement + ") : ");
}
}
@@ -626,11 +820,11 @@ public class CreateDocumentModelCommand extends RecordingCommand {
Comment commentImg = designPackageOUT.createOwnedComment();
Stereotype refStereotype = commentImg.getApplicableStereotype(I_DocumentStereotype.IMAGEREF_STEREOTYPE);
commentImg.applyStereotype(refStereotype);
- String tmpDirectoryPath=directoryPath.substring(1);
- String path=IMGpath.replace("\\", "/").toString();
- int index=path.indexOf(tmpDirectoryPath);
- if(index==0){
- path="."+path.substring(tmpDirectoryPath.length());
+ String tmpDirectoryPath = directoryPath.substring(1);
+ String path = IMGpath.replace("\\", "/").toString();
+ int index = path.indexOf(tmpDirectoryPath);
+ if (index == 0) {
+ path = "." + path.substring(tmpDirectoryPath.length());
}
commentImg.setValue(refStereotype, I_DocumentStereotype.IMAGEREF_REF_ATT, path);
commentImg.setBody(hyperLinkObject.getTooltipText());
@@ -695,7 +889,7 @@ public class CreateDocumentModelCommand extends RecordingCommand {
* @param currentDiagram
*/
protected void generateImg(CopyToImageUtil copyImageUtil, Package currentModel, Diagram currentDiagram) {
- Path imagePath = new Path("" + directoryPath + File.separator + "imgDOC" + File.separator + currentDiagram.getName().replaceAll(" ", "_") + ".png"); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$ //$NON-NLS-5$
+ Path imagePath = new Path("" + directoryPath + File.separator + "imgDOC" + File.separator + getDiagramImageFileName(currentDiagram)); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$ //$NON-NLS-5$
try {
copyImageUtil.copyToImage(currentDiagram,
@@ -710,16 +904,31 @@ public class CreateDocumentModelCommand extends RecordingCommand {
Comment commentImg = currentModel.createOwnedComment();
Stereotype refStereotype = commentImg.getApplicableStereotype(I_DocumentStereotype.IMAGEREF_STEREOTYPE);
commentImg.applyStereotype(refStereotype);
- String tmpDirectoryPath=directoryPath.substring(1);
- String path=imagePath.toString();
- int index=path.indexOf(tmpDirectoryPath);
- if(index==0){
- path="."+path.substring(tmpDirectoryPath.length());
+ String tmpDirectoryPath = directoryPath.substring(1);
+ String path = imagePath.toString();
+ int index = path.indexOf(tmpDirectoryPath);
+ if (index == 0) {
+ path = "." + path.substring(tmpDirectoryPath.length());
}
commentImg.setValue(refStereotype, I_DocumentStereotype.IMAGEREF_REF_ATT, path);
commentImg.setBody(currentDiagram.getName());
}
+ protected String getDiagramImageFileName(Diagram diagram) {
+ String result = diagramFileNames.get(diagram);
+
+ if (result == null) {
+ String base = Strings.nullToEmpty(diagram.getName()).replaceAll(" ", "_");
+ result = base;
+ for (int i = 1; diagramFileNames.containsValue(result); i++) {
+ result = base + '_' + i;
+ }
+ diagramFileNames.put(diagram, result);
+ }
+
+ return result + ".png";
+ }
+
/**
*
* @param source
diff --git a/plugins/developer/org.eclipse.papyrus.uml.developer.mde/src/org/eclipse/papyrus/uml/developper/mde/handler/GetHTMLTextHandler.java b/plugins/developer/org.eclipse.papyrus.uml.developer.mde/src/org/eclipse/papyrus/uml/developper/mde/handler/GetHTMLTextHandler.java
index 567241eea72..3280610d653 100644
--- a/plugins/developer/org.eclipse.papyrus.uml.developer.mde/src/org/eclipse/papyrus/uml/developper/mde/handler/GetHTMLTextHandler.java
+++ b/plugins/developer/org.eclipse.papyrus.uml.developer.mde/src/org/eclipse/papyrus/uml/developper/mde/handler/GetHTMLTextHandler.java
@@ -1,5 +1,5 @@
/*****************************************************************************
- * Copyright (c) 2014 CEA LIST.
+ * Copyright (c) 2014, 2015 CEA LIST, Christian W. Damus, and others.
*
*
* All rights reserved. This program and the accompanying materials
@@ -9,12 +9,11 @@
*
* Contributors:
* Patrick Tessier (CEA LIST) Patrick.tessier@cea.fr - Initial API and implementation
+ * Christian W. Damus - bug 468079
*
*****************************************************************************/
package org.eclipse.papyrus.uml.developper.mde.handler;
-import java.util.List;
-
import org.eclipse.core.commands.ExecutionEvent;
import org.eclipse.core.commands.ExecutionException;
import org.eclipse.core.resources.IProject;
@@ -26,7 +25,6 @@ import org.eclipse.papyrus.uml.developper.mde.command.CreateDocumentModelCommand
import org.eclipse.papyrus.uml.developper.mde.transcription.HTMLTranscription;
import org.eclipse.papyrus.uml.developper.mde.transcription.TranscriptionEngine;
import org.eclipse.uml2.uml.Model;
-import org.eclipse.uml2.uml.Stereotype;
/**
* This class is used to create and html developper doc file.
@@ -35,7 +33,7 @@ import org.eclipse.uml2.uml.Stereotype;
public class GetHTMLTextHandler extends IDMAbstractHandler {
protected static final String INTERNAL_DIRECTORY_NAME = "/doc"; //$NON-NLS-1$
-
+
@@ -43,13 +41,18 @@ public class GetHTMLTextHandler extends IDMAbstractHandler {
public Object execute(ExecutionEvent event) throws ExecutionException {
super.execute(event);
System.err.println(getCurrentProject().getLocationURI().getPath());
- IDMAbstractHandler.elt2DocElt.clear();
- IDMAbstractHandler.Toc2DocElt.clear();
- CreateDocumentModelCommand createDocumentModelCommand = new CreateDocumentModelCommand(transactionalEditingDomain, (Model) getSelection(), getCurrentProject().getLocationURI().getPath() + INTERNAL_DIRECTORY_NAME);
- transactionalEditingDomain.getCommandStack().execute(createDocumentModelCommand);
- IProject project = getCurrentProject();
- TranscriptionEngine engine = new TranscriptionEngine((Model) getSelection(), project, new HTMLTranscription());
- engine.traduce();
+ IDMAbstractHandler.clear();
+
+ try {
+ CreateDocumentModelCommand createDocumentModelCommand = new CreateDocumentModelCommand(transactionalEditingDomain, (Model) getSelection(), getCurrentProject().getLocationURI().getPath() + INTERNAL_DIRECTORY_NAME);
+ transactionalEditingDomain.getCommandStack().execute(createDocumentModelCommand);
+ IProject project = getCurrentProject();
+ TranscriptionEngine engine = new TranscriptionEngine((Model) getSelection(), project, new HTMLTranscription());
+ engine.traduce();
+ } finally {
+ IDMAbstractHandler.clear();
+ }
+
return null;
}
@@ -72,8 +75,7 @@ public class GetHTMLTextHandler extends IDMAbstractHandler {
public boolean isEnabled() {
if (getSelection() instanceof Model) {
Model model = (Model) getSelection();
- List<Stereotype> stereotypes = model.getAppliedStereotypes();
- if (((Model) getSelection()).getAppliedStereotype(I_DeveloperIDMStereotype.PROJECT_STEREOTYPE) != null) {
+ if (model.getAppliedStereotype(I_DeveloperIDMStereotype.PROJECT_STEREOTYPE) != null) {
return true;
}
diff --git a/plugins/developer/org.eclipse.papyrus.uml.developer.mde/src/org/eclipse/papyrus/uml/developper/mde/handler/GetWikiTextHandler.java b/plugins/developer/org.eclipse.papyrus.uml.developer.mde/src/org/eclipse/papyrus/uml/developper/mde/handler/GetWikiTextHandler.java
index af418f54fb0..fac26701a59 100644
--- a/plugins/developer/org.eclipse.papyrus.uml.developer.mde/src/org/eclipse/papyrus/uml/developper/mde/handler/GetWikiTextHandler.java
+++ b/plugins/developer/org.eclipse.papyrus.uml.developer.mde/src/org/eclipse/papyrus/uml/developper/mde/handler/GetWikiTextHandler.java
@@ -1,5 +1,5 @@
/*****************************************************************************
- * Copyright (c) 2014 CEA LIST.
+ * Copyright (c) 2014, 2015 CEA LIST, Christian W. Damus, and others.
*
*
* All rights reserved. This program and the accompanying materials
@@ -9,6 +9,7 @@
*
* Contributors:
* Patrick Tessier (CEA LIST) Patrick.tessier@cea.fr - Initial API and implementation
+ * Christian W. Damus - bug 468079
*
*****************************************************************************/
package org.eclipse.papyrus.uml.developper.mde.handler;
@@ -37,13 +38,18 @@ public class GetWikiTextHandler extends IDMAbstractHandler {
public Object execute(ExecutionEvent event) throws ExecutionException {
super.execute(event);
System.err.println(getCurrentProject().getLocationURI().getPath());
- IDMAbstractHandler.elt2DocElt.clear();
- IDMAbstractHandler.Toc2DocElt.clear();
- CreateDocumentModelCommand createDocumentModelCommand = new CreateDocumentModelCommand(transactionalEditingDomain, (Model) getSelection(), getCurrentProject().getLocationURI().getPath() + INTERNAL_DIRECTORY_NAME);
- transactionalEditingDomain.getCommandStack().execute(createDocumentModelCommand);
- IProject project = getCurrentProject();
- TranscriptionEngine engine = new TranscriptionEngine((Model) getSelection(), project, new WikiTranscription());
- engine.traduce();
+ IDMAbstractHandler.clear();
+
+ try {
+ CreateDocumentModelCommand createDocumentModelCommand = new CreateDocumentModelCommand(transactionalEditingDomain, (Model) getSelection(), getCurrentProject().getLocationURI().getPath() + INTERNAL_DIRECTORY_NAME);
+ transactionalEditingDomain.getCommandStack().execute(createDocumentModelCommand);
+ IProject project = getCurrentProject();
+ TranscriptionEngine engine = new TranscriptionEngine((Model) getSelection(), project, new WikiTranscription());
+ engine.traduce();
+ } finally {
+ IDMAbstractHandler.clear();
+ }
+
return null;
}
diff --git a/plugins/developer/org.eclipse.papyrus.uml.developer.mde/src/org/eclipse/papyrus/uml/developper/mde/handler/IDMAbstractHandler.java b/plugins/developer/org.eclipse.papyrus.uml.developer.mde/src/org/eclipse/papyrus/uml/developper/mde/handler/IDMAbstractHandler.java
index ce7ccf779a8..9d5ac7d9b6d 100644
--- a/plugins/developer/org.eclipse.papyrus.uml.developer.mde/src/org/eclipse/papyrus/uml/developper/mde/handler/IDMAbstractHandler.java
+++ b/plugins/developer/org.eclipse.papyrus.uml.developer.mde/src/org/eclipse/papyrus/uml/developper/mde/handler/IDMAbstractHandler.java
@@ -1,5 +1,5 @@
/*****************************************************************************
- * Copyright (c) 2014 CEA LIST.
+ * Copyright (c) 2014, 2015 CEA LIST, Christian W. Damus, and others.
*
*
* All rights reserved. This program and the accompanying materials
@@ -9,6 +9,7 @@
*
* Contributors:
* Patrick Tessier (CEA LIST) Patrick.tessier@cea.fr - Initial API and implementation
+ * Christian W. Damus - bug 468079
*
*****************************************************************************/
package org.eclipse.papyrus.uml.developper.mde.handler;
@@ -16,6 +17,7 @@ package org.eclipse.papyrus.uml.developper.mde.handler;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.Iterator;
+import java.util.Map;
import org.eclipse.core.commands.AbstractHandler;
import org.eclipse.core.commands.ExecutionEvent;
@@ -41,9 +43,10 @@ public abstract class IDMAbstractHandler extends AbstractHandler {
protected TransactionalEditingDomain transactionalEditingDomain = null;
protected PapyrusMultiDiagramEditor papyrusEditor;
- public static HashMap<Element, Element> elt2DocElt = new HashMap<Element, Element>();
- public static HashMap<Package, Package> Toc2DocElt = new HashMap<Package, Package>();
-
+ private static Map<Element, Element> elt2DocElt = new HashMap<Element, Element>();
+ private static Map<String, String> href2DocHREF = new HashMap<String, String>();
+ private static Map<Package, Package> Toc2DocElt = new HashMap<Package, Package>();
+
/**
* get the root package
*
@@ -117,4 +120,31 @@ public abstract class IDMAbstractHandler extends AbstractHandler {
}
return selectedSet;
}
+
+ public static void clear() {
+ elt2DocElt.clear();
+ href2DocHREF.clear();
+ Toc2DocElt.clear();
+ }
+
+ public static Element getDocElement(Element modelElement) {
+ return elt2DocElt.get(modelElement);
+ }
+
+ public static String getDocHREF(String href) {
+ return href2DocHREF.get(href);
+ }
+
+ public static void putDocElement(Element modelElement, Element docElement) {
+ elt2DocElt.put(modelElement, docElement);
+ href2DocHREF.put(modelElement.eResource().getURIFragment(modelElement), docElement.eResource().getURIFragment(docElement));
+ }
+
+ public static Package getDocPackageForTOC(Package tocPackage) {
+ return Toc2DocElt.get(tocPackage);
+ }
+
+ public static void putTOCPackage(Package tocPackage, Package docPackage) {
+ Toc2DocElt.put(tocPackage, docPackage);
+ }
}
diff --git a/plugins/developer/org.eclipse.papyrus.uml.developer.mde/src/org/eclipse/papyrus/uml/developper/mde/transcription/HTMLTranscription.java b/plugins/developer/org.eclipse.papyrus.uml.developer.mde/src/org/eclipse/papyrus/uml/developper/mde/transcription/HTMLTranscription.java
index b7f2ceaca53..1280406ae0e 100644
--- a/plugins/developer/org.eclipse.papyrus.uml.developer.mde/src/org/eclipse/papyrus/uml/developper/mde/transcription/HTMLTranscription.java
+++ b/plugins/developer/org.eclipse.papyrus.uml.developer.mde/src/org/eclipse/papyrus/uml/developper/mde/transcription/HTMLTranscription.java
@@ -1,5 +1,5 @@
/*****************************************************************************
- * Copyright (c) 2014 CEA LIST.
+ * Copyright (c) 2014, 2015 CEA LIST, Christian W. Damus, and others.
*
*
* All rights reserved. This program and the accompanying materials
@@ -9,18 +9,23 @@
*
* Contributors:
* Patrick Tessier (CEA LIST) Patrick.tessier@cea.fr - Initial API and implementation
+ * Christian W. Damus - bug 468079
*
*****************************************************************************/
package org.eclipse.papyrus.uml.developper.mde.transcription;
import org.eclipse.emf.ecore.xmi.XMIResource;
import org.eclipse.papyrus.uml.developper.mde.I_DocumentStereotype;
+import org.eclipse.papyrus.uml.developper.mde.LinkUtil;
+import org.eclipse.papyrus.uml.developper.mde.LinkUtil.Hyperlink;
import org.eclipse.uml2.uml.Comment;
import org.eclipse.uml2.uml.Element;
import org.eclipse.uml2.uml.Model;
import org.eclipse.uml2.uml.Package;
import org.eclipse.uml2.uml.Stereotype;
+import com.google.common.base.Function;
+
/**
* this class is a specialization to generate html files.
*
@@ -29,6 +34,18 @@ import org.eclipse.uml2.uml.Stereotype;
*/
public class HTMLTranscription implements ITranscription {
+ private final Function<LinkUtil.Hyperlink, String> hyperlinkFunction = new Function<LinkUtil.Hyperlink, String>() {
+ @Override
+ public String apply(Hyperlink input) {
+ return String.format("<a href=\"#%s\" title=\"%s\">%s</a>", input.href(), input.title(), input.text());
+ }
+ };
+
+ @Override
+ public Function<? super Hyperlink, String> getHyperlinkTranscoder() {
+ return hyperlinkFunction;
+ }
+
/**
* @see org.eclipse.papyrus.uml.developper.mde.transcription.ITranscription#writeEndingDocument(java.lang.StringBuffer)
*
@@ -38,6 +55,7 @@ public class HTMLTranscription implements ITranscription {
@Override
public void writeEndingDocument(StringBuffer out) {
out.append("</html>"); //$NON-NLS-1$
+ out.append(System.lineSeparator());
}
@@ -51,7 +69,9 @@ public class HTMLTranscription implements ITranscription {
@Override
public StringBuffer writeBeginningDocument(StringBuffer out) {
out.append("<html>"); //$NON-NLS-1$
+ out.append(System.lineSeparator());
out.append("<link rel=\"stylesheet\" href=\"default.css\" type=\"text/css\">"); //$NON-NLS-1$
+ out.append(System.lineSeparator());
return out;
}
@@ -64,6 +84,7 @@ public class HTMLTranscription implements ITranscription {
@Override
public void writeDocumentTitle(StringBuffer out, Model documentModel) {
out.append("<H1>" + documentModel.getName() + "</H1>"); //$NON-NLS-1$ //$NON-NLS-2$
+ out.append(System.lineSeparator());
}
/**
@@ -74,8 +95,9 @@ public class HTMLTranscription implements ITranscription {
* @param packageableElement
*/
@Override
- public void writesectionTitle(StringBuffer out, int level, Element packageableElement) {
- out.append("<H" + level + getId(packageableElement) + ">" + ((Package) packageableElement).getName() + "</H" + level + ">"); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$
+ public void writeSectionTitle(StringBuffer out, int level, Element packageableElement) {
+ out.append("<H" + level + getId(packageableElement) + ">" + ((Package) packageableElement).getName() + "</H" + level + ">"); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$
+ out.append(System.lineSeparator());
}
@@ -92,6 +114,7 @@ public class HTMLTranscription implements ITranscription {
out.append("<P align=\"middle\"><img src=" + packageableElement.getValue(imgRefStereotype, I_DocumentStereotype.IMAGEREF_REF_ATT) + " alt=" + ((Comment) packageableElement).getBody() + " ></P>"); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
out.append("<P align=\"middle\">" + ((Comment) packageableElement).getBody() + "</P>"); //$NON-NLS-1$ //$NON-NLS-2$
out.append("</BR>"); //$NON-NLS-1$
+ out.append(System.lineSeparator());
}
@@ -104,14 +127,15 @@ public class HTMLTranscription implements ITranscription {
@Override
public void writeParagraph(StringBuffer out, Element packageableElement) {
- out.append("<pre" + getId(packageableElement)+ ">" + ((Comment) packageableElement).getBody().replaceAll("\n", "<BR/>") + "</pre>"); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$
+ out.append("<pre" + getId(packageableElement) + ">" + ((Comment) packageableElement).getBody().replaceAll("\n", "<BR/>") + "</pre>"); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$
+ out.append(System.lineSeparator());
}
/**
* @return
*/
public String getId(Element packageableElement) {
- String packageableElementtFragment = ((XMIResource)packageableElement.eResource()).getID(packageableElement);
+ String packageableElementtFragment = ((XMIResource) packageableElement.eResource()).getID(packageableElement);
String id = " id =\"" + packageableElementtFragment + "\"";
return id;
}
@@ -135,11 +159,11 @@ public class HTMLTranscription implements ITranscription {
out.append("<caption style=\"caption-side: bottom;\">" + tableCaption + "</caption>");
writeBeginTRTag(out);
out.append("<th style=\"border: 1px solid black\">Id</th>");
- out.append("<th style=\"border: 1px solid black\">Satisfy by</th>");
- out.append("<th style=\"border: 1px solid black\">Verify by</th>");
+ out.append("<th style=\"border: 1px solid black\">Satisfied by</th>");
+ out.append("<th style=\"border: 1px solid black\">Verified by</th>");
writeEndTRTag(out);
}
-
+
/**
*
* @see org.eclipse.papyrus.uml.developper.mde.transcription.ITranscription#writeLine(java.lang.StringBuffer, java.lang.String, java.lang.String, java.lang.String)
@@ -149,14 +173,15 @@ public class HTMLTranscription implements ITranscription {
* @param referenceName
* @param text
*/
+ @Override
public void writeLine(StringBuffer out, String uri, String referenceName, String text) {
if (uri.equals("")) {
- out.append(text);
+ out.append(text);
} else {
- out.append("<a href=\"#" + uri + "\" title=\"" + referenceName + "\">" + text + "</a>");
- }
+ out.append("<a href=\"#" + uri + "\" title=\"" + referenceName + "\">" + text + "</a>");
+ }
}
-
+
/**
* @see org.eclipse.papyrus.uml.developper.mde.transcription.ITranscription#writeNewLine(java.lang.StringBuffer)
*
@@ -164,26 +189,28 @@ public class HTMLTranscription implements ITranscription {
*/
@Override
public void writeNewLine(StringBuffer out) {
- out.append("</BR>");
-
+ out.append("<BR/>");
+ out.append(System.lineSeparator());
}
-
+
/**
*
* @see org.eclipse.papyrus.uml.developper.mde.transcription.ITranscription#writeBeginTDTag(java.lang.StringBuffer)
*
* @param out
*/
+ @Override
public void writeBeginTDTag(StringBuffer out) {
out.append("<td style=\"border : 1px solid black\">");
}
-
+
/**
*
* @see org.eclipse.papyrus.uml.developper.mde.transcription.ITranscription#writeEndTDTag(java.lang.StringBuffer)
*
* @param out
*/
+ @Override
public void writeEndTDTag(StringBuffer out) {
out.append("</td>");
}
@@ -194,6 +221,7 @@ public class HTMLTranscription implements ITranscription {
*
* @param out
*/
+ @Override
public void writeBeginTRTag(StringBuffer out) {
out.append("<tr>");
}
@@ -204,8 +232,10 @@ public class HTMLTranscription implements ITranscription {
*
* @param out
*/
+ @Override
public void writeEndTRTag(StringBuffer out) {
out.append("</tr>");
+ out.append(System.lineSeparator());
}
@@ -217,29 +247,33 @@ public class HTMLTranscription implements ITranscription {
@Override
public void writeEndingTable(StringBuffer out) {
out.append("</table>");
+ out.append(System.lineSeparator());
}
-
+
/**
*
* @see org.eclipse.papyrus.uml.developper.mde.transcription.ITranscription#writeBeginParagraph(java.lang.StringBuffer)
*
* @param out
*/
+ @Override
public void writeBeginParagraph(StringBuffer out) {
out.append("<pre>");
}
-
+
/**
*
* @see org.eclipse.papyrus.uml.developper.mde.transcription.ITranscription#writeEndingParagraph(java.lang.StringBuffer)
*
* @param out
*/
+ @Override
public void writeEndingParagraph(StringBuffer out) {
out.append("</pre>");
+ out.append(System.lineSeparator());
}
-
-
+
+
/**
*
* @see org.eclipse.papyrus.uml.developper.mde.transcription.ITranscription#writeRefContent(java.lang.StringBuffer, java.lang.String, java.lang.String, java.lang.String)
@@ -249,12 +283,13 @@ public class HTMLTranscription implements ITranscription {
* @param requirementName
* @param reqID
*/
+ @Override
public void writeRefContent(StringBuffer out, String uri, String requirementName, String reqID) {
if (uri.equals("")) {
- out.append(reqID);
+ out.append(reqID);
} else {
- out.append("<a href=\"#" + uri + "\" title=\"" + requirementName + "\">" + reqID + "</a>");
- }
+ out.append("<a href=\"#" + uri + "\" title=\"" + requirementName + "\">" + reqID + "</a>");
+ }
}
@@ -268,7 +303,7 @@ public class HTMLTranscription implements ITranscription {
*/
@Override
public void writeTOCSection(StringBuffer out, String chapterName, String uri) {
- out.append("<a href=\"#" + uri + "\">" + chapterName + "</a>" );
+ out.append("<a href=\"#" + uri + "\">" + chapterName + "</a>");
}
@@ -283,7 +318,8 @@ public class HTMLTranscription implements ITranscription {
*/
@Override
public void writeTOCSubSection(StringBuffer out, String subSectionName, String uri) {
- out.append("<li><a href=\"#" + uri + "\"> " + subSectionName + "</a></li>");
+ out.append("<li><a href=\"#" + uri + "\"> " + subSectionName + "</a></li>");
+ out.append(System.lineSeparator());
}
@@ -306,6 +342,7 @@ public class HTMLTranscription implements ITranscription {
@Override
public void writeEndTOC(StringBuffer out) {
out.append("</ul>");
+ out.append(System.lineSeparator());
}
}
diff --git a/plugins/developer/org.eclipse.papyrus.uml.developer.mde/src/org/eclipse/papyrus/uml/developper/mde/transcription/ITranscription.java b/plugins/developer/org.eclipse.papyrus.uml.developer.mde/src/org/eclipse/papyrus/uml/developper/mde/transcription/ITranscription.java
index 5a377fd77db..1ed461f084f 100644
--- a/plugins/developer/org.eclipse.papyrus.uml.developer.mde/src/org/eclipse/papyrus/uml/developper/mde/transcription/ITranscription.java
+++ b/plugins/developer/org.eclipse.papyrus.uml.developer.mde/src/org/eclipse/papyrus/uml/developper/mde/transcription/ITranscription.java
@@ -1,5 +1,5 @@
/*****************************************************************************
- * Copyright (c) 2014 CEA LIST.
+ * Copyright (c) 2014, 2015 CEA LIST, Christian W. Damus, and others.
*
*
* All rights reserved. This program and the accompanying materials
@@ -9,14 +9,18 @@
*
* Contributors:
* Patrick Tessier (CEA LIST) Patrick.tessier@cea.fr - Initial API and implementation
+ * Christian W. Damus - bug 468079
*
*****************************************************************************/
package org.eclipse.papyrus.uml.developper.mde.transcription;
+import org.eclipse.papyrus.uml.developper.mde.LinkUtil;
import org.eclipse.uml2.uml.Element;
import org.eclipse.uml2.uml.Model;
import org.eclipse.uml2.uml.Stereotype;
+import com.google.common.base.Function;
+
/**
* This class is used to generated very swiftly a document from the document model
@@ -25,6 +29,13 @@ import org.eclipse.uml2.uml.Stereotype;
public interface ITranscription {
/**
+ * Obtains a function that generates the output format of an element hyperlink.
+ *
+ * @return
+ */
+ public abstract Function<? super LinkUtil.Hyperlink, String> getHyperlinkTranscoder();
+
+ /**
* finalize the document
*
* @param out
@@ -57,7 +68,7 @@ public interface ITranscription {
* @param packageableElement
* the package
*/
- public abstract void writesectionTitle(StringBuffer out, int level, Element packageableElement);
+ public abstract void writeSectionTitle(StringBuffer out, int level, Element packageableElement);
/**
* write a image
@@ -85,8 +96,8 @@ public interface ITranscription {
* @return the name of the document to generate
*/
public abstract String getNameFile();
-
-
+
+
/**
* write the beginning of the table (header, style)
*
@@ -94,21 +105,21 @@ public interface ITranscription {
* @param tableCaption
*/
public abstract void writeTable(StringBuffer out, String tableCaption);
-
+
/**
* write line in the table
*
* @param out
- * @param uri
- * represents the uri of the referent element
+ * @param uri
+ * represents the uri of the referent element
* @param referenceName
- * name of the referent element
+ * name of the referent element
* @param text
- * represents content of the line
+ * represents content of the line
*/
public abstract void writeLine(StringBuffer out, String uri, String referenceName, String text);
-
-
+
+
/**
*
* write the beginning of a line
@@ -116,95 +127,95 @@ public interface ITranscription {
* @param out
*/
public abstract void writeBeginTRTag(StringBuffer out);
-
+
/**
* write the ending of a line
*
* @param out
*/
public abstract void writeEndTRTag(StringBuffer out);
-
+
/**
* finalize the table
*
* @param out
*/
public abstract void writeEndingTable(StringBuffer out);
-
+
/**
* write the beginning of a column
*
* @param out
*/
public abstract void writeBeginTDTag(StringBuffer out);
-
+
/**
* write the ending of a column
*
* @param out
*/
public abstract void writeEndTDTag(StringBuffer out);
-
+
public abstract void writeBeginTOC(StringBuffer out);
-
+
public abstract void writeEndTOC(StringBuffer out);
-
-
+
+
/**
* write the requirements which aren't covered
*
* @param out
* @param uri
- * represents the uri of the Requirements Doc Element
+ * represents the uri of the Requirements Doc Element
* @param requirementName
- * the requirement name
+ * the requirement name
* @param reqID
- * id of the requirement
+ * id of the requirement
*/
public abstract void writeRefContent(StringBuffer out, String uri, String requirementName, String reqID);
-
+
/**
* write beginning of a paragraph
*
* @param out
*/
public abstract void writeBeginParagraph(StringBuffer out);
-
+
/**
* write ending of a paragraph
*
* @param out
*/
public abstract void writeEndingParagraph(StringBuffer out);
-
+
/**
* write section in table of contents
*
* @param out
* @param chapterName
- * represents the name of the section
+ * represents the name of the section
* @param uri
- * represents the uri of the Section Doc Element
+ * represents the uri of the Section Doc Element
*/
-
+
public abstract void writeTOCSection(StringBuffer out, String chapterName, String uri);
-
+
/**
*
* @param out
* @param subSectionName
- * represents the name of the sub section
+ * represents the name of the sub section
* @param uri
- * represents the uri of the sub section doc element
+ * represents the uri of the sub section doc element
*/
public abstract void writeTOCSubSection(StringBuffer out, String subSectionName, String uri);
-
+
/**
*
* @param out
*/
public abstract void writeNewLine(StringBuffer out);
-
-
+
+
}
diff --git a/plugins/developer/org.eclipse.papyrus.uml.developer.mde/src/org/eclipse/papyrus/uml/developper/mde/transcription/TranscriptionEngine.java b/plugins/developer/org.eclipse.papyrus.uml.developer.mde/src/org/eclipse/papyrus/uml/developper/mde/transcription/TranscriptionEngine.java
index a2956a3db0b..f33ffc3ee02 100644
--- a/plugins/developer/org.eclipse.papyrus.uml.developer.mde/src/org/eclipse/papyrus/uml/developper/mde/transcription/TranscriptionEngine.java
+++ b/plugins/developer/org.eclipse.papyrus.uml.developer.mde/src/org/eclipse/papyrus/uml/developper/mde/transcription/TranscriptionEngine.java
@@ -1,5 +1,5 @@
/*****************************************************************************
- * Copyright (c) 2014 CEA LIST.
+ * Copyright (c) 2014, 2015 CEA LIST, Christian W. Damus, and others.
*
*
* All rights reserved. This program and the accompanying materials
@@ -9,6 +9,7 @@
*
* Contributors:
* Patrick Tessier (CEA LIST) Patrick.tessier@cea.fr - Initial API and implementation
+ * Christian W. Damus - bug 468079
*
*****************************************************************************/
package org.eclipse.papyrus.uml.developper.mde.transcription;
@@ -24,6 +25,7 @@ import org.eclipse.core.runtime.CoreException;
import org.eclipse.core.runtime.NullProgressMonitor;
import org.eclipse.emf.ecore.xmi.XMIResource;
import org.eclipse.papyrus.uml.developper.mde.I_DocumentStereotype;
+import org.eclipse.papyrus.uml.developper.mde.LinkUtil;
import org.eclipse.papyrus.uml.developper.mde.handler.IDMAbstractHandler;
import org.eclipse.uml2.uml.Comment;
import org.eclipse.uml2.uml.Element;
@@ -134,9 +136,18 @@ public class TranscriptionEngine {
Element packageableElement = iteComment.next();
if (packageableElement.getAppliedStereotype(I_DocumentStereotype.CONTENT_STEREOTYPE) != null) {
if (((Comment) packageableElement).getBody() != null) {
+ // Mark position
+ final int offset = out.length();
+
transcription.writeParagraph(out, packageableElement);
if (packageableElement.getOwnedComments() != null) {
- writeRefContent(out, (Comment)packageableElement);
+ writeRefContent(out, (Comment) packageableElement);
+ }
+
+ // Expand in-line hyperlinks
+ String expanded = LinkUtil.transcodeHyperlinks(out, offset, out.length(), transcription.getHyperlinkTranscoder());
+ if (expanded != null) {
+ out.replace(offset, out.length(), expanded);
}
}
}
@@ -147,15 +158,15 @@ public class TranscriptionEngine {
}
}
if (packageableElement.getAppliedStereotype(I_DocumentStereotype.SECTION_STEREOTYPE) != null) {
- transcription.writesectionTitle(out, level, packageableElement);
- writeContent(out, ((Package) packageableElement), level + 1);
+ transcription.writeSectionTitle(out, level, packageableElement);
+ writeContent(out, ((Package) packageableElement), level + 1);
}
if (packageableElement.getAppliedStereotype(I_DocumentStereotype.TABLE_STEREOTYPE) != null) {
writeTable(out, packageableElement);
}
if (packageableElement.getAppliedStereotype(I_DocumentStereotype.TABLEOFCONTENT_STEREOTYPE) != null) {
- transcription.writesectionTitle(out, 2, packageableElement);
- writeTOC(out, (Package)packageableElement);
+ transcription.writeSectionTitle(out, 2, packageableElement);
+ writeTOC(out, (Package) packageableElement);
}
}
}
@@ -174,29 +185,29 @@ public class TranscriptionEngine {
Stereotype refContentStereotype = commentElement.getAppliedStereotype(I_DocumentStereotype.REF_CONTENT_STEREOTYPE);
if (refContentStereotype != null) {
Object ref = commentElement.getValue(refContentStereotype, I_DocumentStereotype.REF_CONTENT_REF_ATT);
-
+
/* Get the URI of the model element */
if (ref instanceof NamedElement) {
- Element referent = IDMAbstractHandler.elt2DocElt.get((NamedElement)ref);
+ Element referent = IDMAbstractHandler.getDocElement((NamedElement) ref);
if (referent != null) {
- String referentURI = ((XMIResource)referent.eResource()).getID(referent);
+ String referentURI = referent.eResource().getURIFragment(referent);
String body = commentElement.getBody();
-
+
/* Write the text */
- if (iteComment.hasNext()) {
+ if (iteComment.hasNext()) {
body = body + ", ";
}
- transcription.writeRefContent(out, referentURI, ((NamedElement)ref).getName(), body);
- }
+ transcription.writeRefContent(out, referentURI, ((NamedElement) ref).getName(), body);
+ }
}
}
}
}
/**
- * Retrieves the Table of Contents "Section" Package
+ * Retrieves the Table of Contents "Section" Package
* and iterates on it "Section" package.
- * For each, write it name and URI in the output file.
+ * For each, write it name and URI in the output file.
* Then, iterates on it child
*
* @param out
@@ -209,17 +220,17 @@ public class TranscriptionEngine {
if (sectionStereotype != null) {
transcription.writeBeginTOC(out);
Package chapter = (Package) cddPackageableElement;
- Package chapterDocElt = IDMAbstractHandler.Toc2DocElt.get(chapter);
- String URI = ((XMIResource)chapterDocElt.eResource()).getID(chapterDocElt);
+ Package chapterDocElt = IDMAbstractHandler.getDocPackageForTOC(chapter);
+ String URI = ((XMIResource) chapterDocElt.eResource()).getID(chapterDocElt);
transcription.writeTOCSection(out, chapter.getName(), URI);
- writeSubSectionTOC(out, chapter);
+ writeSubSectionTOC(out, chapter);
transcription.writeEndTOC(out);
}
}
}
/**
- * Retrieves the sub section of a "Section" package.
+ * Retrieves the sub section of a "Section" package.
* Then for each, writes it name and URI on the output file.
* It's a recursive method, so call it again with this package as argument.
*
@@ -231,9 +242,9 @@ public class TranscriptionEngine {
Element cddSubSection = elements.next();
Stereotype sectionStereotype = cddSubSection.getAppliedStereotype(I_DocumentStereotype.SECTION_STEREOTYPE);
if (sectionStereotype != null) {
- Package subSection = (Package)cddSubSection;
- Package subSectionDocElt = IDMAbstractHandler.Toc2DocElt.get(subSection);
- String URI = ((XMIResource)subSectionDocElt.eResource()).getID(subSectionDocElt);
+ Package subSection = (Package) cddSubSection;
+ Package subSectionDocElt = IDMAbstractHandler.getDocPackageForTOC(subSection);
+ String URI = ((XMIResource) subSectionDocElt.eResource()).getID(subSectionDocElt);
transcription.writeTOCSubSection(out, subSection.getName(), URI);
transcription.writeBeginTOC(out);
writeSubSectionTOC(out, subSection);
@@ -253,11 +264,11 @@ public class TranscriptionEngine {
* @param packageableElement
*/
public void writeTable(StringBuffer out, Element packageableElement) {
- Comment tableComment = (Comment)packageableElement;
+ Comment tableComment = (Comment) packageableElement;
Stereotype tableStereotype = tableComment.getAppliedStereotype(I_DocumentStereotype.TABLE_STEREOTYPE);
// Write the structure of the table and it head line
- String tableCaption = (String) ((Comment)packageableElement).getValue(tableStereotype, I_DocumentStereotype.TABLE_CAPTION_ATT);
+ String tableCaption = (String) ((Comment) packageableElement).getValue(tableStereotype, I_DocumentStereotype.TABLE_CAPTION_ATT);
transcription.writeTable(out, tableCaption);
// Iterates on table ownedComments
@@ -265,7 +276,7 @@ public class TranscriptionEngine {
Comment lineComment = cddLineComment.next();
if (lineComment.getAppliedStereotype(I_DocumentStereotype.LINE_STEREOTYPE) != null) {
transcription.writeBeginTRTag(out);
- // Iterates on line ownedComments
+ // Iterates on line ownedComments
for (Iterator<Comment> cddCellComment = lineComment.getOwnedComments().iterator(); cddCellComment.hasNext();) {
Comment cellComment = cddCellComment.next();
if (cellComment.getAppliedStereotype(I_DocumentStereotype.CELL_STEREOTYPE) != null) {
@@ -284,15 +295,15 @@ public class TranscriptionEngine {
String referentURI = "";
String referenceName = "";
Object ref = refContentComment.getValue(refContentStereotype, I_DocumentStereotype.REF_CONTENT_REF_ATT);
-
+
/* Get the URI of the model element */
if (ref instanceof NamedElement) {
NamedElement refElement = (NamedElement) ref;
referenceName = refElement.getName();
- Element referentElement = IDMAbstractHandler.elt2DocElt.get(refElement);
+ Element referentElement = IDMAbstractHandler.getDocElement(refElement);
if (referentElement != null) {
- referentURI = ((XMIResource)referentElement.eResource()).getID(referentElement);
- }
+ referentURI = ((XMIResource) referentElement.eResource()).getID(referentElement);
+ }
}
if (cellSize > 1 && cddRefContentComment.hasNext()) {
@@ -311,6 +322,6 @@ public class TranscriptionEngine {
transcription.writeEndTRTag(out);
}
}
- transcription.writeEndingTable(out);
+ transcription.writeEndingTable(out);
}
}
diff --git a/plugins/developer/org.eclipse.papyrus.uml.developer.mde/src/org/eclipse/papyrus/uml/developper/mde/transcription/WikiTranscription.java b/plugins/developer/org.eclipse.papyrus.uml.developer.mde/src/org/eclipse/papyrus/uml/developper/mde/transcription/WikiTranscription.java
index ded7c503632..15b7857dbb2 100644
--- a/plugins/developer/org.eclipse.papyrus.uml.developer.mde/src/org/eclipse/papyrus/uml/developper/mde/transcription/WikiTranscription.java
+++ b/plugins/developer/org.eclipse.papyrus.uml.developer.mde/src/org/eclipse/papyrus/uml/developper/mde/transcription/WikiTranscription.java
@@ -1,5 +1,5 @@
/*****************************************************************************
- * Copyright (c) 2014 CEA LIST.
+ * Copyright (c) 2014, 2015 CEA LIST, Christian W. Damus, and others.
*
*
* All rights reserved. This program and the accompanying materials
@@ -9,24 +9,41 @@
*
* Contributors:
* Patrick Tessier (CEA LIST) Patrick.tessier@cea.fr - Initial API and implementation
+ * Christian W. Damus - bug 468079
*
*****************************************************************************/
package org.eclipse.papyrus.uml.developper.mde.transcription;
import org.eclipse.emf.ecore.xmi.XMIResource;
import org.eclipse.papyrus.uml.developper.mde.I_DocumentStereotype;
+import org.eclipse.papyrus.uml.developper.mde.LinkUtil;
+import org.eclipse.papyrus.uml.developper.mde.LinkUtil.Hyperlink;
import org.eclipse.uml2.uml.Comment;
import org.eclipse.uml2.uml.Element;
import org.eclipse.uml2.uml.Model;
import org.eclipse.uml2.uml.Package;
import org.eclipse.uml2.uml.Stereotype;
+import com.google.common.base.Function;
+
/**
* this class is a specialization to generate mediawiki files.
*
*/
public class WikiTranscription implements ITranscription {
+ private final Function<LinkUtil.Hyperlink, String> hyperlinkFunction = new Function<LinkUtil.Hyperlink, String>() {
+ @Override
+ public String apply(Hyperlink input) {
+ return String.format("[[#%s|%s]]", input.href(), input.text());
+ }
+ };
+
+ @Override
+ public Function<? super Hyperlink, String> getHyperlinkTranscoder() {
+ return hyperlinkFunction;
+ }
+
/**
* @see org.eclipse.papyrus.uml.developper.mde.transcription.ITranscription#writeEndingDocument(java.lang.StringBuffer)
*
@@ -76,13 +93,16 @@ public class WikiTranscription implements ITranscription {
*/
@Override
- public void writesectionTitle(StringBuffer out, int level, Element packageableElement) {
+ public void writeSectionTitle(StringBuffer out, int level, Element packageableElement) {
if (level == 2) {
- out.append("\n==<span" + getId(packageableElement) + ">" + ((Package) packageableElement).getName() + "</span>==");} //$NON-NLS-1$ //$NON-NLS-2$
+ out.append("\n==<span" + getId(packageableElement) + ">" + ((Package) packageableElement).getName() + "</span>=="); //$NON-NLS-1$ //$NON-NLS-2$
+ }
if (level == 3) {
- out.append("\n===<span" + getId(packageableElement) + ">" + ((Package) packageableElement).getName() + "</span>===");} //$NON-NLS-1$ //$NON-NLS-2$
+ out.append("\n===<span" + getId(packageableElement) + ">" + ((Package) packageableElement).getName() + "</span>==="); //$NON-NLS-1$ //$NON-NLS-2$
+ }
if (level == 4) {
- out.append("\n====<span" + getId(packageableElement) + ">" + ((Package) packageableElement).getName() + "</span>====");} //$NON-NLS-1$ //$NON-NLS-2$
+ out.append("\n====<span" + getId(packageableElement) + ">" + ((Package) packageableElement).getName() + "</span>===="); //$NON-NLS-1$ //$NON-NLS-2$
+ }
}
@@ -110,7 +130,7 @@ public class WikiTranscription implements ITranscription {
@Override
public void writeParagraph(StringBuffer out, Element packageableElement) {
- out.append("\n<span" + getId(packageableElement)+ ">" + ((Comment) packageableElement).getBody() + "</span>"); //$NON-NLS-1$
+ out.append("\n<span" + getId(packageableElement) + ">" + ((Comment) packageableElement).getBody() + "</span>"); //$NON-NLS-1$
}
@@ -119,12 +139,12 @@ public class WikiTranscription implements ITranscription {
return "DeveloperDoc.mediawiki"; //$NON-NLS-1$
}
-
+
/**
* @return
*/
public String getId(Element packageableElement) {
- String packageableElementtFragment = ((XMIResource)packageableElement.eResource()).getID(packageableElement);
+ String packageableElementtFragment = ((XMIResource) packageableElement.eResource()).getID(packageableElement);
String id = " id=\"" + packageableElementtFragment + "\"";
return id;
}
@@ -140,8 +160,8 @@ public class WikiTranscription implements ITranscription {
public void writeTable(StringBuffer out, String tableCaption) {
out.append("\n{| border=\"1\" cellpadding=\"20\" cellspacing=\"0\"\n");
out.append("!ID\n");
- out.append("!Satisfy by\n");
- out.append("!Verify by");
+ out.append("!Satisfied by\n");
+ out.append("!Verified by");
}
@@ -155,13 +175,13 @@ public class WikiTranscription implements ITranscription {
@Override
public void writeLine(StringBuffer out, String uri, String requirementName, String text) {
if (uri.equals("")) {
- out.append(text);
+ out.append(text);
} else {
- out.append("[[#" + uri + "|" + text + "]]");
- }
-
+ out.append("[[#" + uri + "|" + text + "]]");
+ }
+
}
-
+
/**
* @see org.eclipse.papyrus.uml.developper.mde.transcription.ITranscription#writeNewLine(java.lang.StringBuffer)
*
@@ -170,7 +190,7 @@ public class WikiTranscription implements ITranscription {
@Override
public void writeNewLine(StringBuffer out) {
out.append("\n");
-
+
}
@@ -193,7 +213,7 @@ public class WikiTranscription implements ITranscription {
@Override
public void writeEndTRTag(StringBuffer out) {
// TODO Auto-generated method stub
-
+
}
@@ -227,7 +247,7 @@ public class WikiTranscription implements ITranscription {
@Override
public void writeEndTDTag(StringBuffer out) {
out.append("\n");
-
+
}
@@ -241,10 +261,10 @@ public class WikiTranscription implements ITranscription {
@Override
public void writeRefContent(StringBuffer out, String uri, String requirementName, String reqID) {
if (uri.equals("")) {
- out.append(reqID);
+ out.append(reqID);
} else {
- out.append("[[#" + uri + "|" + reqID + "]]");
- }
+ out.append("[[#" + uri + "|" + reqID + "]]");
+ }
}
@@ -256,7 +276,7 @@ public class WikiTranscription implements ITranscription {
@Override
public void writeBeginParagraph(StringBuffer out) {
out.append("\n<span>");
-
+
}
@@ -268,7 +288,7 @@ public class WikiTranscription implements ITranscription {
@Override
public void writeEndingParagraph(StringBuffer out) {
out.append("</span>\n");
-
+
}
@@ -297,7 +317,7 @@ public class WikiTranscription implements ITranscription {
*/
@Override
public void writeTOCSubSection(StringBuffer out, String subSectionName, String uri) {
- out.append("\n::[[#" + uri + "|" + subSectionName + "]]");
+ out.append("\n::[[#" + uri + "|" + subSectionName + "]]");
}
@@ -309,7 +329,7 @@ public class WikiTranscription implements ITranscription {
@Override
public void writeBeginTOC(StringBuffer out) {
// TODO Auto-generated method stub
-
+
}
@@ -321,7 +341,7 @@ public class WikiTranscription implements ITranscription {
@Override
public void writeEndTOC(StringBuffer out) {
// TODO Auto-generated method stub
-
+
}
diff --git a/plugins/infra/core/org.eclipse.papyrus.infra.core/src/org/eclipse/papyrus/infra/core/utils/TransactionPrecommitExecutor.java b/plugins/infra/core/org.eclipse.papyrus.infra.core/src/org/eclipse/papyrus/infra/core/utils/TransactionPrecommitExecutor.java
index 05d55bc153e..75df6652d6c 100644
--- a/plugins/infra/core/org.eclipse.papyrus.infra.core/src/org/eclipse/papyrus/infra/core/utils/TransactionPrecommitExecutor.java
+++ b/plugins/infra/core/org.eclipse.papyrus.infra.core/src/org/eclipse/papyrus/infra/core/utils/TransactionPrecommitExecutor.java
@@ -84,7 +84,18 @@ class TransactionPrecommitExecutor implements Executor, TransactionalEditingDoma
@Override
public void transactionStarted(TransactionalEditingDomainEvent event) {
- writeActive.set(!event.getTransaction().isReadOnly());
+ // We should only attempt to record triggers in a transaction that has triggers enabled.
+ // In particular, unprotected writes are in an otherwise read-only context and should be
+ // treated as such
+ final Transaction transaction = event.getTransaction();
+ writeActive.set(!transaction.isReadOnly() && hasTriggersEnabled(transaction));
+ }
+
+ private boolean hasTriggersEnabled(Transaction transaction) {
+ final Map<?, ?> options = transaction.getOptions();
+ return !Boolean.TRUE.equals(options.get(Transaction.OPTION_UNPROTECTED))
+ && !Boolean.TRUE.equals(options.get(Transaction.OPTION_NO_TRIGGERS))
+ && !Boolean.TRUE.equals(options.get(Transaction.OPTION_IS_UNDO_REDO_TRANSACTION));
}
@Override
diff --git a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.properties/src/org/eclipse/papyrus/infra/gmfdiag/css/properties/databinding/ModelStyleSheetObservableList.java b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.properties/src/org/eclipse/papyrus/infra/gmfdiag/css/properties/databinding/ModelStyleSheetObservableList.java
index 7594aad37ab..1b3a7028b62 100644
--- a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.properties/src/org/eclipse/papyrus/infra/gmfdiag/css/properties/databinding/ModelStyleSheetObservableList.java
+++ b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.properties/src/org/eclipse/papyrus/infra/gmfdiag/css/properties/databinding/ModelStyleSheetObservableList.java
@@ -7,7 +7,7 @@
* http://www.eclipse.org/legal/epl-v10.html
*
* Contributors:
- * Mickal Adam (ALL4TEC) mickael.adam@all4tec.net - Initial API and implementation
+ * Micka�l Adam (ALL4TEC) mickael.adam@all4tec.net - Initial API and implementation
*
*****************************************************************************/
package org.eclipse.papyrus.infra.gmfdiag.css.properties.databinding;
@@ -16,17 +16,21 @@ import java.util.Collection;
import java.util.List;
import org.eclipse.core.databinding.observable.IChangeListener;
+import org.eclipse.emf.common.command.AbstractCommand;
import org.eclipse.emf.common.command.Command;
import org.eclipse.emf.common.command.CompoundCommand;
import org.eclipse.emf.common.util.EList;
import org.eclipse.emf.ecore.EObject;
import org.eclipse.emf.ecore.EStructuralFeature;
import org.eclipse.emf.ecore.resource.Resource;
-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.EObjectListValueStyle;
import org.eclipse.papyrus.infra.emf.databinding.EMFObservableList;
+import org.eclipse.papyrus.infra.gmfdiag.css.engine.ExtendedCSSEngine;
+import org.eclipse.papyrus.infra.gmfdiag.css.engine.ModelCSSEngine;
import org.eclipse.papyrus.infra.gmfdiag.css.notation.CSSDiagram;
+import org.eclipse.papyrus.infra.gmfdiag.css.resource.CSSNotationResource;
import org.eclipse.papyrus.infra.gmfdiag.css.stylesheets.ModelStyleSheets;
@@ -43,7 +47,7 @@ public class ModelStyleSheetObservableList extends EMFObservableList implements
private Resource notationResource;
/** The domain. */
- private EditingDomain domain;
+ private TransactionalEditingDomain domain;
/** The listener. */
private CustomModelStyleSheetListener listener;
@@ -62,7 +66,7 @@ public class ModelStyleSheetObservableList extends EMFObservableList implements
* @param feature
* the feature
*/
- public ModelStyleSheetObservableList(Resource notationResource, List<?> wrappedList, EditingDomain domain, EObject source, EStructuralFeature feature) {
+ public ModelStyleSheetObservableList(Resource notationResource, List<?> wrappedList, TransactionalEditingDomain domain, EObject source, EStructuralFeature feature) {
super(wrappedList, domain, source, feature);
this.notationResource = notationResource;
this.domain = domain;
@@ -81,8 +85,69 @@ public class ModelStyleSheetObservableList extends EMFObservableList implements
@Override
public Command getAddAllCommand(Collection<?> values) {
CompoundCommand compoundCommand = new CompoundCommand();
+
+ if (source.eResource() == null) {
+ compoundCommand.append(new RecordingCommand(domain, "Create ModelStylesheet") {
+ /**
+ * @see org.eclipse.emf.transaction.RecordingCommand#doExecute()
+ *
+ */
+ @Override
+ protected void doExecute() {
+ notationResource.getContents().add(source);
+ }
+
+ });
+
+ compoundCommand.append(new AbstractCommand("Initialize ModelCSSEngine Adapter") {
+
+ public void redo() {
+ execute();
+ }
+
+ public void execute() {
+ ExtendedCSSEngine engine = CSSNotationResource.getEngine(notationResource);
+ if (engine instanceof ModelCSSEngine) {
+ ((ModelCSSEngine) engine).initAdapter();
+ }
+ }
+
+ /**
+ * @see org.eclipse.emf.common.command.AbstractCommand#canUndo()
+ *
+ * @return
+ */
+ @Override
+ public boolean canUndo() {
+ return true;
+ }
+
+ /**
+ * @see org.eclipse.emf.common.command.AbstractCommand#undo()
+ *
+ */
+ @Override
+ public void undo() {
+ ExtendedCSSEngine engine = CSSNotationResource.getEngine(notationResource);
+ if (engine instanceof ModelCSSEngine) {
+ ((ModelCSSEngine) engine).disposeAdapter();
+ }
+ }
+
+ /**
+ * @see org.eclipse.emf.common.command.AbstractCommand#prepare()
+ *
+ * @return
+ */
+ @Override
+ protected boolean prepare() {
+ return true;
+ }
+ });
+ }
+
compoundCommand.append(super.getAddAllCommand(values));
- compoundCommand.append(new AddAllModelStyleSheetCommand((TransactionalEditingDomain) domain, notationResource, values));
+ compoundCommand.append(new AddAllModelStyleSheetCommand(domain, notationResource, values));
return compoundCommand;
}
@@ -111,8 +176,8 @@ public class ModelStyleSheetObservableList extends EMFObservableList implements
for (Object styleSheetReference : ((EObjectListValueStyle) objectFromDiagram).getEObjectListValue()) {
// If the current style sheet to delete from model exist on a diagram, add it on the root
if (value == styleSheetReference) {
- compoundCommand.append(new RemoveObjectCommand((TransactionalEditingDomain) domain, (EObject) styleSheetReference));
- compoundCommand.append(new AddModelStyleSheetCommand((TransactionalEditingDomain) domain, notationResource, (EObject) styleSheetReference));
+ compoundCommand.append(new RemoveObjectCommand(domain, (EObject) styleSheetReference));
+ compoundCommand.append(new AddModelStyleSheetCommand(domain, notationResource, (EObject) styleSheetReference));
}
}
}
@@ -132,7 +197,7 @@ public class ModelStyleSheetObservableList extends EMFObservableList implements
*/
@Override
public Command getRemoveAllCommand(Collection<?> values) {
- return new RemoveAllModelStyleSheetValueCommand((TransactionalEditingDomain) domain, notationResource, values);
+ return new RemoveAllModelStyleSheetValueCommand(domain, notationResource, values);
}
/**
diff --git a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.properties/src/org/eclipse/papyrus/infra/gmfdiag/css/properties/modelelement/CSSModelElement.java b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.properties/src/org/eclipse/papyrus/infra/gmfdiag/css/properties/modelelement/CSSModelElement.java
index df00838d2fb..7c59a7a3920 100644
--- a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.properties/src/org/eclipse/papyrus/infra/gmfdiag/css/properties/modelelement/CSSModelElement.java
+++ b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.properties/src/org/eclipse/papyrus/infra/gmfdiag/css/properties/modelelement/CSSModelElement.java
@@ -17,21 +17,18 @@ import org.eclipse.emf.ecore.EObject;
import org.eclipse.emf.ecore.resource.Resource;
import org.eclipse.emf.ecore.util.EcoreUtil;
import org.eclipse.emf.edit.domain.EditingDomain;
+import org.eclipse.emf.transaction.TransactionalEditingDomain;
import org.eclipse.gmf.runtime.notation.Diagram;
import org.eclipse.gmf.runtime.notation.View;
import org.eclipse.jface.viewers.ILabelProvider;
-import org.eclipse.papyrus.infra.gmfdiag.css.engine.ExtendedCSSEngine;
-import org.eclipse.papyrus.infra.gmfdiag.css.engine.ModelCSSEngine;
import org.eclipse.papyrus.infra.gmfdiag.css.notation.CSSDiagram;
import org.eclipse.papyrus.infra.gmfdiag.css.notation.CSSStyles;
-import org.eclipse.papyrus.infra.gmfdiag.css.properties.Activator;
import org.eclipse.papyrus.infra.gmfdiag.css.properties.creation.StyleSheetFactory;
import org.eclipse.papyrus.infra.gmfdiag.css.properties.databinding.DiagramStyleSheetObservableList;
import org.eclipse.papyrus.infra.gmfdiag.css.properties.databinding.ModelStyleSheetObservableList;
import org.eclipse.papyrus.infra.gmfdiag.css.properties.provider.CSSStyleSheetContentProvider;
import org.eclipse.papyrus.infra.gmfdiag.css.properties.provider.CSSStyleSheetLabelProvider;
import org.eclipse.papyrus.infra.gmfdiag.css.provider.CSSClassContentProvider;
-import org.eclipse.papyrus.infra.gmfdiag.css.resource.CSSNotationResource;
import org.eclipse.papyrus.infra.gmfdiag.css.stylesheets.ModelStyleSheets;
import org.eclipse.papyrus.infra.gmfdiag.css.stylesheets.StylesheetsFactory;
import org.eclipse.papyrus.infra.gmfdiag.css.stylesheets.StylesheetsPackage;
@@ -70,7 +67,7 @@ public class CSSModelElement extends CustomStyleModelElement {
@Override
public IObservable doGetObservable(String propertyPath) {
if (CSSStyles.CSS_DIAGRAM_STYLESHEETS_KEY.equals(propertyPath)) {
- if (source instanceof View){
+ if (source instanceof View) {
return new DiagramStyleSheetObservableList((View) source, domain, propertyPath);
}
}
@@ -85,28 +82,8 @@ public class CSSModelElement extends CustomStyleModelElement {
// The model styleSheet
final ModelStyleSheets modelStyleSheetsSource = modelStyleSheetObject instanceof ModelStyleSheets ? (ModelStyleSheets) modelStyleSheetObject : StylesheetsFactory.eINSTANCE.createModelStyleSheets();
// If the modelStylesheet doesn't exist
- if (!(modelStyleSheetObject instanceof ModelStyleSheets)) {
- try {
- org.eclipse.papyrus.infra.core.sasheditor.di.contentprovider.utils.TransactionHelper.run(domain, new Runnable() {
- public void run() {
- // Add modelStylesheet to the resource without command
- notationResource.getContents().add(modelStyleSheetsSource);
- }
- });
- } catch (Exception e) {
- Activator.log.error(e);
- }
- // Initialize the adapter of the engine to listen model styleSheet
- if (notationResource instanceof CSSNotationResource ){
- ExtendedCSSEngine engine = ((CSSNotationResource) notationResource).getModelEngine();
-
- if (engine instanceof ModelCSSEngine) {
- ((ModelCSSEngine) engine).initAdapter();
- }
- }
- }
- return new ModelStyleSheetObservableList(notationResource, modelStyleSheetsSource.getStylesheets(), domain, modelStyleSheetsSource, StylesheetsPackage.Literals.MODEL_STYLE_SHEETS__STYLESHEETS);
+ return new ModelStyleSheetObservableList(notationResource, modelStyleSheetsSource.getStylesheets(), (TransactionalEditingDomain) domain, modelStyleSheetsSource, StylesheetsPackage.Literals.MODEL_STYLE_SHEETS__STYLESHEETS);
}
return super.doGetObservable(propertyPath);
}
diff --git a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css/src/org/eclipse/papyrus/infra/gmfdiag/css/dom/GMFElementAdapter.java b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css/src/org/eclipse/papyrus/infra/gmfdiag/css/dom/GMFElementAdapter.java
index e794b18a870..57d55f86b4a 100644
--- a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css/src/org/eclipse/papyrus/infra/gmfdiag/css/dom/GMFElementAdapter.java
+++ b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css/src/org/eclipse/papyrus/infra/gmfdiag/css/dom/GMFElementAdapter.java
@@ -66,7 +66,12 @@ import org.w3c.dom.NodeList;
public class GMFElementAdapter extends ElementAdapter implements NodeList, IChangeListener, StatefulView, IAdaptable {
/**
- *
+ * Non-null, non-empty string, to match "any non-null value" in attribute selectors (e.g. [type])
+ */
+ public static final String EMPTY_VALUE = " "; // Non-null, non-empty string
+
+ /**
+ *
*/
protected static final String KIND = "kind"; //$NON-NLS-1$
@@ -219,7 +224,7 @@ public class GMFElementAdapter extends ElementAdapter implements NodeList, IChan
/**
* I provide adapters for
- *
+ *
* <ul>
* <li>{@link Diagram} - the diagram containing my {@linkplain #getNotationElement() notation element}</li>
* </ul>
@@ -473,7 +478,8 @@ public class GMFElementAdapter extends ElementAdapter implements NodeList, IChan
}
if (feature instanceof EReference && value instanceof ENamedElement) {
- return ((ENamedElement) value).getName();
+ String name = ((ENamedElement) value).getName();
+ return name == null || name.isEmpty() ? EMPTY_VALUE : name; // Bug 467716: Never return null if the value is not null
}
// Standard case. For EObject values, it might be better to return null than a random label...
@@ -546,20 +552,20 @@ public class GMFElementAdapter extends ElementAdapter implements NodeList, IChan
/*
* <--------------------
- *
+ *
* //Allows both notations Class > Property and Class > Compartment > Property
- *
+ *
* //FIXME: The Tree is computed through "getParentNode". "getChildren" is barely used. Moreover,
* //there is a mapping between Notation element and DOM element, which makes it impossible to associate the same
* //notation element to different DOM elements.
- *
+ *
* // for(EObject child : notationElement.eContents()) {
* // if(child instanceof BasicCompartment) {
* // //Add the Compartment's children to this' children
* // childList.addAll(Arrays.asList(computeChildren((View)child, engine)));
* // }
* // }
- *
+ *
* -------------------->
*/
@@ -722,7 +728,7 @@ public class GMFElementAdapter extends ElementAdapter implements NodeList, IChan
/*
* (non-Javadoc)
- *
+ *
* @see org.eclipse.papyrus.infra.gmfdiag.css.notation.StatefulView#addStates(java.util.Set)
*/
@Override
@@ -735,7 +741,7 @@ public class GMFElementAdapter extends ElementAdapter implements NodeList, IChan
/*
* (non-Javadoc)
- *
+ *
* @see org.eclipse.papyrus.infra.gmfdiag.css.notation.StatefulView#removeStates(java.util.Set)
*/
@Override
diff --git a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css/src/org/eclipse/papyrus/infra/gmfdiag/css/engine/ModelCSSEngine.java b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css/src/org/eclipse/papyrus/infra/gmfdiag/css/engine/ModelCSSEngine.java
index 2958bd4cc07..89a6695c0c6 100644
--- a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css/src/org/eclipse/papyrus/infra/gmfdiag/css/engine/ModelCSSEngine.java
+++ b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css/src/org/eclipse/papyrus/infra/gmfdiag/css/engine/ModelCSSEngine.java
@@ -86,6 +86,21 @@ public class ModelCSSEngine extends ExtendedCSSEngineImpl {
}
}
+ /**
+ * Disposes the adapter attached to model styleSheet.
+ *
+ */
+ public void disposeAdapter() {
+ for (EObject eObject : model.getContents()) {
+ if (eObject instanceof ModelStyleSheets) {
+ ModelStyleSheets styleSheets = (ModelStyleSheets) eObject;
+ styleSheets.eAdapters().remove(adapter);
+ for (StyleSheet styleSheet : styleSheets.getStylesheets()) {
+ styleSheet.eAdapters().remove(adapter);
+ }
+ }
+ }
+ }
private static ExtendedCSSEngine getParentCSSEngine(Resource resource) {
ExtendedCSSEngine result;
diff --git a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css3.xtext/.launch/Generate Language Infrastructure (org.eclipse.papyrus.infra.gmfdiag.css3.xtext).launch b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css3.xtext/.launch/Generate Language Infrastructure (org.eclipse.papyrus.infra.gmfdiag.css3.xtext).launch
index cbaa7fa655c..5b82a779f81 100644
--- a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css3.xtext/.launch/Generate Language Infrastructure (org.eclipse.papyrus.infra.gmfdiag.css3.xtext).launch
+++ b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css3.xtext/.launch/Generate Language Infrastructure (org.eclipse.papyrus.infra.gmfdiag.css3.xtext).launch
@@ -7,10 +7,6 @@
<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_TYPES">
<listEntry value="4"/>
</listAttribute>
-<listAttribute key="org.eclipse.debug.ui.favoriteGroups">
-<listEntry value="org.eclipse.debug.ui.launchGroup.debug"/>
-<listEntry value="org.eclipse.debug.ui.launchGroup.run"/>
-</listAttribute>
<stringAttribute key="org.eclipse.jdt.launching.MAIN_TYPE" value="org.eclipse.emf.mwe2.launch.runtime.Mwe2Launcher"/>
<stringAttribute key="org.eclipse.jdt.launching.PROGRAM_ARGUMENTS" value="src/org/eclipse/papyrus/infra/gmfdiag/css3/GenerateCSS.mwe2"/>
<stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="org.eclipse.papyrus.infra.gmfdiag.css3.xtext"/>
diff --git a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css3.xtext/.launch/Launch Runtime Eclipse.launch b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css3.xtext/.launch/Launch Runtime Eclipse.launch
index ade8fbbce35..f64617deb4f 100644
--- a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css3.xtext/.launch/Launch Runtime Eclipse.launch
+++ b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css3.xtext/.launch/Launch Runtime Eclipse.launch
@@ -1,34 +1,30 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<launchConfiguration type="org.eclipse.pde.ui.RuntimeWorkbench">
-<booleanAttribute key="append.args" value="true"/>
-<booleanAttribute key="askclear" value="true"/>
-<booleanAttribute key="automaticAdd" value="true"/>
-<booleanAttribute key="automaticValidate" value="false"/>
-<stringAttribute key="bad_container_name" value="/org.eclipse.papyrus.infra.gmfdiag.css3.xtext/.launch/"/>
-<stringAttribute key="bootstrap" value=""/>
-<stringAttribute key="checked" value="[NONE]"/>
-<booleanAttribute key="clearConfig" value="false"/>
-<booleanAttribute key="clearws" value="false"/>
-<booleanAttribute key="clearwslog" value="false"/>
-<stringAttribute key="configLocation" value="${workspace_loc}/.metadata/.plugins/org.eclipse.pde.core/Launch Runtime Eclipse"/>
-<booleanAttribute key="default" value="true"/>
-<booleanAttribute key="includeOptional" value="true"/>
-<stringAttribute key="location" value="${workspace_loc}/../runtime-EclipseXtext"/>
-<listAttribute key="org.eclipse.debug.ui.favoriteGroups">
-<listEntry value="org.eclipse.debug.ui.launchGroup.debug"/>
-<listEntry value="org.eclipse.debug.ui.launchGroup.run"/>
-</listAttribute>
-<stringAttribute key="org.eclipse.jdt.launching.JRE_CONTAINER" value="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>
-<stringAttribute key="org.eclipse.jdt.launching.PROGRAM_ARGUMENTS" value="-os ${target.os} -ws ${target.ws} -arch ${target.arch} -nl ${target.nl}"/>
-<stringAttribute key="org.eclipse.jdt.launching.SOURCE_PATH_PROVIDER" value="org.eclipse.pde.ui.workbenchClasspathProvider"/>
-<stringAttribute key="org.eclipse.jdt.launching.VM_ARGUMENTS" value="-Xms40m -Xmx512m -XX:MaxPermSize=256m"/>
-<stringAttribute key="pde.version" value="3.3"/>
-<stringAttribute key="product" value="org.eclipse.platform.ide"/>
-<booleanAttribute key="show_selected_only" value="false"/>
-<stringAttribute key="templateConfig" value="${target_home}/configuration/config.ini"/>
-<booleanAttribute key="tracing" value="false"/>
-<booleanAttribute key="useDefaultConfig" value="true"/>
-<booleanAttribute key="useDefaultConfigArea" value="true"/>
-<booleanAttribute key="useProduct" value="true"/>
-<booleanAttribute key="usefeatures" value="false"/>
-</launchConfiguration>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<launchConfiguration type="org.eclipse.pde.ui.RuntimeWorkbench">
+<booleanAttribute key="append.args" value="true"/>
+<booleanAttribute key="askclear" value="true"/>
+<booleanAttribute key="automaticAdd" value="true"/>
+<booleanAttribute key="automaticValidate" value="false"/>
+<stringAttribute key="bad_container_name" value="/org.eclipse.papyrus.infra.gmfdiag.css3.xtext/.launch/"/>
+<stringAttribute key="bootstrap" value=""/>
+<stringAttribute key="checked" value="[NONE]"/>
+<booleanAttribute key="clearConfig" value="false"/>
+<booleanAttribute key="clearws" value="false"/>
+<booleanAttribute key="clearwslog" value="false"/>
+<stringAttribute key="configLocation" value="${workspace_loc}/.metadata/.plugins/org.eclipse.pde.core/Launch Runtime Eclipse"/>
+<booleanAttribute key="default" value="true"/>
+<booleanAttribute key="includeOptional" value="true"/>
+<stringAttribute key="location" value="${workspace_loc}/../runtime-EclipseXtext"/>
+<stringAttribute key="org.eclipse.jdt.launching.JRE_CONTAINER" value="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>
+<stringAttribute key="org.eclipse.jdt.launching.PROGRAM_ARGUMENTS" value="-os ${target.os} -ws ${target.ws} -arch ${target.arch} -nl ${target.nl}"/>
+<stringAttribute key="org.eclipse.jdt.launching.SOURCE_PATH_PROVIDER" value="org.eclipse.pde.ui.workbenchClasspathProvider"/>
+<stringAttribute key="org.eclipse.jdt.launching.VM_ARGUMENTS" value="-Xms40m -Xmx512m -XX:MaxPermSize=256m"/>
+<stringAttribute key="pde.version" value="3.3"/>
+<stringAttribute key="product" value="org.eclipse.platform.ide"/>
+<booleanAttribute key="show_selected_only" value="false"/>
+<stringAttribute key="templateConfig" value="${target_home}/configuration/config.ini"/>
+<booleanAttribute key="tracing" value="false"/>
+<booleanAttribute key="useDefaultConfig" value="true"/>
+<booleanAttribute key="useDefaultConfigArea" value="true"/>
+<booleanAttribute key="useProduct" value="true"/>
+<booleanAttribute key="usefeatures" value="false"/>
+</launchConfiguration>
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.canonical/DeveloperDoc.html b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.canonical/DeveloperDoc.html
deleted file mode 100644
index c2d6193d083..00000000000
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.canonical/DeveloperDoc.html
+++ /dev/null
@@ -1 +0,0 @@
-<html><link rel="stylesheet" href="default.css" type="text/css"><H1>Synchronize automatically between views element with related model element in the model</H1><P>The goal is to enable a strong synchronization between visual elements displayed in the diagram with elements contained in the model. <BR/>This mechanism can be added locally for each element by using CSS. <BR/>For example, you would like to see: <BR/>- synchronize compartment of enumeration literal for all enumeration. <BR/>- synchronize compartment of attributes and operation for all class stereotyped . <BR/>This fucntionality is associated to the task 433206. <BR/></P><H2>Requirements</H2><P>- LocalSynchronization (id=Req001): <BR/> The synchronization shall be local for each graphical element for example: package compartment, attribute compartment...</P><P>- CSSIntegration (id=Req002): <BR/> The synchronization shall be parameterized by CSS, by using a keyword and a value.</P><P>- CustomSynchronization (id=Req003): <BR/> For an graphical element, it shall be possible to custom the synchonization</P><H2>Use Cases</H2><P align="middle"><img src=C:/git/org.eclipse.papyrus/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.synchronizeview/imgDOC/UseCaseDiagram.png alt=UseCaseDiagram ></P><P align="middle">UseCaseDiagram</P><H3>Add an element in the model</H3><P>When an user adds an element in the model, the synchronization mechanism try to add in the current diagram the view that correspond to the semantic element <BR/>The difficulty of this mechanism is to parameter the synchronization. <BR/>By default, the synchronizatiopn is based on ' owned element'role. When you add an element, the graphical element that correponds to the owner try to display it in the diagram. <BR/>But some cases are not interesting. For example in the composite diagram, displaying parts in part correspond to part of the type, not directly part of part.</P><H3>Move an element</H3><P>When a element is moved, the synchronization mechanism must to create graphically the element to each diagram. <BR/></P><H3>Set synchronization enable</H3><P>The user can set enable the synchronization for a set of graphical elements. <BR/></P><H3>Remove an element from the model</H3><P>When the element is removed, the corresponding graphical element must be removed.</P><H2>Design</H2><P align="middle"><img src=C:/git/org.eclipse.papyrus/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.synchronizeview/imgDOC/ArchitectureOverview.png alt=ArchitectureOverview ></P><P align="middle">ArchitectureOverview</P><P>The desing consists into one plugin org.eclipse.papyrus.uml.diagram.synchronizeview. <BR/>I contains a editpolicy provider and an extension point</P><P align="middle"><img src=C:/git/org.eclipse.papyrus/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.synchronizeview/imgDOC/Structure.png alt=Structure ></P><P align="middle">Structure</P><P>The edit policy SynchronizeViewEdipolicty is installed by the SynchronizeEditPolicyProvider on: <BR/> - DiagramEditPart (to synchronize content of diagram) <BR/> - CompartmentEditPart (to synchronize content of compartment) <BR/> - IBorderedShapeEditPart (to synchronize content of borderedElement as port....) <BR/> <BR/>ThisEditPolicy is used to allowing synchronization between graphical element and element in the model <BR/> It is based on canonical editpolicy but it has several differencies: <BR/> - View Service cannot be called. To call it we need to get the identifier of the child that could be place in compartment. I is not possible to find in a generic way <BR/> --> link to each Diagram Updater, and moreover some child has been created by custom code. In fact, the hierarchy of visual element must follow the hierachy of semantic element. <BR/> --> this is not the case so the Diagram updater generated from the gmfgen has not the good info. <BR/> <BR/>So to an extension point has been added to let the developer to specify semantic element that play children of a given editpart: <BR/> see the example: <BR/><extension <BR/> point="org.eclipse.papyrus.uml.diagram.synchronizeview.semanticchild"> <BR/> <semanticChild <BR/> editPart="org.eclipse.papyrus.uml.diagram.composite.edit.parts.PropertyPartCompartmentEditPartCN" <BR/> getSemanticChildren="org.eclipse.papyrus.uml.diagram.composite.SynchroSemanticForPopertyPartCompartment"> <BR/> </semanticChild> <BR/></extension <BR/> <BR/>The editpolicy try to refresh visual element. To do that it calls the method getSemanticChildrenList(). I llokf for accoss the extesnison point the corresponding 'SemantiChild' with the highest priority. <BR/>This object give the list of sementic element that could be children of the context of the given editpart. <BR/> <BR/>In the context of part, in the composite diagram, we can describe that children are ownedlement of the type of the part. <BR/> <BR/>Finally to allow the creation we base our work on the mechanism of the drop. (refreshSemanticChildrenByDrop)</P><P>In order to install synchronization on element, views must have canonical style. So a migration is needed. <BR/>BasicCompartment becomes Compartment <BR/>Diagram and Shape mst have a style: so we need to add : <BR/> CanonicalStyle canonicalStyle=(CanonicalStyle)diagram.createStyle(NotationPackage.eINSTANCE.getCanonicalStyle()); <BR/> canonicalStyle.setCanonical(false);</P></html> \ No newline at end of file
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.canonical/doc/DeveloperDoc.html b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.canonical/doc/DeveloperDoc.html
new file mode 100644
index 00000000000..b197f178d08
--- /dev/null
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.canonical/doc/DeveloperDoc.html
@@ -0,0 +1,92 @@
+<html>
+<link rel="stylesheet" href="default.css" type="text/css">
+<H1>Canonical Diagram Views</H1>
+<pre id ="_xz8WAAPBEeW8nIkIujhtCA">The goal is to enable a strong synchronization between visual elements displayed in the diagram with elements contained in the model. <BR/>This mechanism can be added locally for each element by using CSS. <BR/>For example, you would like to see: <BR/>- synchronize compartment of enumeration literal for all enumeration. <BR/>- synchronize compartment of attributes and operation for all class stereotyped …. <BR/>This functionality is associated to the task 433206. <BR/></pre>
+<H2 id ="_xz9kIQPBEeW8nIkIujhtCA">Table of Contents</H2>
+<ul><a href="#_xz_ZUAPBEeW8nIkIujhtCA">Requirements</a></ul>
+<ul><a href="#_x0E44APBEeW8nIkIujhtCA">Use Cases</a><li><a href="#_x0yDgQPBEeW8nIkIujhtCA"> Synchronization</a></li>
+<ul><li><a href="#_x0zRoQPBEeW8nIkIujhtCA"> Add an element in the model</a></li>
+<ul></ul>
+<li><a href="#_x02U8QPBEeW8nIkIujhtCA"> Move an element</a></li>
+<ul></ul>
+<li><a href="#_x05YQAPBEeW8nIkIujhtCA"> Set synchronization enable</a></li>
+<ul></ul>
+<li><a href="#_x08bkQPBEeW8nIkIujhtCA"> Remove an element from the model</a></li>
+<ul></ul>
+</ul>
+</ul>
+<ul><a href="#_x0_e4QPBEeW8nIkIujhtCA">Design</a><li><a href="#_x363EQPBEeW8nIkIujhtCA"> Plugin org.eclipse.papyrus.infra.gmfdiag.canonical</a></li>
+<ul></ul>
+<li><a href="#_x38FMQPBEeW8nIkIujhtCA"> Plugin org.eclipse.ui</a></li>
+<ul></ul>
+<li><a href="#_x39TUAPBEeW8nIkIujhtCA"> Plugin org.eclipse.core.runtime</a></li>
+<ul></ul>
+<li><a href="#_x396YQPBEeW8nIkIujhtCA"> Plugin org.eclipse.emf.common</a></li>
+<ul></ul>
+<li><a href="#_x3_IgQPBEeW8nIkIujhtCA"> Plugin org.eclipse.emf.ecore</a></li>
+<ul></ul>
+<li><a href="#_x3_vkQPBEeW8nIkIujhtCA"> Plugin org.eclipse.gef</a></li>
+<ul></ul>
+<li><a href="#_x4A9sQPBEeW8nIkIujhtCA"> Plugin org.eclipse.gmf.runtime.diagram.ui</a></li>
+<ul></ul>
+<li><a href="#_x4BkwQPBEeW8nIkIujhtCA"> Plugin org.eclipse.uml2.uml</a></li>
+<ul></ul>
+<li><a href="#_x4Cy4QPBEeW8nIkIujhtCA"> Plugin org.eclipse.papyrus.infra.core</a></li>
+<ul></ul>
+<li><a href="#_x4EBAAPBEeW8nIkIujhtCA"> Plugin org.eclipse.papyrus.infra.gmfdiag.common</a></li>
+<ul></ul>
+<li><a href="#_x4EoEQPBEeW8nIkIujhtCA"> Plugin org.eclipse.gmf.tooling.runtime</a></li>
+<ul></ul>
+<li><a href="#_x4F2MAPBEeW8nIkIujhtCA"> Plugin org.eclipse.papyrus.infra.core.log</a></li>
+<ul></ul>
+</ul>
+<ul><a href="#_x4GdQQPBEeW8nIkIujhtCA">Tests</a></ul>
+<ul><a href="#_x4HrYAPBEeW8nIkIujhtCA">Requirements Coverage</a></ul>
+<H2 id ="_xz_ZUAPBEeW8nIkIujhtCA">Requirements</H2>
+<pre id ="_x0AncQPBEeW8nIkIujhtCA">- LocalSynchronization (id=Req001): <BR/> The synchronization shall be local for each graphical element for example: package compartment, attribute compartment...</pre>
+<pre id ="_x0B1kQPBEeW8nIkIujhtCA">- CSSIntegration (id=Req002): <BR/> The synchronization shall be parameterized by CSS, by using a keyword and a value.</pre>
+<pre id ="_x0DDsQPBEeW8nIkIujhtCA">- CustomSynchronization (id=Req003): <BR/> For an graphical element, it shall be possible to custom the synchonization</pre>
+<H2 id ="_x0E44APBEeW8nIkIujhtCA">Use Cases</H2>
+<P align="middle"><img src=/Users/damus/git/Papyrus/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.canonical/doc/imgDOC/UseCaseDiagram.png alt=UseCaseDiagram ></P><P align="middle">UseCaseDiagram</P></BR>
+<H3 id ="_x0yDgQPBEeW8nIkIujhtCA">Synchronization</H3>
+<H4 id ="_x0zRoQPBEeW8nIkIujhtCA">Add an element in the model</H4>
+<pre id ="_x01G0APBEeW8nIkIujhtCA">When an user adds an element in the model, the synchronization mechanism try to add in the current diagram the view that correspond to the semantic element <BR/>The difficulty of this mechanism is to parameter the synchronization. <BR/>By default, the synchronizatiopn is based on ' owned element'role. When you add an element, the graphical element that correponds to the owner try to display it in the diagram. <BR/>But some cases are not interesting. For example in the composite diagram, displaying parts in part correspond to part of the type, not directly part of part.</pre>
+<H4 id ="_x02U8QPBEeW8nIkIujhtCA">Move an element</H4>
+<pre id ="_x03jEQPBEeW8nIkIujhtCA">When a element is moved, the synchronization mechanism must to create graphically the element to each diagram. <BR/></pre>
+<H4 id ="_x05YQAPBEeW8nIkIujhtCA">Set synchronization enable</H4>
+<pre id ="_x06mYQPBEeW8nIkIujhtCA">The user can set enable the synchronization for a set of graphical elements. <BR/></pre>
+<H4 id ="_x08bkQPBEeW8nIkIujhtCA">Remove an element from the model</H4>
+<pre id ="_x0-QwQPBEeW8nIkIujhtCA">When the element is removed, the corresponding graphical element must be removed.</pre>
+<H2 id ="_x0_e4QPBEeW8nIkIujhtCA">Design</H2>
+<P align="middle"><img src=/Users/damus/git/Papyrus/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.canonical/doc/imgDOC/ArchitectureOverview.png alt=ArchitectureOverview ></P><P align="middle">ArchitectureOverview</P></BR>
+<pre id ="_x2BZoQPBEeW8nIkIujhtCA">The design consists of one plugin org.eclipse.papyrus.infra.gmfdiag.canonical. <BR/>It contains an edit-policy provider and an extension point</pre>
+<P align="middle"><img src=/Users/damus/git/Papyrus/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.canonical/doc/imgDOC/Structure.png alt=Structure ></P><P align="middle">Structure</P></BR>
+<pre id ="_x35B4QPBEeW8nIkIujhtCA">The edit policy PapyrusCanonicalEditPolicy is installed by the PapyrusCanonicalEditPolicyPolicy on any NodeEditPart that is a: <BR/> - DiagramEditPart (to synchronize content of diagram) <BR/> - CompartmentEditPart (to synchronize content of compartment) <BR/> - IBorderedShapeEditPart (to synchronize content of borderedElement as port....) <BR/> <BR/>This edit policy implements synchronization between graphical element and element in the model <BR/>It is based on GMF's CanonicalEditPolicy but it has several differences: <BR/> - View Service cannot be called. To call it we need to get the identifier of the child that could be place in compartment. It is not possible to find in a generic way <BR/> --> link to each Diagram Updater, and moreover some child has been created by custom code. In fact, the hierarchy of visual element must follow the hierachy of semantic element. <BR/> --> this is not the case so the Diagram updater generated from the gmfgen has not the good info. <BR/><BR/>So, the drag-and-drop support (drop edit policy) of the diagram is used to effect the creation of canonical views. To by-pass the Papyrus strategy-based<BR/>customizable drag-and-drop implementation, the DropObjectsRequest is wrapped in a CanonicalDropObjectsRequest to pass through the customizable<BR/>drop edit policy.<BR/> <BR/>An extension point is defined that lets diagram plug-ins contribute strategies for determination of<BR/> - what semantic elements should be shown as child nodes or attached edges of the host node<BR/> - which child views and attached edges are existing views of canonical elements<BR/> - on which related edit-part should a semantic element be dropped to create its canonical view<BR/> <BR/>When requested to refresh the visuals of its host edit-part, the canonical edit-policy iterates registered semantic-children strategies in priority order<BR/>to determine the semantic elements that need to be visualized as children and as edges. These are compared against views that already exist, as<BR/>provided by registered visual-children strategies. Any views that need to be created are created by drag-and-drop onto the target edit-part provided<BR/>by the registered creation-target strategies. All strategies are registered with priorities, either against a specific edit-part implementation class or<BR/>with an XML enablement expression that matches by edit-part, notation view, or semantic element (or some combination of all three). All strategy<BR/>extension points also provide sensible defaults for the case where no registered strategy matches the particular scenario.</pre>
+<pre id ="_x36QAQPBEeW8nIkIujhtCA">Remarks: <BR/>As in the GMF Run-time (and expected by GMF), the PapyrusCanonicalEditPolicy is governed by the presence (either explicitly in the notation<BR/>model or via CSS) of the CanonicalStyle::canonical attribute. In CSS, this is inferred from the 'canonical' boolean attribute via generic support<BR/>for single-attribute styles. However, unlike the default GMF behaviour, the default canonical state for a view that does not have the style at all<BR/>is off, not on.<BR/><BR/>The canonical style is only needed on top graphical shapes. Compartments do not need the style; all compartments of a canonical shape in the<BR/>diagram are populated with canonical views, including shape compartments (e.g., package contents).<BR/><BR/>Canonical view creation is enabled only when the PapyrusCanonicalEditPolicy is in its fully active state. However, the edit policy also has a<BR/>semi-active state in which it will delete views for obsolete canonical children and edges, but not create new ones. In GEF terms, the edit<BR/>policy is 'active' when it is in this state.</pre>
+<H3 id ="_x363EQPBEeW8nIkIujhtCA">Plugin org.eclipse.papyrus.infra.gmfdiag.canonical</H3>
+<H3 id ="_x38FMQPBEeW8nIkIujhtCA">Plugin org.eclipse.ui</H3>
+<H3 id ="_x39TUAPBEeW8nIkIujhtCA">Plugin org.eclipse.core.runtime</H3>
+<H3 id ="_x396YQPBEeW8nIkIujhtCA">Plugin org.eclipse.emf.common</H3>
+<H3 id ="_x3_IgQPBEeW8nIkIujhtCA">Plugin org.eclipse.emf.ecore</H3>
+<H3 id ="_x3_vkQPBEeW8nIkIujhtCA">Plugin org.eclipse.gef</H3>
+<H3 id ="_x4A9sQPBEeW8nIkIujhtCA">Plugin org.eclipse.gmf.runtime.diagram.ui</H3>
+<H3 id ="_x4BkwQPBEeW8nIkIujhtCA">Plugin org.eclipse.uml2.uml</H3>
+<H3 id ="_x4Cy4QPBEeW8nIkIujhtCA">Plugin org.eclipse.papyrus.infra.core</H3>
+<H3 id ="_x4EBAAPBEeW8nIkIujhtCA">Plugin org.eclipse.papyrus.infra.gmfdiag.common</H3>
+<H3 id ="_x4EoEQPBEeW8nIkIujhtCA">Plugin org.eclipse.gmf.tooling.runtime</H3>
+<H3 id ="_x4F2MAPBEeW8nIkIujhtCA">Plugin org.eclipse.papyrus.infra.core.log</H3>
+<H2 id ="_x4GdQQPBEeW8nIkIujhtCA">Tests</H2>
+<H2 id ="_x4HrYAPBEeW8nIkIujhtCA">Requirements Coverage</H2>
+<table style="border-collapse: collapse;"><caption style="caption-side: bottom;">RequirementsCoverageTable</caption><tr><th style="border: 1px solid black">Id</th><th style="border: 1px solid black">Satisfied by</th><th style="border: 1px solid black">Verified by</th></tr>
+<tr><td style="border : 1px solid black"><a href="#_x0AncQPBEeW8nIkIujhtCA" title="LocalSynchronization">Req001</a><BR/>
+</td><td style="border : 1px solid black">org.eclipse.papyrus.infra.gmfdiag.canonical.editpolicy<BR/>
+</td><td style="border : 1px solid black"></td></tr>
+<tr><td style="border : 1px solid black"><a href="#_x0B1kQPBEeW8nIkIujhtCA" title="CSSIntegration">Req002</a><BR/>
+</td><td style="border : 1px solid black"></td><td style="border : 1px solid black"></td></tr>
+<tr><td style="border : 1px solid black"><a href="#_x0DDsQPBEeW8nIkIujhtCA" title="CustomSynchronization">Req003</a><BR/>
+</td><td style="border : 1px solid black">org.eclipse.papyrus.infra.gmfdiag.canonical.strategy<BR/>
+</td><td style="border : 1px solid black"></td></tr>
+</table>
+<pre id ="_x4IScgPBEeW8nIkIujhtCA">Unsatisfied requirements (1 out of 3) : </pre>
+<a href="#_x0B1kQPBEeW8nIkIujhtCA" title="CSSIntegration">Req002</a><pre id ="_x4I5gQPBEeW8nIkIujhtCA">Unverified requirements (3 out of 3) : </pre>
+<a href="#_x0AncQPBEeW8nIkIujhtCA" title="LocalSynchronization">Req001, </a><a href="#_x0B1kQPBEeW8nIkIujhtCA" title="CSSIntegration">Req002, </a><a href="#_x0DDsQPBEeW8nIkIujhtCA" title="CustomSynchronization">Req003</a></html>
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.canonical/default.css b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.canonical/doc/default.css
index a52509fd64b..df978c5d914 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.canonical/default.css
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.canonical/doc/default.css
@@ -1,59 +1,59 @@
-/*
- * Style sheet for the CSS2 specification
- */
-
-body {
- padding: 2em 1em 2em 70px;
- margin: 0;
- font-family: sans-serif;
- color: black;
- background: white;
- background-position: top left;
- background-attachment: fixed;
- background-repeat: no-repeat;
-}
-
-
-p {
- margin-top: 0.6em;
- margin-bottom: 0.6em;
- margin-left: 2em;
-}
-
-h1, h2, h3, h4, h5, h6 { text-align: left }
-
-
-h1, h2, h3 { color: #005A9C; background: white }
-h1 { font: 170% sans-serif }
-h2 { font: 140% sans-serif }
-h3 { font: 120% sans-serif }
-h4 { font: bold 100% sans-serif }
-h5 { font: italic 100% sans-serif }
-h6 { font: small-caps 100% sans-serif }
-
-body{counter-reset: h1 h2 h3;}
-
-
-h2:before {
- content: counter(h2) " ";
- counter-increment: h2;
-}
-h3:before {
- content: counter(h2) "." counter(h3) " ";
- counter-increment: h3;
-}
-h1 {
- counter-reset: h2;
-}
-h2 {
- counter-reset: h3;
-}
-h1.unnumbered, h2.unnumbered {
- counter-reset: none;
-}
-h1.unnumbered:before,
-h2.unnumbered:before,
-h3.unnumbered:before{
- content: none;
- counter-increment: none;
-}
+/*
+ * Style sheet for the CSS2 specification
+ */
+
+body {
+ padding: 2em 1em 2em 70px;
+ margin: 0;
+ font-family: sans-serif;
+ color: black;
+ background: white;
+ background-position: top left;
+ background-attachment: fixed;
+ background-repeat: no-repeat;
+}
+
+
+p {
+ margin-top: 0.6em;
+ margin-bottom: 0.6em;
+ margin-left: 2em;
+}
+
+h1, h2, h3, h4, h5, h6 { text-align: left }
+
+
+h1, h2, h3 { color: #005A9C; background: white }
+h1 { font: 170% sans-serif }
+h2 { font: 140% sans-serif }
+h3 { font: 120% sans-serif }
+h4 { font: bold 100% sans-serif }
+h5 { font: italic 100% sans-serif }
+h6 { font: small-caps 100% sans-serif }
+
+body{counter-reset: h1 h2 h3;}
+
+
+h2:before {
+ content: counter(h2) " ";
+ counter-increment: h2;
+}
+h3:before {
+ content: counter(h2) "." counter(h3) " ";
+ counter-increment: h3;
+}
+h1 {
+ counter-reset: h2;
+}
+h2 {
+ counter-reset: h3;
+}
+h1.unnumbered, h2.unnumbered {
+ counter-reset: none;
+}
+h1.unnumbered:before,
+h2.unnumbered:before,
+h3.unnumbered:before{
+ content: none;
+ counter-increment: none;
+}
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.canonical/doc/design.di b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.canonical/doc/design.di
new file mode 100644
index 00000000000..bf9abab340f
--- /dev/null
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.canonical/doc/design.di
@@ -0,0 +1,2 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<xmi:XMI xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI"/>
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.canonical/doc/design.notation b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.canonical/doc/design.notation
new file mode 100644
index 00000000000..906aa71bf19
--- /dev/null
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.canonical/doc/design.notation
@@ -0,0 +1,1603 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<xmi:XMI xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:ADL4Eclipse="http:///schemas/ADL4Eclipse/_rk7nwOqKEeOfTcbrnCq2oQ/3" xmlns:configuration="http://www.eclipse.org/papyrus/infra/viewpoints/configuration" xmlns:css="http://www.eclipse.org/papyrus/infra/gmfdiag/css" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" xmlns:nattable="http://www.eclipse.org/papyrus/nattable/model" xmlns:nattableaxis="http://www.eclipse.org/papyrus/nattable/model/table/nattableaxis" xmlns:nattableaxisconfiguration="http://www.eclipse.org/papyrus/nattable/model/table/nattableaxisconfiguration" xmlns:nattableaxisprovider="http://www.eclipse.org/papyrus/nattable/model/table/nattableaxisprovider" xmlns:nattableconfiguration="http://www.eclipse.org/papyrus/nattable/model/nattableconfiguration" xmlns:notation="http://www.eclipse.org/gmf/runtime/1.0.2/notation" xmlns:style="http://www.eclipse.org/papyrus/infra/viewpoints/policy/style" xmlns:uml="http://www.eclipse.org/uml2/5.0.0/UML" xsi:schemaLocation="http:///schemas/ADL4Eclipse/_rk7nwOqKEeOfTcbrnCq2oQ/3 pathmap://ADL4ECLIPSE_PROFILES/adl4eclipse.profile.uml#_rlFYwOqKEeOfTcbrnCq2oQ http://www.eclipse.org/papyrus/nattable/model/table/nattableaxis http://www.eclipse.org/papyrus/nattable/model#//nattableaxis http://www.eclipse.org/papyrus/nattable/model/table/nattableaxisconfiguration http://www.eclipse.org/papyrus/nattable/model#//nattableaxisconfiguration http://www.eclipse.org/papyrus/nattable/model/table/nattableaxisprovider http://www.eclipse.org/papyrus/nattable/model#//nattableaxisprovider http://www.eclipse.org/papyrus/nattable/model/nattableconfiguration http://www.eclipse.org/papyrus/nattable/model#//nattableconfiguration">
+ <notation:Diagram xmi:id="_lNP40MbvEeO9CYUoXDRplw" type="PapyrusUMLClassDiagram" name="Overview" measurementUnit="Pixel">
+ <children xmi:type="notation:Shape" xmi:id="_lNP40cbvEeO9CYUoXDRplw" type="2005">
+ <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_qRJl4AO0EeWytIRHPc2H8Q" source="PapyrusHyperLink_Page" references="_1PpFsMohEeO3DsHezUU9Sg">
+ <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_qRJl4QO0EeWytIRHPc2H8Q" key="tooltip_text" value="RequirementTable"/>
+ <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_qRJl4gO0EeWytIRHPc2H8Q" key="pageName" value="RequirementTable"/>
+ <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_qRJl4wO0EeWytIRHPc2H8Q" key="is_default_navigation" value="true"/>
+ </eAnnotations>
+ <children xmi:type="notation:DecorationNode" xmi:id="_lNP40sbvEeO9CYUoXDRplw" type="5020"/>
+ <children xmi:type="notation:DecorationNode" xmi:id="_lNP408bvEeO9CYUoXDRplw" type="7009">
+ <styles xmi:type="notation:TitleStyle" xmi:id="_lNP41MbvEeO9CYUoXDRplw"/>
+ <layoutConstraint xmi:type="notation:Bounds" xmi:id="_lNP41cbvEeO9CYUoXDRplw"/>
+ </children>
+ <element xmi:type="uml:Model" href="design.uml#_lNLnYsbvEeO9CYUoXDRplw"/>
+ <layoutConstraint xmi:type="notation:Bounds" xmi:id="_lNP41sbvEeO9CYUoXDRplw" x="201" y="38"/>
+ </children>
+ <children xmi:type="notation:Shape" xmi:id="_lNP418bvEeO9CYUoXDRplw" type="2005">
+ <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_swyREAO0EeWytIRHPc2H8Q" source="PapyrusHyperLink_Page" references="_Nf1kUMcbEeOenbI5XqwJvQ">
+ <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_swyREQO0EeWytIRHPc2H8Q" key="tooltip_text" value="UseCaseDiagram"/>
+ <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_swyREgO0EeWytIRHPc2H8Q" key="pageName" value="UseCaseDiagram"/>
+ <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_swyREwO0EeWytIRHPc2H8Q" key="is_default_navigation" value="true"/>
+ </eAnnotations>
+ <children xmi:type="notation:DecorationNode" xmi:id="_lNP42MbvEeO9CYUoXDRplw" type="5020"/>
+ <children xmi:type="notation:DecorationNode" xmi:id="_lNP42cbvEeO9CYUoXDRplw" type="7009">
+ <styles xmi:type="notation:TitleStyle" xmi:id="_lNP42sbvEeO9CYUoXDRplw"/>
+ <layoutConstraint xmi:type="notation:Bounds" xmi:id="_lNP428bvEeO9CYUoXDRplw"/>
+ </children>
+ <element xmi:type="uml:Model" href="design.uml#_lNLnY8bvEeO9CYUoXDRplw"/>
+ <layoutConstraint xmi:type="notation:Bounds" xmi:id="_lNP43MbvEeO9CYUoXDRplw" x="204" y="173" width="259" height="96"/>
+ </children>
+ <children xmi:type="notation:Shape" xmi:id="_lNP43cbvEeO9CYUoXDRplw" type="2005">
+ <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_3VnsUAO1EeWytIRHPc2H8Q" source="PapyrusHyperLink_Page" references="_pUh7UMrhEeOada-BlHQh_Q">
+ <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_3VnsUQO1EeWytIRHPc2H8Q" key="tooltip_text" value="ArchitectureOverview"/>
+ <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_3VnsUgO1EeWytIRHPc2H8Q" key="pageName" value="ArchitectureOverview"/>
+ <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_3VnsUwO1EeWytIRHPc2H8Q" key="is_default_navigation" value="true"/>
+ </eAnnotations>
+ <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_5JmLYAO1EeWytIRHPc2H8Q" source="PapyrusHyperLink_Page" references="_xae5MM7bEeOkpJkbnruUGQ">
+ <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_5JmLYQO1EeWytIRHPc2H8Q" key="tooltip_text" value="Structure"/>
+ <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_5JmLYgO1EeWytIRHPc2H8Q" key="pageName" value="Structure"/>
+ <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_5JmLYwO1EeWytIRHPc2H8Q" key="is_default_navigation" value="true"/>
+ </eAnnotations>
+ <children xmi:type="notation:DecorationNode" xmi:id="_lNP43sbvEeO9CYUoXDRplw" type="5020"/>
+ <children xmi:type="notation:DecorationNode" xmi:id="_lNP438bvEeO9CYUoXDRplw" type="7009">
+ <styles xmi:type="notation:TitleStyle" xmi:id="_lNP44MbvEeO9CYUoXDRplw"/>
+ <layoutConstraint xmi:type="notation:Bounds" xmi:id="_lNP44cbvEeO9CYUoXDRplw"/>
+ </children>
+ <element xmi:type="uml:Model" href="design.uml#_lNLnZsbvEeO9CYUoXDRplw"/>
+ <layoutConstraint xmi:type="notation:Bounds" xmi:id="_lNP44sbvEeO9CYUoXDRplw" x="206" y="329"/>
+ </children>
+ <children xmi:type="notation:Shape" xmi:id="_lNP448bvEeO9CYUoXDRplw" type="2005">
+ <children xmi:type="notation:DecorationNode" xmi:id="_lNP45MbvEeO9CYUoXDRplw" type="5020"/>
+ <children xmi:type="notation:DecorationNode" xmi:id="_lNP45cbvEeO9CYUoXDRplw" type="7009">
+ <styles xmi:type="notation:TitleStyle" xmi:id="_lNP45sbvEeO9CYUoXDRplw"/>
+ <layoutConstraint xmi:type="notation:Bounds" xmi:id="_lNP458bvEeO9CYUoXDRplw"/>
+ </children>
+ <element xmi:type="uml:Model" href="design.uml#_lNLnaMbvEeO9CYUoXDRplw"/>
+ <layoutConstraint xmi:type="notation:Bounds" xmi:id="_lNP46MbvEeO9CYUoXDRplw" x="635" y="324"/>
+ </children>
+ <children xmi:type="notation:Shape" xmi:id="_gSwG8MofEeO3DsHezUU9Sg" type="2012">
+ <children xmi:type="notation:DecorationNode" xmi:id="_gSxVEMofEeO3DsHezUU9Sg" type="5038"/>
+ <element xmi:type="uml:Comment" href="design.uml#_gP184MofEeO3DsHezUU9Sg"/>
+ <layoutConstraint xmi:type="notation:Bounds" xmi:id="_gSwuAMofEeO3DsHezUU9Sg" x="534" y="72" width="366" height="70"/>
+ </children>
+ <children xmi:type="notation:Shape" xmi:id="_bstJMAOtEeWytIRHPc2H8Q" type="StereotypeComment">
+ <styles xmi:type="notation:TitleStyle" xmi:id="_bstJMQOtEeWytIRHPc2H8Q" showTitle="true"/>
+ <styles xmi:type="notation:EObjectValueStyle" xmi:id="_bstJMwOtEeWytIRHPc2H8Q" name="BASE_ELEMENT">
+ <eObjectValue xmi:type="uml:Model" href="design.uml#_lNLnYsbvEeO9CYUoXDRplw"/>
+ </styles>
+ <element xsi:nil="true"/>
+ <layoutConstraint xmi:type="notation:Bounds" xmi:id="_bstJMgOtEeWytIRHPc2H8Q" x="401" y="38"/>
+ </children>
+ <children xmi:type="notation:Shape" xmi:id="_bs26MAOtEeWytIRHPc2H8Q" type="StereotypeComment">
+ <styles xmi:type="notation:TitleStyle" xmi:id="_bs26MQOtEeWytIRHPc2H8Q" showTitle="true"/>
+ <styles xmi:type="notation:EObjectValueStyle" xmi:id="_bs26MwOtEeWytIRHPc2H8Q" name="BASE_ELEMENT">
+ <eObjectValue xmi:type="uml:Model" href="design.uml#_lNLnY8bvEeO9CYUoXDRplw"/>
+ </styles>
+ <element xsi:nil="true"/>
+ <layoutConstraint xmi:type="notation:Bounds" xmi:id="_bs26MgOtEeWytIRHPc2H8Q" x="404" y="173"/>
+ </children>
+ <children xmi:type="notation:Shape" xmi:id="_btH_8AOtEeWytIRHPc2H8Q" type="StereotypeComment">
+ <styles xmi:type="notation:TitleStyle" xmi:id="_btH_8QOtEeWytIRHPc2H8Q" showTitle="true"/>
+ <styles xmi:type="notation:EObjectValueStyle" xmi:id="_btH_8wOtEeWytIRHPc2H8Q" name="BASE_ELEMENT">
+ <eObjectValue xmi:type="uml:Model" href="design.uml#_lNLnZsbvEeO9CYUoXDRplw"/>
+ </styles>
+ <element xsi:nil="true"/>
+ <layoutConstraint xmi:type="notation:Bounds" xmi:id="_btH_8gOtEeWytIRHPc2H8Q" x="406" y="329"/>
+ </children>
+ <children xmi:type="notation:Shape" xmi:id="_btTmIAOtEeWytIRHPc2H8Q" type="StereotypeComment">
+ <styles xmi:type="notation:TitleStyle" xmi:id="_btTmIQOtEeWytIRHPc2H8Q" showTitle="true"/>
+ <styles xmi:type="notation:EObjectValueStyle" xmi:id="_btTmIwOtEeWytIRHPc2H8Q" name="BASE_ELEMENT">
+ <eObjectValue xmi:type="uml:Model" href="design.uml#_lNLnaMbvEeO9CYUoXDRplw"/>
+ </styles>
+ <element xsi:nil="true"/>
+ <layoutConstraint xmi:type="notation:Bounds" xmi:id="_btTmIgOtEeWytIRHPc2H8Q" x="835" y="324"/>
+ </children>
+ <children xmi:type="notation:Shape" xmi:id="_btelQAOtEeWytIRHPc2H8Q" type="StereotypeComment">
+ <styles xmi:type="notation:TitleStyle" xmi:id="_btelQQOtEeWytIRHPc2H8Q" showTitle="true"/>
+ <styles xmi:type="notation:EObjectValueStyle" xmi:id="_btelQwOtEeWytIRHPc2H8Q" name="BASE_ELEMENT">
+ <eObjectValue xmi:type="uml:Comment" href="design.uml#_gP184MofEeO3DsHezUU9Sg"/>
+ </styles>
+ <element xsi:nil="true"/>
+ <layoutConstraint xmi:type="notation:Bounds" xmi:id="_btelQgOtEeWytIRHPc2H8Q" x="734" y="72"/>
+ </children>
+ <styles xmi:type="notation:DiagramStyle" xmi:id="_lNP46cbvEeO9CYUoXDRplw"/>
+ <styles xmi:type="style:PapyrusViewStyle" xmi:id="_lNP46sbvEeO9CYUoXDRplw">
+ <owner xmi:type="uml:Model" href="design.uml#_lNLnYMbvEeO9CYUoXDRplw"/>
+ <configuration xmi:type="configuration:PapyrusDiagram" href="platform:/plugin/org.eclipse.papyrus.infra.viewpoints.policy/builtin/default.configuration#_7wLmpNxhEeOqHvRyiN87hA"/>
+ </styles>
+ <styles xmi:type="notation:StringValueStyle" xmi:id="_bp2CcAOtEeWytIRHPc2H8Q" name="diagram_compatibility_version" stringValue="1.1.0"/>
+ <element xmi:type="uml:Model" href="design.uml#_lNLnYMbvEeO9CYUoXDRplw"/>
+ <edges xmi:type="notation:Connector" xmi:id="_lNP468bvEeO9CYUoXDRplw" type="4006" source="_lNP418bvEeO9CYUoXDRplw" target="_lNP40cbvEeO9CYUoXDRplw">
+ <children xmi:type="notation:DecorationNode" xmi:id="_lNP47MbvEeO9CYUoXDRplw" visible="false" type="6014">
+ <layoutConstraint xmi:type="notation:Location" xmi:id="_lNP47cbvEeO9CYUoXDRplw" y="40"/>
+ </children>
+ <children xmi:type="notation:DecorationNode" xmi:id="_lNP47sbvEeO9CYUoXDRplw" visible="false" type="6015">
+ <layoutConstraint xmi:type="notation:Location" xmi:id="_lNP478bvEeO9CYUoXDRplw" y="60"/>
+ </children>
+ <styles xmi:type="notation:FontStyle" xmi:id="_lNP48MbvEeO9CYUoXDRplw"/>
+ <element xmi:type="uml:Abstraction" href="design.uml#_lNLnZMbvEeO9CYUoXDRplw"/>
+ <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_lNP48cbvEeO9CYUoXDRplw" points="[-2, -10, 8, 48]$[-27, -45, -17, 13]"/>
+ <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_lNP48sbvEeO9CYUoXDRplw" id="(0.305,0.1)"/>
+ <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_lNP488bvEeO9CYUoXDRplw" id="(0.27,0.87)"/>
+ </edges>
+ <edges xmi:type="notation:Connector" xmi:id="_lNP49MbvEeO9CYUoXDRplw" type="4006" source="_lNP43cbvEeO9CYUoXDRplw" target="_lNP418bvEeO9CYUoXDRplw">
+ <children xmi:type="notation:DecorationNode" xmi:id="_lNP49cbvEeO9CYUoXDRplw" visible="false" type="6014">
+ <layoutConstraint xmi:type="notation:Location" xmi:id="_lNP49sbvEeO9CYUoXDRplw" y="40"/>
+ </children>
+ <children xmi:type="notation:DecorationNode" xmi:id="_lNP498bvEeO9CYUoXDRplw" visible="false" type="6015">
+ <layoutConstraint xmi:type="notation:Location" xmi:id="_lNP4-MbvEeO9CYUoXDRplw" y="60"/>
+ </children>
+ <styles xmi:type="notation:FontStyle" xmi:id="_lNP4-cbvEeO9CYUoXDRplw"/>
+ <element xmi:type="uml:Abstraction" href="design.uml#_lNLnZ8bvEeO9CYUoXDRplw"/>
+ <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_lNP4-sbvEeO9CYUoXDRplw" points="[-9, -16, 0, 67]$[-24, -72, -15, 11]"/>
+ <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_lNP4-8bvEeO9CYUoXDRplw" id="(0.27,0.16)"/>
+ <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_lNP4_MbvEeO9CYUoXDRplw" id="(0.235,0.89)"/>
+ </edges>
+ <edges xmi:type="notation:Connector" xmi:id="_lNP4_cbvEeO9CYUoXDRplw" type="4008" source="_lNP448bvEeO9CYUoXDRplw" target="_lNP418bvEeO9CYUoXDRplw">
+ <children xmi:type="notation:DecorationNode" xmi:id="_lNP4_sbvEeO9CYUoXDRplw" visible="false" type="6026">
+ <layoutConstraint xmi:type="notation:Location" xmi:id="_lNP4_8bvEeO9CYUoXDRplw" y="40"/>
+ </children>
+ <children xmi:type="notation:DecorationNode" xmi:id="_lNP5AMbvEeO9CYUoXDRplw" visible="false" type="6027">
+ <layoutConstraint xmi:type="notation:Location" xmi:id="_lNP5AcbvEeO9CYUoXDRplw" y="60"/>
+ </children>
+ <styles xmi:type="notation:FontStyle" xmi:id="_lNP5AsbvEeO9CYUoXDRplw"/>
+ <element xmi:type="uml:Dependency" href="design.uml#_lNLnacbvEeO9CYUoXDRplw"/>
+ <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_lNP5A8bvEeO9CYUoXDRplw" points="[-46, -20, 265, 113]$[-275, -135, 36, -2]"/>
+ <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_lNP5BMbvEeO9CYUoXDRplw" id="(0.0,0.24)"/>
+ <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_lNP5BcbvEeO9CYUoXDRplw" id="(1.0,0.65)"/>
+ </edges>
+ <edges xmi:type="notation:Connector" xmi:id="_lNP5BsbvEeO9CYUoXDRplw" type="4008" source="_lNP448bvEeO9CYUoXDRplw" target="_lNP43cbvEeO9CYUoXDRplw">
+ <children xmi:type="notation:DecorationNode" xmi:id="_lNP5B8bvEeO9CYUoXDRplw" visible="false" type="6026">
+ <layoutConstraint xmi:type="notation:Location" xmi:id="_lNP5CMbvEeO9CYUoXDRplw" y="40"/>
+ </children>
+ <children xmi:type="notation:DecorationNode" xmi:id="_lNP5CcbvEeO9CYUoXDRplw" visible="false" type="6027">
+ <layoutConstraint xmi:type="notation:Location" xmi:id="_lNP5CsbvEeO9CYUoXDRplw" y="60"/>
+ </children>
+ <styles xmi:type="notation:FontStyle" xmi:id="_lNP5C8bvEeO9CYUoXDRplw"/>
+ <element xmi:type="uml:Dependency" href="design.uml#_lNLnasbvEeO9CYUoXDRplw"/>
+ <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_lNP5DMbvEeO9CYUoXDRplw" points="[-40, 1, 262, -12]$[-267, 20, 35, 7]"/>
+ <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_lNP5DcbvEeO9CYUoXDRplw" id="(0.0,0.69)"/>
+ <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_lNP5DsbvEeO9CYUoXDRplw" id="(1.0,0.64)"/>
+ </edges>
+ <edges xmi:type="notation:Connector" xmi:id="_bstJNAOtEeWytIRHPc2H8Q" type="StereotypeCommentLink" source="_lNP40cbvEeO9CYUoXDRplw" target="_bstJMAOtEeWytIRHPc2H8Q">
+ <styles xmi:type="notation:FontStyle" xmi:id="_bstJNQOtEeWytIRHPc2H8Q"/>
+ <styles xmi:type="notation:EObjectValueStyle" xmi:id="_bstwQAOtEeWytIRHPc2H8Q" name="BASE_ELEMENT">
+ <eObjectValue xmi:type="uml:Model" href="design.uml#_lNLnYsbvEeO9CYUoXDRplw"/>
+ </styles>
+ <element xsi:nil="true"/>
+ <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_bstJNgOtEeWytIRHPc2H8Q" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
+ <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_bstJNwOtEeWytIRHPc2H8Q"/>
+ <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_bstJOAOtEeWytIRHPc2H8Q"/>
+ </edges>
+ <edges xmi:type="notation:Connector" xmi:id="_bs26NAOtEeWytIRHPc2H8Q" type="StereotypeCommentLink" source="_lNP418bvEeO9CYUoXDRplw" target="_bs26MAOtEeWytIRHPc2H8Q">
+ <styles xmi:type="notation:FontStyle" xmi:id="_bs26NQOtEeWytIRHPc2H8Q"/>
+ <styles xmi:type="notation:EObjectValueStyle" xmi:id="_bs3hQAOtEeWytIRHPc2H8Q" name="BASE_ELEMENT">
+ <eObjectValue xmi:type="uml:Model" href="design.uml#_lNLnY8bvEeO9CYUoXDRplw"/>
+ </styles>
+ <element xsi:nil="true"/>
+ <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_bs26NgOtEeWytIRHPc2H8Q" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
+ <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_bs26NwOtEeWytIRHPc2H8Q"/>
+ <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_bs26OAOtEeWytIRHPc2H8Q"/>
+ </edges>
+ <edges xmi:type="notation:Connector" xmi:id="_btH_9AOtEeWytIRHPc2H8Q" type="StereotypeCommentLink" source="_lNP43cbvEeO9CYUoXDRplw" target="_btH_8AOtEeWytIRHPc2H8Q">
+ <styles xmi:type="notation:FontStyle" xmi:id="_btH_9QOtEeWytIRHPc2H8Q"/>
+ <styles xmi:type="notation:EObjectValueStyle" xmi:id="_btInAAOtEeWytIRHPc2H8Q" name="BASE_ELEMENT">
+ <eObjectValue xmi:type="uml:Model" href="design.uml#_lNLnZsbvEeO9CYUoXDRplw"/>
+ </styles>
+ <element xsi:nil="true"/>
+ <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_btH_9gOtEeWytIRHPc2H8Q" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
+ <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_btH_9wOtEeWytIRHPc2H8Q"/>
+ <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_btH_-AOtEeWytIRHPc2H8Q"/>
+ </edges>
+ <edges xmi:type="notation:Connector" xmi:id="_btTmJAOtEeWytIRHPc2H8Q" type="StereotypeCommentLink" source="_lNP448bvEeO9CYUoXDRplw" target="_btTmIAOtEeWytIRHPc2H8Q">
+ <styles xmi:type="notation:FontStyle" xmi:id="_btTmJQOtEeWytIRHPc2H8Q"/>
+ <styles xmi:type="notation:EObjectValueStyle" xmi:id="_btTmKQOtEeWytIRHPc2H8Q" name="BASE_ELEMENT">
+ <eObjectValue xmi:type="uml:Model" href="design.uml#_lNLnaMbvEeO9CYUoXDRplw"/>
+ </styles>
+ <element xsi:nil="true"/>
+ <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_btTmJgOtEeWytIRHPc2H8Q" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
+ <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_btTmJwOtEeWytIRHPc2H8Q"/>
+ <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_btTmKAOtEeWytIRHPc2H8Q"/>
+ </edges>
+ <edges xmi:type="notation:Connector" xmi:id="_btfMUAOtEeWytIRHPc2H8Q" type="StereotypeCommentLink" source="_gSwG8MofEeO3DsHezUU9Sg" target="_btelQAOtEeWytIRHPc2H8Q">
+ <styles xmi:type="notation:FontStyle" xmi:id="_btfMUQOtEeWytIRHPc2H8Q"/>
+ <styles xmi:type="notation:EObjectValueStyle" xmi:id="_btfMVQOtEeWytIRHPc2H8Q" name="BASE_ELEMENT">
+ <eObjectValue xmi:type="uml:Comment" href="design.uml#_gP184MofEeO3DsHezUU9Sg"/>
+ </styles>
+ <element xsi:nil="true"/>
+ <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_btfMUgOtEeWytIRHPc2H8Q" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
+ <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_btfMUwOtEeWytIRHPc2H8Q"/>
+ <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_btfMVAOtEeWytIRHPc2H8Q"/>
+ </edges>
+ </notation:Diagram>
+ <notation:Diagram xmi:id="_Nf1kUMcbEeOenbI5XqwJvQ" type="UseCase" name="UseCaseDiagram" measurementUnit="Pixel">
+ <children xmi:type="notation:Shape" xmi:id="_OAXegMcbEeOenbI5XqwJvQ" type="2015">
+ <children xmi:type="notation:DecorationNode" xmi:id="_OAZTsMcbEeOenbI5XqwJvQ" type="5019"/>
+ <children xmi:type="notation:DecorationNode" xmi:id="_OAZTsccbEeOenbI5XqwJvQ" type="7011">
+ <children xmi:type="notation:Shape" xmi:id="_PBuN0McbEeOenbI5XqwJvQ" type="3009">
+ <children xmi:type="notation:DecorationNode" xmi:id="_PBuN0scbEeOenbI5XqwJvQ" type="5018"/>
+ <children xmi:type="notation:DecorationNode" xmi:id="_PBu04McbEeOenbI5XqwJvQ" type="7012">
+ <styles xmi:type="notation:SortingStyle" xmi:id="_PBu04ccbEeOenbI5XqwJvQ"/>
+ <styles xmi:type="notation:FilteringStyle" xmi:id="_PBu04scbEeOenbI5XqwJvQ"/>
+ <layoutConstraint xmi:type="notation:Bounds" xmi:id="_PBu048cbEeOenbI5XqwJvQ"/>
+ </children>
+ <children xmi:type="notation:DecorationNode" xmi:id="_6ub74gOtEeWytIRHPc2H8Q" type="6045">
+ <layoutConstraint xmi:type="notation:Location" xmi:id="_6ub74wOtEeWytIRHPc2H8Q" y="5"/>
+ </children>
+ <element xmi:type="uml:UseCase" href="design.uml#_O8koEMcbEeOenbI5XqwJvQ"/>
+ <layoutConstraint xmi:type="notation:Bounds" xmi:id="_PBuN0ccbEeOenbI5XqwJvQ" x="23" y="12"/>
+ </children>
+ <children xmi:type="notation:Shape" xmi:id="_QqrvsMcbEeOenbI5XqwJvQ" type="3009">
+ <children xmi:type="notation:DecorationNode" xmi:id="_QqsWwMcbEeOenbI5XqwJvQ" type="5018"/>
+ <children xmi:type="notation:DecorationNode" xmi:id="_QqsWwccbEeOenbI5XqwJvQ" type="7012">
+ <styles xmi:type="notation:SortingStyle" xmi:id="_QqsWwscbEeOenbI5XqwJvQ"/>
+ <styles xmi:type="notation:FilteringStyle" xmi:id="_QqsWw8cbEeOenbI5XqwJvQ"/>
+ <layoutConstraint xmi:type="notation:Bounds" xmi:id="_QqsWxMcbEeOenbI5XqwJvQ"/>
+ </children>
+ <children xmi:type="notation:DecorationNode" xmi:id="_6ub75AOtEeWytIRHPc2H8Q" type="6045">
+ <layoutConstraint xmi:type="notation:Location" xmi:id="_6ub75QOtEeWytIRHPc2H8Q" y="5"/>
+ </children>
+ <element xmi:type="uml:UseCase" href="design.uml#_QqgwkMcbEeOenbI5XqwJvQ"/>
+ <layoutConstraint xmi:type="notation:Bounds" xmi:id="_QqrvsccbEeOenbI5XqwJvQ" x="12" y="78"/>
+ </children>
+ <children xmi:type="notation:Shape" xmi:id="_zqrN0MozEeO3DsHezUU9Sg" type="3009">
+ <children xmi:type="notation:DecorationNode" xmi:id="_zqr04MozEeO3DsHezUU9Sg" type="5018"/>
+ <children xmi:type="notation:DecorationNode" xmi:id="_zqr04cozEeO3DsHezUU9Sg" type="7012">
+ <styles xmi:type="notation:SortingStyle" xmi:id="_zqr04sozEeO3DsHezUU9Sg"/>
+ <styles xmi:type="notation:FilteringStyle" xmi:id="_zqr048ozEeO3DsHezUU9Sg"/>
+ <layoutConstraint xmi:type="notation:Bounds" xmi:id="_zqr05MozEeO3DsHezUU9Sg"/>
+ </children>
+ <children xmi:type="notation:DecorationNode" xmi:id="_6ub75gOtEeWytIRHPc2H8Q" type="6045">
+ <layoutConstraint xmi:type="notation:Location" xmi:id="_6ub75wOtEeWytIRHPc2H8Q" y="5"/>
+ </children>
+ <element xmi:type="uml:UseCase" href="design.uml#_zqMFoMozEeO3DsHezUU9Sg"/>
+ <layoutConstraint xmi:type="notation:Bounds" xmi:id="_zqrN0cozEeO3DsHezUU9Sg" x="64" y="149" height="47"/>
+ </children>
+ <children xmi:type="notation:Shape" xmi:id="_l8-K4Mo3EeOzTpunJ7qmNw" type="3009">
+ <children xmi:type="notation:DecorationNode" xmi:id="_l8-x8Mo3EeOzTpunJ7qmNw" type="5018"/>
+ <children xmi:type="notation:DecorationNode" xmi:id="_l8_ZAMo3EeOzTpunJ7qmNw" type="7012">
+ <styles xmi:type="notation:SortingStyle" xmi:id="_l8_ZAco3EeOzTpunJ7qmNw"/>
+ <styles xmi:type="notation:FilteringStyle" xmi:id="_l8_ZAso3EeOzTpunJ7qmNw"/>
+ <layoutConstraint xmi:type="notation:Bounds" xmi:id="_l8_ZA8o3EeOzTpunJ7qmNw"/>
+ </children>
+ <children xmi:type="notation:DecorationNode" xmi:id="_6ub76AOtEeWytIRHPc2H8Q" type="6045">
+ <layoutConstraint xmi:type="notation:Location" xmi:id="_6ub76QOtEeWytIRHPc2H8Q" y="5"/>
+ </children>
+ <element xmi:type="uml:UseCase" href="design.uml#_l5cVwMo3EeOzTpunJ7qmNw"/>
+ <layoutConstraint xmi:type="notation:Bounds" xmi:id="_l8-K4co3EeOzTpunJ7qmNw" x="42" y="206"/>
+ </children>
+ <layoutConstraint xmi:type="notation:Bounds" xmi:id="_OAZTsscbEeOenbI5XqwJvQ"/>
+ </children>
+ <children xmi:type="notation:DecorationNode" xmi:id="_6ub74AOtEeWytIRHPc2H8Q" type="6047">
+ <layoutConstraint xmi:type="notation:Location" xmi:id="_6ub74QOtEeWytIRHPc2H8Q" y="5"/>
+ </children>
+ <element xmi:type="uml:Component" href="design.uml#_lNLnZcbvEeO9CYUoXDRplw"/>
+ <layoutConstraint xmi:type="notation:Bounds" xmi:id="_OAXegccbEeOenbI5XqwJvQ" x="311" y="22" width="361" height="316"/>
+ </children>
+ <children xmi:type="notation:Shape" xmi:id="_g3FzAMozEeO3DsHezUU9Sg" type="2011">
+ <children xmi:type="notation:DecorationNode" xmi:id="_g3GaEMozEeO3DsHezUU9Sg" type="5014">
+ <layoutConstraint xmi:type="notation:Location" xmi:id="_g3GaEcozEeO3DsHezUU9Sg" x="20" y="60"/>
+ </children>
+ <children xmi:type="notation:DecorationNode" xmi:id="_g3HBIMozEeO3DsHezUU9Sg" type="6029">
+ <layoutConstraint xmi:type="notation:Location" xmi:id="_g3HBIcozEeO3DsHezUU9Sg" x="20" y="100"/>
+ </children>
+ <children xmi:type="notation:DecorationNode" xmi:id="_g3HoMMozEeO3DsHezUU9Sg" type="6037">
+ <layoutConstraint xmi:type="notation:Location" xmi:id="_g3HoMcozEeO3DsHezUU9Sg" x="20" y="80"/>
+ </children>
+ <children xmi:type="notation:DecorationNode" xmi:id="_6ub76gOtEeWytIRHPc2H8Q" type="6048">
+ <layoutConstraint xmi:type="notation:Location" xmi:id="_6ub76wOtEeWytIRHPc2H8Q" y="5"/>
+ </children>
+ <element xmi:type="uml:Actor" href="design.uml#_g2Kl8MozEeO3DsHezUU9Sg"/>
+ <layoutConstraint xmi:type="notation:Bounds" xmi:id="_g3FzAcozEeO3DsHezUU9Sg" x="136" y="106"/>
+ </children>
+ <styles xmi:type="notation:DiagramStyle" xmi:id="_Nf2LYMcbEeOenbI5XqwJvQ"/>
+ <styles xmi:type="style:PapyrusViewStyle" xmi:id="_Nf2LYccbEeOenbI5XqwJvQ">
+ <owner xmi:type="uml:Model" href="design.uml#_lNLnY8bvEeO9CYUoXDRplw"/>
+ </styles>
+ <styles xmi:type="notation:StringValueStyle" xmi:id="_6uci8AOtEeWytIRHPc2H8Q" name="diagram_compatibility_version" stringValue="1.1.0"/>
+ <element xmi:type="uml:Model" href="design.uml#_lNLnY8bvEeO9CYUoXDRplw"/>
+ <edges xmi:type="notation:Connector" xmi:id="_1p5TkMozEeO3DsHezUU9Sg" type="4011" source="_g3FzAMozEeO3DsHezUU9Sg" target="_PBuN0McbEeOenbI5XqwJvQ">
+ <children xmi:type="notation:DecorationNode" xmi:id="_1p56oMozEeO3DsHezUU9Sg" visible="false" type="6008">
+ <layoutConstraint xmi:type="notation:Location" xmi:id="_1p56ocozEeO3DsHezUU9Sg" y="40"/>
+ </children>
+ <children xmi:type="notation:DecorationNode" xmi:id="_1p6hsMozEeO3DsHezUU9Sg" visible="false" type="6033">
+ <layoutConstraint xmi:type="notation:Location" xmi:id="_1p6hscozEeO3DsHezUU9Sg" y="-20"/>
+ </children>
+ <styles xmi:type="notation:FontStyle" xmi:id="_1p5TkcozEeO3DsHezUU9Sg"/>
+ <element xmi:type="uml:Association" href="design.uml#_1pkjcMozEeO3DsHezUU9Sg"/>
+ <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_1p5TksozEeO3DsHezUU9Sg" points="[40, -7, -141, 0]$[165, -7, -16, 0]"/>
+ <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_1qHWAMozEeO3DsHezUU9Sg" id="(0.06584362139917696,0.5)"/>
+ </edges>
+ <edges xmi:type="notation:Connector" xmi:id="_2Py18MozEeO3DsHezUU9Sg" type="4011" source="_g3FzAMozEeO3DsHezUU9Sg" target="_QqrvsMcbEeOenbI5XqwJvQ">
+ <children xmi:type="notation:DecorationNode" xmi:id="_2PzdAMozEeO3DsHezUU9Sg" visible="false" type="6008">
+ <layoutConstraint xmi:type="notation:Location" xmi:id="_2PzdAcozEeO3DsHezUU9Sg" y="40"/>
+ </children>
+ <children xmi:type="notation:DecorationNode" xmi:id="_2P0EEMozEeO3DsHezUU9Sg" visible="false" type="6033">
+ <layoutConstraint xmi:type="notation:Location" xmi:id="_2P0EEcozEeO3DsHezUU9Sg" y="-20"/>
+ </children>
+ <styles xmi:type="notation:FontStyle" xmi:id="_2Py18cozEeO3DsHezUU9Sg"/>
+ <element xmi:type="uml:Association" href="design.uml#_2PwZsMozEeO3DsHezUU9Sg"/>
+ <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_2Py18sozEeO3DsHezUU9Sg" points="[40, 23, -164, -62]$[103, 61, -101, -24]$[166, 76, -38, -9]"/>
+ <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_2P7_4MozEeO3DsHezUU9Sg" id="(0.12837837837837837,0.7)"/>
+ </edges>
+ <edges xmi:type="notation:Connector" xmi:id="_2zKBsMozEeO3DsHezUU9Sg" type="4011" source="_g3FzAMozEeO3DsHezUU9Sg" target="_zqrN0MozEeO3DsHezUU9Sg">
+ <children xmi:type="notation:DecorationNode" xmi:id="_2zKowMozEeO3DsHezUU9Sg" visible="false" type="6008">
+ <layoutConstraint xmi:type="notation:Location" xmi:id="_2zLP0MozEeO3DsHezUU9Sg" y="40"/>
+ </children>
+ <children xmi:type="notation:DecorationNode" xmi:id="_2zLP0cozEeO3DsHezUU9Sg" visible="false" type="6033">
+ <layoutConstraint xmi:type="notation:Location" xmi:id="_2zL24MozEeO3DsHezUU9Sg" y="-20"/>
+ </children>
+ <styles xmi:type="notation:FontStyle" xmi:id="_2zKBscozEeO3DsHezUU9Sg"/>
+ <element xmi:type="uml:Association" href="design.uml#_2zHlcMozEeO3DsHezUU9Sg"/>
+ <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_2zKBssozEeO3DsHezUU9Sg" points="[24, 30, -258, -110]$[82, 102, -200, -38]$[216, 127, -66, -13]"/>
+ </edges>
+ <edges xmi:type="notation:Connector" xmi:id="_rvotEMo3EeOzTpunJ7qmNw" type="4011" source="_g3FzAMozEeO3DsHezUU9Sg" target="_l8-K4Mo3EeOzTpunJ7qmNw">
+ <children xmi:type="notation:DecorationNode" xmi:id="_rvpUIMo3EeOzTpunJ7qmNw" visible="false" type="6008">
+ <layoutConstraint xmi:type="notation:Location" xmi:id="_rvpUIco3EeOzTpunJ7qmNw" y="40"/>
+ </children>
+ <children xmi:type="notation:DecorationNode" xmi:id="_rvp7MMo3EeOzTpunJ7qmNw" visible="false" type="6033">
+ <layoutConstraint xmi:type="notation:Location" xmi:id="_rvp7Mco3EeOzTpunJ7qmNw" y="-20"/>
+ </children>
+ <styles xmi:type="notation:FontStyle" xmi:id="_rvotEco3EeOzTpunJ7qmNw"/>
+ <element xmi:type="uml:Association" href="design.uml#_rvVLEMo3EeOzTpunJ7qmNw"/>
+ <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_rvotEso3EeOzTpunJ7qmNw" points="[10, 30, -218, -199]$[54, 160, -174, -69]$[197, 216, -31, -13]"/>
+ <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_rvx3AMo3EeOzTpunJ7qmNw" id="(0.13777777777777778,0.6666666666666666)"/>
+ </edges>
+ </notation:Diagram>
+ <nattable:Table xmi:id="_1PpFsMohEeO3DsHezUU9Sg" name="RequirementTable" currentRowAxisProvider="_1PpFtcohEeO3DsHezUU9Sg" currentColumnAxisProvider="_1PpFscohEeO3DsHezUU9Sg">
+ <context xmi:type="uml:Model" href="design.uml#_lNLnYsbvEeO9CYUoXDRplw"/>
+ <owner xmi:type="uml:Model" href="design.uml#_lNLnYsbvEeO9CYUoXDRplw"/>
+ <prototype xmi:type="configuration:PapyrusSyncTable" href="platform:/plugin/org.eclipse.papyrus.infra.viewpoints.policy/builtin/default.configuration#_7wNb3txhEeOqHvRyiN87hA"/>
+ <tableConfiguration xmi:type="nattableconfiguration:TableConfiguration" href="platform:/plugin/org.eclipse.papyrus.sysml.nattable.requirement.config/configs/requirement.nattableconfiguration#/"/>
+ <columnAxisProvidersHistory xmi:type="nattableaxisprovider:SlaveObjectAxisProvider" xmi:id="_1PpFscohEeO3DsHezUU9Sg" description="Provides the columns of the tables with a default configuration" name="Requirements Feature Columns Provider">
+ <axis xmi:type="nattableaxis:FeatureIdAxis" xmi:id="_1PpFssohEeO3DsHezUU9Sg" element="property_of_stereotype:/SysML::Requirements::Requirement::id">
+ <manager xmi:type="nattableaxisconfiguration:AxisManagerRepresentation" href="platform:/plugin/org.eclipse.papyrus.sysml.nattable.requirement.config/configs/requirement.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.1"/>
+ </axis>
+ <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_1PpFs8ohEeO3DsHezUU9Sg">
+ <manager xmi:type="nattableaxisconfiguration:AxisManagerRepresentation" href="platform:/plugin/org.eclipse.papyrus.sysml.nattable.requirement.config/configs/requirement.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>
+ <element xmi:type="ecore:EAttribute" href="http://www.eclipse.org/uml2/5.0.0/UML#//NamedElement/name"/>
+ </axis>
+ <axis xmi:type="nattableaxis:FeatureIdAxis" xmi:id="_1PpFtMohEeO3DsHezUU9Sg" element="property_of_stereotype:/SysML::Requirements::Requirement::text">
+ <manager xmi:type="nattableaxisconfiguration:AxisManagerRepresentation" href="platform:/plugin/org.eclipse.papyrus.sysml.nattable.requirement.config/configs/requirement.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.1"/>
+ </axis>
+ </columnAxisProvidersHistory>
+ <rowAxisProvidersHistory xmi:type="nattableaxisprovider:MasterObjectAxisProvider" xmi:id="_1PpFtcohEeO3DsHezUU9Sg" description="Provides the requirements directly owned by the context of the table" name="Requirement Axis Provider" disconnectSlave="true"/>
+ </nattable:Table>
+ <notation:Diagram xmi:id="_pUh7UMrhEeOada-BlHQh_Q" type="PapyrusUMLComponentDiagram" name="ArchitectureOverview" measurementUnit="Pixel">
+ <children xmi:type="notation:Node" xmi:id="_JUmCkM7UEeOkpJkbnruUGQ" type="2002">
+ <children xmi:type="notation:DecorationNode" xmi:id="_JUmpoM7UEeOkpJkbnruUGQ" type="5004"/>
+ <children xmi:type="notation:BasicCompartment" xmi:id="_JUnQsM7UEeOkpJkbnruUGQ" type="7001">
+ <styles xmi:type="notation:TitleStyle" xmi:id="_JUnQsc7UEeOkpJkbnruUGQ"/>
+ <layoutConstraint xmi:type="notation:Bounds" xmi:id="_JUnQss7UEeOkpJkbnruUGQ"/>
+ </children>
+ <children xmi:type="notation:BasicCompartment" xmi:id="_JUwaoM7UEeOkpJkbnruUGQ" visible="false" type="AppliedStereotypeCompartment">
+ <styles xmi:type="notation:TitleStyle" xmi:id="_JUwaoc7UEeOkpJkbnruUGQ" showTitle="true"/>
+ <element xmi:type="ADL4Eclipse:Plugin" href="design.uml#_GhlIYM7UEeOkpJkbnruUGQ"/>
+ <layoutConstraint xmi:type="notation:Bounds" xmi:id="_JUwaos7UEeOkpJkbnruUGQ"/>
+ </children>
+ <children xmi:type="notation:BasicCompartment" xmi:id="_JUwao87UEeOkpJkbnruUGQ" type="compartment_shape_display">
+ <styles xmi:type="notation:TitleStyle" xmi:id="_JUwapM7UEeOkpJkbnruUGQ"/>
+ <layoutConstraint xmi:type="notation:Bounds" xmi:id="_JUwapc7UEeOkpJkbnruUGQ"/>
+ </children>
+ <children xmi:type="notation:Shape" xmi:id="_KzqooM7UEeOkpJkbnruUGQ" type="3069">
+ <children xmi:type="notation:DecorationNode" xmi:id="_Kzqoos7UEeOkpJkbnruUGQ" visible="false" type="5006">
+ <layoutConstraint xmi:type="notation:Location" xmi:id="_KzrPsM7UEeOkpJkbnruUGQ" x="132" y="43"/>
+ </children>
+ <children xmi:type="notation:DecorationNode" xmi:id="_Kzr2wM7UEeOkpJkbnruUGQ" visible="false" type="5007">
+ <layoutConstraint xmi:type="notation:Location" xmi:id="_Kzr2wc7UEeOkpJkbnruUGQ" x="25" y="-10"/>
+ </children>
+ <element xmi:type="uml:Port" href="design.uml#_Gs61sM7UEeOkpJkbnruUGQ"/>
+ <layoutConstraint xmi:type="notation:Bounds" xmi:id="_Kzqooc7UEeOkpJkbnruUGQ" x="-10" y="50"/>
+ </children>
+ <children xmi:type="notation:DecorationNode" xmi:id="_bDZGcAOtEeWytIRHPc2H8Q" type="6030">
+ <layoutConstraint xmi:type="notation:Location" xmi:id="_bDZGcQOtEeWytIRHPc2H8Q" y="5"/>
+ </children>
+ <styles xmi:type="notation:DescriptionStyle" xmi:id="_JUmCkc7UEeOkpJkbnruUGQ"/>
+ <styles xmi:type="notation:FontStyle" xmi:id="_JUmCks7U