Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPauline DEVILLE2017-03-10 09:08:18 +0000
committerJeremie Tatibouet2017-09-01 13:02:34 +0000
commitb3407283e0cf8fe9cfc13acd0d12bcbe2eb5fce6 (patch)
tree381375f28de67215da99964041c0183e8e6cf4e0 /plugins/uml
parent4f99ac85cda6a1e00d50bfdd22af6de1919f32d4 (diff)
downloadorg.eclipse.papyrus-b3407283e0cf8fe9cfc13acd0d12bcbe2eb5fce6.tar.gz
org.eclipse.papyrus-b3407283e0cf8fe9cfc13acd0d12bcbe2eb5fce6.tar.xz
org.eclipse.papyrus-b3407283e0cf8fe9cfc13acd0d12bcbe2eb5fce6.zip
Bug 376406 - [ActivityDiagram] Create a ReadStructuralFeatureAction or a
ReadSelfAction on an ActionInputPin of a ReadStructuralFeatureValueAction object pin is not possible Add fromAction in the property view of the ActionInputPin Change-Id: Ib696da1e9f6c8293389e62606844c03a047a3386 Signed-off-by: Pauline DEVILLE <pauline.deville@cea.fr>
Diffstat (limited to 'plugins/uml')
-rw-r--r--plugins/uml/properties/org.eclipse.papyrus.uml.properties/Model/UML/ui/SingleActionInputPin.xwt108
1 files changed, 55 insertions, 53 deletions
diff --git a/plugins/uml/properties/org.eclipse.papyrus.uml.properties/Model/UML/ui/SingleActionInputPin.xwt b/plugins/uml/properties/org.eclipse.papyrus.uml.properties/Model/UML/ui/SingleActionInputPin.xwt
index 5e248ffe8aa..0d113cb6ca0 100644
--- a/plugins/uml/properties/org.eclipse.papyrus.uml.properties/Model/UML/ui/SingleActionInputPin.xwt
+++ b/plugins/uml/properties/org.eclipse.papyrus.uml.properties/Model/UML/ui/SingleActionInputPin.xwt
@@ -1,54 +1,56 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<Composite xmlns="http://www.eclipse.org/xwt/presentation"
- xmlns:j="clr-namespace:java.lang" xmlns:ppe="clr-namespace:org.eclipse.papyrus.infra.properties.ui.widgets"
- xmlns:ppel="clr-namespace:org.eclipse.papyrus.infra.properties.ui.widgets.layout"
- xmlns:uml="clr-namespace:org.eclipse.papyrus.uml.properties.widgets"
- xmlns:x="http://www.eclipse.org/xwt">
- <Composite.layout>
- <ppel:PropertiesLayout></ppel:PropertiesLayout>
- </Composite.layout>
- <Composite>
- <Composite.layout>
- <ppel:PropertiesLayout></ppel:PropertiesLayout>
- </Composite.layout>
- <ppe:StringEditor input="{Binding}" property="UML:NamedElement:name"></ppe:StringEditor>
- <ppe:StringEditor input="{Binding}" property="UML:NamedElement:label"></ppe:StringEditor>
- </Composite>
- <Composite>
- <Composite.layout>
- <ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout>
- </Composite.layout>
- <ppe:BooleanRadio input="{Binding}" property="UML:Pin:isControl"></ppe:BooleanRadio>
- <ppe:BooleanRadio input="{Binding}"
- property="UML:ObjectNode:isControlType"></ppe:BooleanRadio>
- <ppe:BooleanRadio input="{Binding}"
- property="UML:MultiplicityElement:isOrdered"></ppe:BooleanRadio>
- <ppe:BooleanRadio input="{Binding}"
- property="UML:MultiplicityElement:isUnique"></ppe:BooleanRadio>
- </Composite>
- <Composite>
- <Composite.layout>
- <ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout>
- </Composite.layout>
- <ppe:EnumCombo input="{Binding}" property="UML:ObjectNode:ordering"></ppe:EnumCombo>
- <ppe:EnumCombo input="{Binding}" property="UML:NamedElement:visibility"></ppe:EnumCombo>
- </Composite>
- <Composite>
- <Composite.layout>
- <ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout>
- </Composite.layout>
- <uml:MultiplicityDialog input="{Binding}"
- property="Multiplicity:multiplicity"></uml:MultiplicityDialog>
- <ppe:ReferenceDialog input="{Binding}"
- property="UML:ObjectNode:selection"></ppe:ReferenceDialog>
- <ppe:ReferenceDialog input="{Binding}" property="UML:TypedElement:type"></ppe:ReferenceDialog>
- <ppe:ReferenceDialog input="{Binding}"
- property="UML:ObjectNode:upperBound"></ppe:ReferenceDialog>
- </Composite>
- <Composite>
- <Composite.layout>
- <ppel:PropertiesLayout></ppel:PropertiesLayout>
- </Composite.layout>
- <ppe:MultiReference input="{Binding}" property="UML:ObjectNode:inState"></ppe:MultiReference>
- </Composite>
+<?xml version="1.0" encoding="UTF-8"?>
+<Composite xmlns="http://www.eclipse.org/xwt/presentation"
+ xmlns:j="clr-namespace:java.lang" xmlns:ppe="clr-namespace:org.eclipse.papyrus.infra.properties.ui.widgets"
+ xmlns:ppel="clr-namespace:org.eclipse.papyrus.infra.properties.ui.widgets.layout"
+ xmlns:uml="clr-namespace:org.eclipse.papyrus.uml.properties.widgets"
+ xmlns:x="http://www.eclipse.org/xwt">
+ <Composite.layout>
+ <ppel:PropertiesLayout></ppel:PropertiesLayout>
+ </Composite.layout>
+ <Composite>
+ <Composite.layout>
+ <ppel:PropertiesLayout></ppel:PropertiesLayout>
+ </Composite.layout>
+ <ppe:StringEditor input="{Binding}" property="UML:NamedElement:name"></ppe:StringEditor>
+ <ppe:StringEditor input="{Binding}" property="UML:NamedElement:label"></ppe:StringEditor>
+ </Composite>
+ <Composite>
+ <Composite.layout>
+ <ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout>
+ </Composite.layout>
+ <ppe:BooleanRadio input="{Binding}" property="UML:Pin:isControl"></ppe:BooleanRadio>
+ <ppe:BooleanRadio input="{Binding}"
+ property="UML:ObjectNode:isControlType"></ppe:BooleanRadio>
+ <ppe:BooleanRadio input="{Binding}"
+ property="UML:MultiplicityElement:isOrdered"></ppe:BooleanRadio>
+ <ppe:BooleanRadio input="{Binding}"
+ property="UML:MultiplicityElement:isUnique"></ppe:BooleanRadio>
+ </Composite>
+ <Composite>
+ <Composite.layout>
+ <ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout>
+ </Composite.layout>
+ <ppe:EnumCombo input="{Binding}" property="UML:ObjectNode:ordering"></ppe:EnumCombo>
+ <ppe:EnumCombo input="{Binding}" property="UML:NamedElement:visibility"></ppe:EnumCombo>
+ </Composite>
+ <Composite>
+ <Composite.layout>
+ <ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout>
+ </Composite.layout>
+ <uml:MultiplicityDialog input="{Binding}"
+ property="Multiplicity:multiplicity"></uml:MultiplicityDialog>
+ <ppe:ReferenceDialog input="{Binding}"
+ property="UML:ObjectNode:selection"></ppe:ReferenceDialog>
+ <ppe:ReferenceDialog input="{Binding}" property="UML:TypedElement:type"></ppe:ReferenceDialog>
+ <ppe:ReferenceDialog input="{Binding}"
+ property="UML:ObjectNode:upperBound"></ppe:ReferenceDialog>
+ <ppe:ReferenceDialog property="UML:ActionInputPin:fromAction"
+ input="{Binding}"></ppe:ReferenceDialog>
+ </Composite>
+ <Composite>
+ <Composite.layout>
+ <ppel:PropertiesLayout></ppel:PropertiesLayout>
+ </Composite.layout>
+ <ppe:MultiReference input="{Binding}" property="UML:ObjectNode:inState"></ppe:MultiReference>
+ </Composite>
</Composite> \ No newline at end of file

Back to the top