Bug 580826: [Sirius][CompositeStructureDiagram] Uniformize DnD
Bug: https://bugs.eclipse.org/bugs/show_bug.cgi?id=580826
Change-Id: I30aa77488e07cbdda5cbfde266c6a9b8b2073fad
Signed-off-by: Gwendal Daniel <gwendal.daniel@obeosoft.com>
diff --git a/plugins/uml/org.eclipse.papyrus.sirius.uml.diagram.compositestructure/description/papyrus_compositestructure.odesign b/plugins/uml/org.eclipse.papyrus.sirius.uml.diagram.compositestructure/description/papyrus_compositestructure.odesign
index 5ae2279..510ea4f 100644
--- a/plugins/uml/org.eclipse.papyrus.sirius.uml.diagram.compositestructure/description/papyrus_compositestructure.odesign
+++ b/plugins/uml/org.eclipse.papyrus.sirius.uml.diagram.compositestructure/description/papyrus_compositestructure.odesign
@@ -752,7 +752,7 @@
</ownedTools>
</toolSections>
<toolSections name="SemanticDrop">
- <ownedTools xsi:type="tool:ContainerDropDescription" name="SemanticAbstractionDrop" precondition="aql:self.oclIsTypeOf(uml::Abstraction) and self.canDragAndDropSemanticCSD(newContainer)" dragSource="PROJECT_EXPLORER">
+ <ownedTools xsi:type="tool:ContainerDropDescription" name="SemanticAbstractionDrop" precondition="aql:self.oclIsTypeOf(uml::Abstraction)" dragSource="PROJECT_EXPLORER">
<oldContainer name="oldSemanticContainer"/>
<newContainer name="newSemanticContainer"/>
<element name="element"/>
@@ -806,7 +806,7 @@
<firstModelOperations xsi:type="tool_1:ChangeContext" browseExpression="aql:element.dragAndDropSemanticCSD(newContainerView)"/>
</initialOperation>
</ownedTools>
- <ownedTools xsi:type="tool:ContainerDropDescription" name="SemanticConnectorDrop" precondition="aql:self.oclIsTypeOf(uml::Connector) and self.canDragAndDropSemanticCSD(newContainer)" dragSource="PROJECT_EXPLORER">
+ <ownedTools xsi:type="tool:ContainerDropDescription" name="SemanticConnectorDrop" precondition="aql:self.oclIsTypeOf(uml::Connector)" dragSource="PROJECT_EXPLORER">
<oldContainer name="oldSemanticContainer"/>
<newContainer name="newSemanticContainer"/>
<element name="element"/>
@@ -824,7 +824,7 @@
<firstModelOperations xsi:type="tool_1:ChangeContext" browseExpression="aql:element.dragAndDropSemanticCSD(newContainerView)"/>
</initialOperation>
</ownedTools>
- <ownedTools xsi:type="tool:ContainerDropDescription" name="SemanticDependencyDrop" precondition="aql:self.oclIsTypeOf(uml::Dependency) and self.canDragAndDropSemanticCSD(newContainer)" dragSource="PROJECT_EXPLORER">
+ <ownedTools xsi:type="tool:ContainerDropDescription" name="SemanticDependencyDrop" precondition="aql:self.oclIsTypeOf(uml::Dependency)" dragSource="PROJECT_EXPLORER">
<oldContainer name="oldSemanticContainer"/>
<newContainer name="newSemanticContainer"/>
<element name="element"/>
@@ -842,7 +842,7 @@
<firstModelOperations xsi:type="tool_1:ChangeContext" browseExpression="aql:element.dragAndDropSemanticCSD(newContainerView)"/>
</initialOperation>
</ownedTools>
- <ownedTools xsi:type="tool:ContainerDropDescription" name="SemanticGeneralizationDrop" precondition="aql:self.oclIsTypeOf(uml::Generalization) and self.canDragAndDropSemanticCSD(newContainer)" dragSource="PROJECT_EXPLORER">
+ <ownedTools xsi:type="tool:ContainerDropDescription" name="SemanticGeneralizationDrop" precondition="aql:self.oclIsTypeOf(uml::Generalization)" dragSource="PROJECT_EXPLORER">
<oldContainer name="oldSemanticContainer"/>
<newContainer name="newSemanticContainer"/>
<element name="element"/>
@@ -851,7 +851,7 @@
<firstModelOperations xsi:type="tool_1:ChangeContext" browseExpression="aql:element.dragAndDropSemanticCSD(newContainerView)"/>
</initialOperation>
</ownedTools>
- <ownedTools xsi:type="tool:ContainerDropDescription" name="SemanticInformationFlowDrop" precondition="aql:self.oclIsTypeOf(uml::InformationFlow) and self.canDragAndDropSemanticCSD(newContainer)" dragSource="PROJECT_EXPLORER">
+ <ownedTools xsi:type="tool:ContainerDropDescription" name="SemanticInformationFlowDrop" precondition="aql:self.oclIsTypeOf(uml::InformationFlow)" dragSource="PROJECT_EXPLORER">
<oldContainer name="oldSemanticContainer"/>
<newContainer name="newSemanticContainer"/>
<element name="element"/>
@@ -878,7 +878,7 @@
<firstModelOperations xsi:type="tool_1:ChangeContext" browseExpression="aql:element.dragAndDropSemanticCSD(newContainerView)"/>
</initialOperation>
</ownedTools>
- <ownedTools xsi:type="tool:ContainerDropDescription" name="SemanticManifestationDrop" precondition="aql:self.oclIsTypeOf(uml::Manifestation) and self.canDragAndDropSemanticCSD(newContainer)" dragSource="PROJECT_EXPLORER">
+ <ownedTools xsi:type="tool:ContainerDropDescription" name="SemanticManifestationDrop" precondition="aql:self.oclIsTypeOf(uml::Manifestation)" dragSource="PROJECT_EXPLORER">
<oldContainer name="oldSemanticContainer"/>
<newContainer name="newSemanticContainer"/>
<element name="element"/>
@@ -932,7 +932,7 @@
<firstModelOperations xsi:type="tool_1:ChangeContext" browseExpression="aql:element.dragAndDropSemanticCSD(newContainerView)"/>
</initialOperation>
</ownedTools>
- <ownedTools xsi:type="tool:ContainerDropDescription" name="SemanticRealizationDrop" precondition="aql:self.oclIsTypeOf(uml::Realization) and self.canDragAndDropSemanticCSD(newContainer)" dragSource="PROJECT_EXPLORER">
+ <ownedTools xsi:type="tool:ContainerDropDescription" name="SemanticRealizationDrop" precondition="aql:self.oclIsTypeOf(uml::Realization)" dragSource="PROJECT_EXPLORER">
<oldContainer name="oldSemanticContainer"/>
<newContainer name="newSemanticContainer"/>
<element name="element"/>
@@ -950,7 +950,7 @@
<firstModelOperations xsi:type="tool_1:ChangeContext" browseExpression="aql:element.dragAndDropSemanticCSD(newContainerView)"/>
</initialOperation>
</ownedTools>
- <ownedTools xsi:type="tool:ContainerDropDescription" name="SemanticSubstitutionDrop" precondition="aql:self.oclIsTypeOf(uml::Substitution) and self.canDragAndDropSemanticCSD(newContainer)" dragSource="PROJECT_EXPLORER">
+ <ownedTools xsi:type="tool:ContainerDropDescription" name="SemanticSubstitutionDrop" precondition="aql:self.oclIsTypeOf(uml::Substitution)" dragSource="PROJECT_EXPLORER">
<oldContainer name="oldSemanticContainer"/>
<newContainer name="newSemanticContainer"/>
<element name="element"/>
@@ -968,7 +968,7 @@
<firstModelOperations xsi:type="tool_1:ChangeContext" browseExpression="aql:element.dragAndDropSemanticCSD(newContainerView)"/>
</initialOperation>
</ownedTools>
- <ownedTools xsi:type="tool:ContainerDropDescription" name="SemanticUsageDrop" precondition="aql:self.oclIsTypeOf(uml::Usage) and self.canDragAndDropSemanticCSD(newContainer)" dragSource="PROJECT_EXPLORER">
+ <ownedTools xsi:type="tool:ContainerDropDescription" name="SemanticUsageDrop" precondition="aql:self.oclIsTypeOf(uml::Usage)" dragSource="PROJECT_EXPLORER">
<oldContainer name="oldSemanticContainer"/>
<newContainer name="newSemanticContainer"/>
<element name="element"/>
