401580: Ports should show conjugated symbol (~) before type in label

https://bugs.eclipse.org/bugs/show_bug.cgi?id=401580

2 files changed, 13 insertions, 10 deletions

diff --git a/plugins/uml/properties/org.eclipse.papyrus.uml.properties/Model/UML/ui/MultiplePort.xwt b/plugins/uml/properties/org.eclipse.papyrus.uml.properties/Model/UML/ui/MultiplePort.xwt
index 7cedda96442..a02598d88d5 100644
--- a/plugins/uml/properties/org.eclipse.papyrus.uml.properties/Model/UML/ui/MultiplePort.xwt
+++ b/plugins/uml/properties/org.eclipse.papyrus.uml.properties/Model/UML/ui/MultiplePort.xwt
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>

-<Composite xmlns:ppe="clr-namespace:org.eclipse.papyrus.views.properties.widgets"

-	xmlns:x="http://www.eclipse.org/xwt" xmlns:j="clr-namespace:java.lang"

+<Composite xmlns:j="clr-namespace:java.lang" xmlns="http://www.eclipse.org/xwt/presentation"

+	xmlns:ppe="clr-namespace:org.eclipse.papyrus.views.properties.widgets"

 	xmlns:ppel="clr-namespace:org.eclipse.papyrus.views.properties.widgets.layout"

-	xmlns="http://www.eclipse.org/xwt/presentation">

+	xmlns:x="http://www.eclipse.org/xwt">

 	<Composite.layout>

 		<ppel:PropertiesLayout></ppel:PropertiesLayout>

 	</Composite.layout>

@@ -23,12 +23,14 @@
 		<ppe:BooleanRadio input="{Binding}" property="UML:Feature:isStatic"></ppe:BooleanRadio>

 		<ppe:BooleanRadio input="{Binding}"

 			property="UML:MultiplicityElement:isUnique"></ppe:BooleanRadio>

+		<ppe:BooleanRadio property="UML:Port:isConjugated"

+			input="{Binding}"></ppe:BooleanRadio>

 	</Composite>

 	<Composite>

 		<Composite.layout>

 			<ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout>

 		</Composite.layout>

-		<ppe:BooleanRadio input="{Binding}" property="UML:Property:aggregation"></ppe:BooleanRadio>

+		<ppe:EnumCombo input="{Binding}" property="UML:Property:aggregation"></ppe:EnumCombo>

 		<ppe:EnumCombo input="{Binding}" property="UML:NamedElement:visibility"></ppe:EnumCombo>

 	</Composite>

 </Composite>
\ No newline at end of file
diff --git a/plugins/uml/properties/org.eclipse.papyrus.uml.properties/Model/UML/ui/SinglePort.xwt b/plugins/uml/properties/org.eclipse.papyrus.uml.properties/Model/UML/ui/SinglePort.xwt
index 729ef6945c1..3d698e2651d 100644
--- a/plugins/uml/properties/org.eclipse.papyrus.uml.properties/Model/UML/ui/SinglePort.xwt
+++ b/plugins/uml/properties/org.eclipse.papyrus.uml.properties/Model/UML/ui/SinglePort.xwt
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>

-<Composite xmlns:uml="clr-namespace:org.eclipse.papyrus.uml.properties.widgets"

+<Composite xmlns="http://www.eclipse.org/xwt/presentation"

 	xmlns:ppe="clr-namespace:org.eclipse.papyrus.views.properties.widgets"

-	xmlns:ppel="clr-namespace:org.eclipse.papyrus.views.properties.widgets.layout"

-	xmlns:j="clr-namespace:java.lang" xmlns="http://www.eclipse.org/xwt/presentation"

-	xmlns:x="http://www.eclipse.org/xwt">

+	xmlns:uml="clr-namespace:org.eclipse.papyrus.uml.properties.widgets"

+	xmlns:x="http://www.eclipse.org/xwt" xmlns:j="clr-namespace:java.lang"

+	xmlns:ppel="clr-namespace:org.eclipse.papyrus.views.properties.widgets.layout">

 	<Composite.layout>

 		<ppel:PropertiesLayout></ppel:PropertiesLayout>

 	</Composite.layout>

@@ -25,6 +25,8 @@
 		<ppe:BooleanRadio input="{Binding}"

 			property="UML:MultiplicityElement:isOrdered"></ppe:BooleanRadio>

 		<ppe:BooleanRadio input="{Binding}" property="UML:Port:isService"></ppe:BooleanRadio>

+		<ppe:BooleanRadio property="UML:Port:isConjugated"

+			input="{Binding}"></ppe:BooleanRadio>

 	</Composite>

 	<Composite>

 		<Composite.layout>

@@ -39,8 +41,7 @@
 		<ppe:ReferenceDialog input="{Binding}"

 			property="UML:Property:defaultValue"></ppe:ReferenceDialog>

 		<ppe:StringCombo input="{Binding}" property="Multiplicity:multiplicity"></ppe:StringCombo>

-		<ppe:ReferenceDialog property="UML:TypedElement:type"

-			input="{Binding}"></ppe:ReferenceDialog>

+		<ppe:ReferenceDialog input="{Binding}" property="UML:TypedElement:type"></ppe:ReferenceDialog>

 	</Composite>

 	<Composite>

 		<Composite.layout>