344857: [class diagram] too restricted mutliplicity values in property view

https://bugs.eclipse.org/bugs/show_bug.cgi?id=344857
author: cletavernie 2011-07-13 09:10:39 +0000
committer: cletavernie 2011-07-13 09:10:39 +0000
commit: 0380239f0c2d9240bc9f1c56c15684a6290dbd71 (patch)
tree: 8c66d07dc6d76e4042ef2458d0b880598010e4e6
parent: 823754baef9ba1619e46abfa53f694112c2edafd (diff)
download: org.eclipse.papyrus-0380239f0c2d9240bc9f1c56c15684a6290dbd71.tar.gz
org.eclipse.papyrus-0380239f0c2d9240bc9f1c56c15684a6290dbd71.tar.xz
org.eclipse.papyrus-0380239f0c2d9240bc9f1c56c15684a6290dbd71.zip
32 files changed, 338 insertions, 63 deletions
diff --git a/plugins/core/org.eclipse.papyrus.properties/model/Environment.xmi b/plugins/core/org.eclipse.papyrus.properties/model/Environment.xmi
index 8f6f0b34c32..67104a9bcfc 100644
--- a/plugins/core/org.eclipse.papyrus.properties/model/Environment.xmi
+++ b/plugins/core/org.eclipse.papyrus.properties/model/Environment.xmi
@@ -11,6 +11,7 @@
   <propertyEditorTypes label="StringEditor" widgetClass="StringEditor" namespace="//@namespaces.3"/>
   <propertyEditorTypes label="StringMultiline" widgetClass="StringMultiline" namespace="//@namespaces.3"/>
   <propertyEditorTypes label="StringLabel (Read-only)" widgetClass="StringLabel" namespace="//@namespaces.3"/>
+  <propertyEditorTypes label="StringCombo" widgetClass="StringCombo" namespace="//@namespaces.3"/>
   <propertyEditorTypes label="FileSelector" widgetClass="StringFileSelector" namespace="//@namespaces.3"/>
   <propertyEditorTypes label="BooleanCombo" widgetClass="BooleanCombo" namespace="//@namespaces.3" type="Boolean"/>
   <propertyEditorTypes label="BooleanCheckbox" widgetClass="BooleanCheckbox" namespace="//@namespaces.3" type="Boolean"/>
diff --git a/plugins/core/org.eclipse.papyrus.properties/src/org/eclipse/papyrus/properties/widgets/AbstractPropertyEditor.java b/plugins/core/org.eclipse.papyrus.properties/src/org/eclipse/papyrus/properties/widgets/AbstractPropertyEditor.java
index 71f67c8a4da..d38029d6697 100644
--- a/plugins/core/org.eclipse.papyrus.properties/src/org/eclipse/papyrus/properties/widgets/AbstractPropertyEditor.java
+++ b/plugins/core/org.eclipse.papyrus.properties/src/org/eclipse/papyrus/properties/widgets/AbstractPropertyEditor.java
@@ -1,6 +1,6 @@
 /*****************************************************************************
  * Copyright (c) 2010 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
@@ -153,7 +153,12 @@ public abstract class AbstractPropertyEditor implements IChangeListener {
 	protected void checkInput() {
 		if(propertyPath != null && input != null) {
 			isEditable = input.isEditable(propertyPath);
-			doBinding();
+			try {
+				doBinding();
+			} catch (Exception ex) {
+				//TODO : Handle the exception here. Display something ?
+				Activator.log.error(ex);
+			}
 			updateLabel();
 		}
 	}
diff --git a/plugins/core/org.eclipse.papyrus.properties/src/org/eclipse/papyrus/properties/widgets/StringCombo.java b/plugins/core/org.eclipse.papyrus.properties/src/org/eclipse/papyrus/properties/widgets/StringCombo.java
new file mode 100644
index 00000000000..d26cdaf3cc7
--- /dev/null
+++ b/plugins/core/org.eclipse.papyrus.properties/src/org/eclipse/papyrus/properties/widgets/StringCombo.java
@@ -0,0 +1,33 @@
+package org.eclipse.papyrus.properties.widgets;
+
+import org.eclipse.jface.viewers.ILabelProvider;
+import org.eclipse.papyrus.widgets.providers.IStaticContentProvider;
+import org.eclipse.swt.widgets.Composite;
+
+/**
+ * A Property Editor for editing a String with an editable combo.
+ * The combo proposes a set of default values.
+ * 
+ * @author Camille Letavernier
+ */
+public class StringCombo extends AbstractPropertyEditor {
+
+	protected org.eclipse.papyrus.widgets.editors.StringCombo editor;
+
+	public StringCombo(Composite parent, int style) {
+		editor = new org.eclipse.papyrus.widgets.editors.StringCombo(parent, style);
+		super.setEditor(editor);
+	}
+
+	@Override
+	public void doBinding() {
+		IStaticContentProvider contentProvider = input.getContentProvider(propertyPath);
+		editor.setContentProvider(contentProvider);
+
+		ILabelProvider labelProvider = input.getLabelProvider(propertyPath);
+		if(labelProvider != null) {
+			editor.setLabelProvider(labelProvider);
+		}
+		super.doBinding();
+	}
+}
diff --git a/plugins/core/org.eclipse.papyrus.widgets/src/org/eclipse/papyrus/widgets/editors/ReferenceCombo.java b/plugins/core/org.eclipse.papyrus.widgets/src/org/eclipse/papyrus/widgets/editors/ReferenceCombo.java
index b1e62a374d6..5275f271229 100644
--- a/plugins/core/org.eclipse.papyrus.widgets/src/org/eclipse/papyrus/widgets/editors/ReferenceCombo.java
+++ b/plugins/core/org.eclipse.papyrus.widgets/src/org/eclipse/papyrus/widgets/editors/ReferenceCombo.java
@@ -1,6 +1,6 @@
 /*****************************************************************************
  * Copyright (c) 2010 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
@@ -43,14 +43,14 @@ public class ReferenceCombo extends AbstractValueEditor implements SelectionList
 	/**
 	 * The viewer displaying the available values from the model
 	 */
-	private ComboViewer viewer;
+	protected ComboViewer viewer;
 
 	/**
 	 * The combo used to select the reference
 	 */
-	private CCombo combo;
+	protected CCombo combo;
 
-	private boolean unsettable;
+	protected boolean unsettable;
 
 	protected Button unset;
 
diff --git a/plugins/core/org.eclipse.papyrus.widgets/src/org/eclipse/papyrus/widgets/editors/StringCombo.java b/plugins/core/org.eclipse.papyrus.widgets/src/org/eclipse/papyrus/widgets/editors/StringCombo.java
new file mode 100644
index 00000000000..a4c5f20bee5
--- /dev/null
+++ b/plugins/core/org.eclipse.papyrus.widgets/src/org/eclipse/papyrus/widgets/editors/StringCombo.java
@@ -0,0 +1,131 @@
+package org.eclipse.papyrus.widgets.editors;
+
+import org.eclipse.core.databinding.observable.value.AbstractObservableValue;
+import org.eclipse.core.databinding.observable.value.ValueDiff;
+import org.eclipse.papyrus.widgets.providers.EncapsulatedContentProvider;
+import org.eclipse.papyrus.widgets.providers.IStaticContentProvider;
+import org.eclipse.swt.SWT;
+import org.eclipse.swt.events.FocusEvent;
+import org.eclipse.swt.events.FocusListener;
+import org.eclipse.swt.events.KeyEvent;
+import org.eclipse.swt.events.KeyListener;
+import org.eclipse.swt.events.SelectionEvent;
+import org.eclipse.swt.events.SelectionListener;
+import org.eclipse.swt.widgets.Composite;
+
+/**
+ * A Widget for editing a String with an editable combo.
+ * The combo proposes a set of default values.
+ * 
+ * @author Camille Letavernier
+ */
+public class StringCombo extends ReferenceCombo {
+
+	public StringCombo(Composite parent, int style) {
+		super(parent, style);
+		combo.setEditable(true);
+	}
+
+	public StringCombo(Composite parent, int style, String label) {
+		super(parent, style, label);
+	}
+
+	@Override
+	public Object getEditableType() {
+		return String.class;
+	}
+
+	/**
+	 * Sets the content provider for this combo. The Content provider should
+	 * specify the objects that can be referred by this property
+	 * 
+	 * @param provider
+	 */
+	@Override
+	public void setContentProvider(IStaticContentProvider provider) {
+		if(provider != null) {
+			viewer.setContentProvider(new EncapsulatedContentProvider(provider));
+			viewer.setInput(""); //$NON-NLS-1$
+		}
+
+		setWidgetObservable(new CComboObservableValue());
+	}
+
+	class CComboObservableValue extends AbstractObservableValue implements SelectionListener, KeyListener, FocusListener {
+
+		private String previousValue;
+
+		public CComboObservableValue() {
+			previousValue = combo.getText();
+			combo.addSelectionListener(this); //Selection change
+			combo.addKeyListener(this); //Enter pressed
+			combo.addFocusListener(this); //Focus lost
+		}
+
+		public Object getValueType() {
+			return String.class;
+		}
+
+		@Override
+		protected String doGetValue() {
+			return combo.getText();
+		}
+
+		@Override
+		protected void doSetValue(Object value) {
+			if(value instanceof String) {
+				previousValue = combo.getText();
+				combo.setText((String)value);
+			}
+		}
+
+		//Enter pressed
+		public void keyReleased(KeyEvent e) {
+			if((e.keyCode == SWT.CR || e.keyCode == SWT.KEYPAD_CR) && e.stateMask == SWT.NONE) {
+				doFireChange();
+				e.doit = false; //Stops the propagation of the event
+			}
+		}
+
+		//Selection change
+		public void widgetSelected(SelectionEvent e) {
+			doFireChange();
+		}
+
+		//Focus lost
+		public void focusLost(FocusEvent e) {
+			doFireChange();
+		}
+
+		private void doFireChange() {
+			final String oldValue = previousValue;
+			final String currentValue = previousValue = doGetValue();
+			fireValueChange(new ValueDiff() {
+
+				@Override
+				public Object getOldValue() {
+					return oldValue;
+				}
+
+				@Override
+				public Object getNewValue() {
+					return currentValue;
+				}
+			});
+		}
+
+		public void widgetDefaultSelected(SelectionEvent e) {
+			//Nothing
+		}
+
+		public void focusGained(FocusEvent e) {
+			//Nothing
+		}
+
+		public void keyPressed(KeyEvent e) {
+			//Nothing
+		}
+
+	}
+
+}
diff --git a/plugins/core/org.eclipse.papyrus.widgets/src/org/eclipse/papyrus/widgets/editors/StringEditor.java b/plugins/core/org.eclipse.papyrus.widgets/src/org/eclipse/papyrus/widgets/editors/StringEditor.java
index 724cf79598b..e99cd52f558 100644
--- a/plugins/core/org.eclipse.papyrus.widgets/src/org/eclipse/papyrus/widgets/editors/StringEditor.java
+++ b/plugins/core/org.eclipse.papyrus.widgets/src/org/eclipse/papyrus/widgets/editors/StringEditor.java
@@ -119,7 +119,6 @@ public class StringEditor extends AbstractValueEditor implements KeyListener {
 		if((e.keyCode == SWT.CR || e.keyCode == SWT.KEYPAD_CR) && e.stateMask == SWT.NONE) {
 			notifyChange();
 			e.doit = false; //Stops the propagation of the event
-			System.out.println("Stop event");
 		}
 	}
 
diff --git a/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/UML.ctx b/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/UML.ctx
index 2e3a416c954..575862b55c8 100644
--- a/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/UML.ctx
+++ b/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/UML.ctx
@@ -5280,12 +5280,12 @@
     <modelElementFactory href="ppe:/environment/org.eclipse.papyrus.properties.uml/Model/Environment.xmi#//@modelElementFactories.0"/>
   </dataContexts>
   <dataContexts name="Multiplicity" label="Multiplicity">
-    <properties name="multiplicity" label="Multiplicity" type="Enumeration"/>
+    <properties name="multiplicity" label="Multiplicity"/>
     <modelElementFactory href="ppe:/environment/org.eclipse.papyrus.properties.uml/Model/Environment.xmi#//@modelElementFactories.0"/>
   </dataContexts>
   <dataContexts name="StereotypeApplication" label="Stereotype application">
-    <properties name="stereotypeApplication" label="" type="Reference" multiplicity="-1"/>
-    <properties name="profileApplication" type="Reference" multiplicity="-1"/>
+    <properties name="stereotypeApplication" label="Stereotype application" type="Reference" multiplicity="-1"/>
+    <properties name="profileApplication" label="Profile application" type="Reference" multiplicity="-1"/>
     <modelElementFactory href="ppe:/environment/org.eclipse.papyrus.properties.uml/Model/Environment.xmi#//@modelElementFactories.3"/>
   </dataContexts>
   <dataContexts name="CustomImage" label="Custom Image">
diff --git a/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/MemberEnd.xwt b/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/MemberEnd.xwt
index 5cb05e46fb0..e241ebb11e3 100644
--- a/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/MemberEnd.xwt
+++ b/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/MemberEnd.xwt
@@ -1,2 +1,19 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<Group xmlns:ppel="clr-namespace:org.eclipse.papyrus.properties.widgets.layout" xmlns="http://www.eclipse.org/xwt/presentation" xmlns:j="clr-namespace:java.lang" xmlns:x="http://www.eclipse.org/xwt" xmlns:ppe="clr-namespace:org.eclipse.papyrus.properties.widgets" text="Member End"><Group.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Group.layout><Composite><Composite.layout><ppel:PropertiesLayout numColumns="1"></ppel:PropertiesLayout></Composite.layout><ppe:StringEditor input="{Binding}" property="UML:NamedElement:name"></ppe:StringEditor><ppe:EnumCombo input="{Binding}" property="MemberEnd:owner"></ppe:EnumCombo><ppe:BooleanRadio input="{Binding}" property="MemberEnd:navigable"></ppe:BooleanRadio><ppe:EnumCombo input="{Binding}" property="UML:Property:aggregation"></ppe:EnumCombo><ppe:EnumCombo input="{Binding}" property="Multiplicity:multiplicity"></ppe:EnumCombo></Composite></Group>
-\ No newline at end of file
+<Group xmlns:ppel="clr-namespace:org.eclipse.papyrus.properties.widgets.layout"
+	xmlns="http://www.eclipse.org/xwt/presentation" xmlns:j="clr-namespace:java.lang"
+	xmlns:x="http://www.eclipse.org/xwt" xmlns:ppe="clr-namespace:org.eclipse.papyrus.properties.widgets"
+	text="Member End">
+	<Group.layout>
+		<ppel:PropertiesLayout></ppel:PropertiesLayout>
+	</Group.layout>
+	<Composite>
+		<Composite.layout>
+			<ppel:PropertiesLayout numColumns="1"></ppel:PropertiesLayout>
+		</Composite.layout>
+		<ppe:StringEditor input="{Binding}" property="UML:NamedElement:name"></ppe:StringEditor>
+		<ppe:EnumCombo input="{Binding}" property="MemberEnd:owner"></ppe:EnumCombo>
+		<ppe:BooleanRadio input="{Binding}" property="MemberEnd:navigable"></ppe:BooleanRadio>
+		<ppe:EnumCombo input="{Binding}" property="UML:Property:aggregation"></ppe:EnumCombo>
+		<ppe:StringCombo input="{Binding}" property="Multiplicity:multiplicity"></ppe:StringCombo>
+	</Composite>
+</Group>
+\ No newline at end of file
diff --git a/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/MultipleElementImport.xwt b/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/MultipleElementImport.xwt
index 593c9174927..61afd6bb788 100644
--- a/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/MultipleElementImport.xwt
+++ b/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/MultipleElementImport.xwt
@@ -1,2 +1,2 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<Composite xmlns="http://www.eclipse.org/xwt/presentation" xmlns:j="clr-namespace:java.lang" xmlns:x="http://www.eclipse.org/xwt" xmlns:ppel="clr-namespace:org.eclipse.papyrus.properties.widgets.layout" xmlns:ppe="clr-namespace:org.eclipse.papyrus.properties.widgets"><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:EnumCombo input="{Binding}" property="UML:ElementImport:visibility"></ppe:EnumCombo></Composite></Composite>
-\ No newline at end of file
+<Composite xmlns:ppe="clr-namespace:org.eclipse.papyrus.properties.widgets" xmlns:j="clr-namespace:java.lang" xmlns="http://www.eclipse.org/xwt/presentation" xmlns:x="http://www.eclipse.org/xwt" xmlns:ppel="clr-namespace:org.eclipse.papyrus.properties.widgets.layout"><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:EnumCombo input="{Binding}" property="UML:ElementImport:visibility"></ppe:EnumCombo></Composite></Composite>
+\ No newline at end of file
diff --git a/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/MultiplePackage.xwt b/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/MultiplePackage.xwt
index c848b8cc6a2..bfa0bace918 100644
--- a/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/MultiplePackage.xwt
+++ b/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/MultiplePackage.xwt
@@ -1,2 +1,2 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<Composite xmlns:ppel="clr-namespace:org.eclipse.papyrus.properties.widgets.layout" xmlns:x="http://www.eclipse.org/xwt" xmlns:j="clr-namespace:java.lang" xmlns="http://www.eclipse.org/xwt/presentation" xmlns:ppe="clr-namespace:org.eclipse.papyrus.properties.widgets"><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:EnumCombo input="{Binding}" property="UML:NamedElement:visibility"></ppe:EnumCombo></Composite></Composite>
-\ No newline at end of file
+<Composite xmlns:ppel="clr-namespace:org.eclipse.papyrus.properties.widgets.layout" xmlns:j="clr-namespace:java.lang" xmlns="http://www.eclipse.org/xwt/presentation" xmlns:ppe="clr-namespace:org.eclipse.papyrus.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:EnumCombo input="{Binding}" property="UML:NamedElement:visibility"></ppe:EnumCombo></Composite></Composite>
+\ No newline at end of file
diff --git a/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/MultipleReadIsClassifiedObjectAction.xwt b/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/MultipleReadIsClassifiedObjectAction.xwt
index 597c12f8947..4b80e65eabd 100644
--- a/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/MultipleReadIsClassifiedObjectAction.xwt
+++ b/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/MultipleReadIsClassifiedObjectAction.xwt
@@ -1,2 +1,2 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<Composite xmlns:j="clr-namespace:java.lang" xmlns:ppel="clr-namespace:org.eclipse.papyrus.properties.widgets.layout" xmlns:x="http://www.eclipse.org/xwt" xmlns="http://www.eclipse.org/xwt/presentation" xmlns:ppe="clr-namespace:org.eclipse.papyrus.properties.widgets"><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><Composite><Composite.layout><ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout></Composite.layout><ppe:BooleanRadio input="{Binding}" property="UML:ReadIsClassifiedObjectAction:isDirect"></ppe:BooleanRadio><ppe:BooleanRadio input="{Binding}" property="UML:RedefinableElement:isLeaf"></ppe:BooleanRadio></Composite><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:EnumCombo input="{Binding}" property="UML:NamedElement:visibility"></ppe:EnumCombo></Composite></Composite>
-\ No newline at end of file
+<Composite xmlns:ppel="clr-namespace:org.eclipse.papyrus.properties.widgets.layout" xmlns:j="clr-namespace:java.lang" xmlns:ppe="clr-namespace:org.eclipse.papyrus.properties.widgets" xmlns:x="http://www.eclipse.org/xwt" xmlns="http://www.eclipse.org/xwt/presentation"><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><Composite><Composite.layout><ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout></Composite.layout><ppe:BooleanRadio input="{Binding}" property="UML:ReadIsClassifiedObjectAction:isDirect"></ppe:BooleanRadio><ppe:BooleanRadio input="{Binding}" property="UML:RedefinableElement:isLeaf"></ppe:BooleanRadio></Composite><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:EnumCombo input="{Binding}" property="UML:NamedElement:visibility"></ppe:EnumCombo></Composite></Composite>
+\ No newline at end of file
diff --git a/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/SingleActionInputPin.xwt b/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/SingleActionInputPin.xwt
index bbaed1ff3e3..8d506a71a8b 100644
--- a/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/SingleActionInputPin.xwt
+++ b/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/SingleActionInputPin.xwt
@@ -37,7 +37,7 @@
 		<Composite.layout>
 			<ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout>
 		</Composite.layout>
-		<ppe:EnumRadio input="{Binding}" property="Multiplicity:multiplicity"></ppe:EnumRadio>
+		<ppe:StringCombo input="{Binding}" property="Multiplicity:multiplicity"></ppe:StringCombo>
 		<ppe:ReferenceDialog input="{Binding}"
 			property="UML:ObjectNode:selection"></ppe:ReferenceDialog>
 		<ppe:ReferenceDialog property="UML:TypedElement:type"
diff --git a/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/SingleClass.xwt b/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/SingleClass.xwt
index 7b23cdfff84..0659e8f789e 100644
--- a/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/SingleClass.xwt
+++ b/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/SingleClass.xwt
@@ -1,2 +1,2 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<Composite xmlns="http://www.eclipse.org/xwt/presentation" xmlns:xtext="clr-namespace:org.eclipse.papyrus.widgets.xtext.creation" xmlns:ppe="clr-namespace:org.eclipse.papyrus.properties.widgets" xmlns:umlXtext="clr-namespace:org.eclipse.papyrus.properties.uml.xtext" xmlns:x="http://www.eclipse.org/xwt" xmlns:j="clr-namespace:java.lang" xmlns:ppel="clr-namespace:org.eclipse.papyrus.properties.widgets.layout" xmlns:creation="clr-namespace:org.eclipse.papyrus.properties.creation"><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:qualifiedName"></ppe:StringEditor></Composite><Composite><Composite.layout><ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout></Composite.layout><ppe:BooleanRadio input="{Binding}" property="UML:Classifier:isAbstract"></ppe:BooleanRadio><ppe:BooleanRadio input="{Binding}" property="UML:Class:isActive"></ppe:BooleanRadio><ppe:BooleanRadio input="{Binding}" property="UML:RedefinableElement:isLeaf"></ppe:BooleanRadio></Composite><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:EnumCombo input="{Binding}" property="UML:NamedElement:visibility"></ppe:EnumCombo></Composite><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:MultiReference input="{Binding}" property="UML:Classifier:useCase"></ppe:MultiReference></Composite><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:MultiReference input="{Binding}" property="UML:StructuredClassifier:ownedAttribute"></ppe:MultiReference></Composite></Composite>
-\ No newline at end of file
+<Composite xmlns:creation="clr-namespace:org.eclipse.papyrus.properties.creation" xmlns:ppel="clr-namespace:org.eclipse.papyrus.properties.widgets.layout" xmlns="http://www.eclipse.org/xwt/presentation" xmlns:xtext="clr-namespace:org.eclipse.papyrus.widgets.xtext.creation" xmlns:umlXtext="clr-namespace:org.eclipse.papyrus.properties.uml.xtext" xmlns:ppe="clr-namespace:org.eclipse.papyrus.properties.widgets" xmlns:j="clr-namespace:java.lang" 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:qualifiedName"></ppe:StringEditor></Composite><Composite><Composite.layout><ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout></Composite.layout><ppe:BooleanRadio input="{Binding}" property="UML:Classifier:isAbstract"></ppe:BooleanRadio><ppe:BooleanRadio input="{Binding}" property="UML:Class:isActive"></ppe:BooleanRadio><ppe:BooleanRadio input="{Binding}" property="UML:RedefinableElement:isLeaf"></ppe:BooleanRadio></Composite><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:EnumCombo input="{Binding}" property="UML:NamedElement:visibility"></ppe:EnumCombo></Composite><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:MultiReference input="{Binding}" property="UML:Classifier:useCase"></ppe:MultiReference></Composite><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:MultiReference input="{Binding}" property="UML:StructuredClassifier:ownedAttribute"></ppe:MultiReference></Composite></Composite>
+\ No newline at end of file
diff --git a/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/SingleConnectorEnd.xwt b/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/SingleConnectorEnd.xwt
index 3739e145074..fc3fb237fae 100644
--- a/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/SingleConnectorEnd.xwt
+++ b/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/SingleConnectorEnd.xwt
@@ -1,2 +1,2 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<Composite xmlns:ppe="clr-namespace:org.eclipse.papyrus.properties.widgets" xmlns:ppel="clr-namespace:org.eclipse.papyrus.properties.widgets.layout" xmlns:x="http://www.eclipse.org/xwt" xmlns:j="clr-namespace:java.lang" xmlns="http://www.eclipse.org/xwt/presentation"><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><Composite><Composite.layout><ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout></Composite.layout><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></ppel:PropertiesLayout></Composite.layout><ppe:EnumRadio input="{Binding}" property="Multiplicity:multiplicity"></ppe:EnumRadio></Composite></Composite>
-\ No newline at end of file
+<Composite xmlns:ppe="clr-namespace:org.eclipse.papyrus.properties.widgets" xmlns:ppel="clr-namespace:org.eclipse.papyrus.properties.widgets.layout" xmlns:x="http://www.eclipse.org/xwt" xmlns:j="clr-namespace:java.lang" xmlns="http://www.eclipse.org/xwt/presentation"><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><Composite><Composite.layout><ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout></Composite.layout><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></ppel:PropertiesLayout></Composite.layout><ppe:StringCombo input="{Binding}" property="Multiplicity:multiplicity"></ppe:StringCombo></Composite></Composite>
+\ No newline at end of file
diff --git a/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/SingleElementImport.xwt b/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/SingleElementImport.xwt
index f0c0b955111..c06e4a7292a 100644
--- a/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/SingleElementImport.xwt
+++ b/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/SingleElementImport.xwt
@@ -1,2 +1,2 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<Composite xmlns:j="clr-namespace:java.lang" xmlns:ppe="clr-namespace:org.eclipse.papyrus.properties.widgets" xmlns:ppel="clr-namespace:org.eclipse.papyrus.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><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:StringEditor input="{Binding}" property="UML:ElementImport:alias"></ppe:StringEditor></Composite><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:EnumCombo input="{Binding}" property="UML:ElementImport:visibility"></ppe:EnumCombo></Composite></Composite>
-\ No newline at end of file
+<Composite xmlns:x="http://www.eclipse.org/xwt" xmlns:ppe="clr-namespace:org.eclipse.papyrus.properties.widgets" xmlns:ppel="clr-namespace:org.eclipse.papyrus.properties.widgets.layout" xmlns:j="clr-namespace:java.lang" xmlns="http://www.eclipse.org/xwt/presentation"><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:StringEditor input="{Binding}" property="UML:ElementImport:alias"></ppe:StringEditor></Composite><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:EnumCombo input="{Binding}" property="UML:ElementImport:visibility"></ppe:EnumCombo></Composite></Composite>
+\ No newline at end of file
diff --git a/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/SingleExtensionEnd.xwt b/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/SingleExtensionEnd.xwt
index b51893343d6..a0dae17fd8d 100644
--- a/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/SingleExtensionEnd.xwt
+++ b/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/SingleExtensionEnd.xwt
@@ -1,2 +1,2 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<Composite xmlns:ppe="clr-namespace:org.eclipse.papyrus.properties.widgets" xmlns:uml="clr-namespace:org.eclipse.papyrus.properties.uml.widgets" xmlns="http://www.eclipse.org/xwt/presentation" xmlns:j="clr-namespace:java.lang" xmlns:x="http://www.eclipse.org/xwt" xmlns:ppel="clr-namespace:org.eclipse.papyrus.properties.widgets.layout"><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></Composite><Composite><Composite.layout><ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout></Composite.layout><ppe:BooleanRadio input="{Binding}" property="UML:Property:isDerived"></ppe:BooleanRadio><ppe:BooleanRadio input="{Binding}" property="UML:Property:isDerivedUnion"></ppe:BooleanRadio><ppe:BooleanRadio input="{Binding}" property="UML:RedefinableElement:isLeaf"></ppe:BooleanRadio><ppe:BooleanRadio input="{Binding}" property="UML:MultiplicityElement:isOrdered"></ppe:BooleanRadio><ppe:BooleanRadio input="{Binding}" property="UML:StructuralFeature:isReadOnly"></ppe:BooleanRadio><ppe:BooleanRadio input="{Binding}" property="UML:Feature:isStatic"></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:BooleanRadio input="{Binding}" property="UML:Property:aggregation"></ppe:BooleanRadio><ppe:EnumCombo input="{Binding}" property="UML:NamedElement:visibility"></ppe:EnumCombo></Composite><Composite><Composite.layout><ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout></Composite.layout><ppe:ReferenceDialog input="{Binding}" property="UML:Property:defaultValue"></ppe:ReferenceDialog><ppe:EnumRadio input="{Binding}" property="Multiplicity:multiplicity"></ppe:EnumRadio><ppe:ReferenceDialog input="{Binding}" property="UML:TypedElement:type"></ppe:ReferenceDialog></Composite><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:MultiReference input="{Binding}" property="UML:Property:subsettedProperty"></ppe:MultiReference></Composite></Composite>
-\ No newline at end of file
+<Composite xmlns:ppe="clr-namespace:org.eclipse.papyrus.properties.widgets" xmlns:uml="clr-namespace:org.eclipse.papyrus.properties.uml.widgets" xmlns="http://www.eclipse.org/xwt/presentation" xmlns:j="clr-namespace:java.lang" xmlns:x="http://www.eclipse.org/xwt" xmlns:ppel="clr-namespace:org.eclipse.papyrus.properties.widgets.layout"><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></Composite><Composite><Composite.layout><ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout></Composite.layout><ppe:BooleanRadio input="{Binding}" property="UML:Property:isDerived"></ppe:BooleanRadio><ppe:BooleanRadio input="{Binding}" property="UML:Property:isDerivedUnion"></ppe:BooleanRadio><ppe:BooleanRadio input="{Binding}" property="UML:RedefinableElement:isLeaf"></ppe:BooleanRadio><ppe:BooleanRadio input="{Binding}" property="UML:MultiplicityElement:isOrdered"></ppe:BooleanRadio><ppe:BooleanRadio input="{Binding}" property="UML:StructuralFeature:isReadOnly"></ppe:BooleanRadio><ppe:BooleanRadio input="{Binding}" property="UML:Feature:isStatic"></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:BooleanRadio input="{Binding}" property="UML:Property:aggregation"></ppe:BooleanRadio><ppe:EnumCombo input="{Binding}" property="UML:NamedElement:visibility"></ppe:EnumCombo></Composite><Composite><Composite.layout><ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout></Composite.layout><ppe:ReferenceDialog input="{Binding}" property="UML:Property:defaultValue"></ppe:ReferenceDialog><ppe:StringCombo input="{Binding}" property="Multiplicity:multiplicity"></ppe:StringCombo><ppe:ReferenceDialog input="{Binding}" property="UML:TypedElement:type"></ppe:ReferenceDialog></Composite><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:MultiReference input="{Binding}" property="UML:Property:subsettedProperty"></ppe:MultiReference></Composite></Composite>
+\ No newline at end of file
diff --git a/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/SingleInputPin.xwt b/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/SingleInputPin.xwt
index 11a3dea70af..a58185e750c 100644
--- a/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/SingleInputPin.xwt
+++ b/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/SingleInputPin.xwt
@@ -1,2 +1,2 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<Composite xmlns:j="clr-namespace:java.lang" xmlns:ppel="clr-namespace:org.eclipse.papyrus.properties.widgets.layout" xmlns:ppe="clr-namespace:org.eclipse.papyrus.properties.widgets" xmlns="http://www.eclipse.org/xwt/presentation" xmlns:x="http://www.eclipse.org/xwt" xmlns:uml="clr-namespace:org.eclipse.papyrus.properties.uml.widgets"><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></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:RedefinableElement:isLeaf"></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><ppe:EnumRadio input="{Binding}" property="Multiplicity:multiplicity"></ppe:EnumRadio><ppe:ReferenceDialog input="{Binding}" property="UML:ObjectNode:selection"></ppe:ReferenceDialog><ppe:ReferenceDialog property="UML:TypedElement:type" input="{Binding}"></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></Composite>
-\ No newline at end of file
+<Composite xmlns:j="clr-namespace:java.lang" xmlns:ppel="clr-namespace:org.eclipse.papyrus.properties.widgets.layout" xmlns:ppe="clr-namespace:org.eclipse.papyrus.properties.widgets" xmlns="http://www.eclipse.org/xwt/presentation" xmlns:x="http://www.eclipse.org/xwt" xmlns:uml="clr-namespace:org.eclipse.papyrus.properties.uml.widgets"><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></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:RedefinableElement:isLeaf"></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><ppe:StringCombo input="{Binding}" property="Multiplicity:multiplicity"></ppe:StringCombo><ppe:ReferenceDialog input="{Binding}" property="UML:ObjectNode:selection"></ppe:ReferenceDialog><ppe:ReferenceDialog property="UML:TypedElement:type" input="{Binding}"></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></Composite>
+\ No newline at end of file
diff --git a/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/SingleMultiplicityElement.xwt b/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/SingleMultiplicityElement.xwt
index d7af19a78f1..ab444eaeae6 100644
--- a/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/SingleMultiplicityElement.xwt
+++ b/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/SingleMultiplicityElement.xwt
@@ -1,2 +1,2 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<Composite xmlns:x="http://www.eclipse.org/xwt" xmlns:j="clr-namespace:java.lang" xmlns:ppel="clr-namespace:org.eclipse.papyrus.properties.widgets.layout" xmlns:ppe="clr-namespace:org.eclipse.papyrus.properties.widgets" xmlns="http://www.eclipse.org/xwt/presentation"><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><Composite><Composite.layout><ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout></Composite.layout><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></ppel:PropertiesLayout></Composite.layout><ppe:EnumRadio input="{Binding}" property="Multiplicity:multiplicity"></ppe:EnumRadio></Composite></Composite>
-\ No newline at end of file
+<Composite xmlns:x="http://www.eclipse.org/xwt" xmlns:j="clr-namespace:java.lang" xmlns:ppel="clr-namespace:org.eclipse.papyrus.properties.widgets.layout" xmlns:ppe="clr-namespace:org.eclipse.papyrus.properties.widgets" xmlns="http://www.eclipse.org/xwt/presentation"><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><Composite><Composite.layout><ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout></Composite.layout><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></ppel:PropertiesLayout></Composite.layout><ppe:StringCombo input="{Binding}" property="Multiplicity:multiplicity"></ppe:StringCombo></Composite></Composite>
+\ No newline at end of file
diff --git a/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/SingleOutputPin.xwt b/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/SingleOutputPin.xwt
index bb467b45013..6e097b0ccb7 100644
--- a/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/SingleOutputPin.xwt
+++ b/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/SingleOutputPin.xwt
@@ -1,2 +1,2 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<Composite xmlns:uml="clr-namespace:org.eclipse.papyrus.properties.uml.widgets" xmlns:ppe="clr-namespace:org.eclipse.papyrus.properties.widgets" xmlns:j="clr-namespace:java.lang" xmlns:ppel="clr-namespace:org.eclipse.papyrus.properties.widgets.layout" xmlns:x="http://www.eclipse.org/xwt" xmlns="http://www.eclipse.org/xwt/presentation"><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></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:RedefinableElement:isLeaf"></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><ppe:EnumRadio input="{Binding}" property="Multiplicity:multiplicity"></ppe:EnumRadio><ppe:ReferenceDialog input="{Binding}" property="UML:ObjectNode:selection"></ppe:ReferenceDialog><ppe:ReferenceDialog property="UML:TypedElement:type" input="{Binding}"></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></Composite>
-\ No newline at end of file
+<Composite xmlns:uml="clr-namespace:org.eclipse.papyrus.properties.uml.widgets" xmlns:ppe="clr-namespace:org.eclipse.papyrus.properties.widgets" xmlns:j="clr-namespace:java.lang" xmlns:ppel="clr-namespace:org.eclipse.papyrus.properties.widgets.layout" xmlns:x="http://www.eclipse.org/xwt" xmlns="http://www.eclipse.org/xwt/presentation"><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></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:RedefinableElement:isLeaf"></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><ppe:StringCombo input="{Binding}" property="Multiplicity:multiplicity"></ppe:StringCombo><ppe:ReferenceDialog input="{Binding}" property="UML:ObjectNode:selection"></ppe:ReferenceDialog><ppe:ReferenceDialog property="UML:TypedElement:type" input="{Binding}"></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></Composite>
+\ No newline at end of file
diff --git a/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/SinglePackage.xwt b/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/SinglePackage.xwt
index 4458da89d30..3c3eaaff091 100644
--- a/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/SinglePackage.xwt
+++ b/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/SinglePackage.xwt
@@ -1,2 +1,2 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<Composite xmlns:j="clr-namespace:java.lang" xmlns:x="http://www.eclipse.org/xwt" xmlns="http://www.eclipse.org/xwt/presentation" xmlns:ppel="clr-namespace:org.eclipse.papyrus.properties.widgets.layout" xmlns:ppe="clr-namespace:org.eclipse.papyrus.properties.widgets"><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></Composite><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:EnumCombo input="{Binding}" property="UML:NamedElement:visibility"></ppe:EnumCombo></Composite><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:MultiReference input="{Binding}" property="UML:Package:packageMerge"></ppe:MultiReference></Composite></Composite>
-\ No newline at end of file
+<Composite xmlns:x="http://www.eclipse.org/xwt" xmlns:ppe="clr-namespace:org.eclipse.papyrus.properties.widgets" xmlns:j="clr-namespace:java.lang" xmlns:ppel="clr-namespace:org.eclipse.papyrus.properties.widgets.layout" xmlns="http://www.eclipse.org/xwt/presentation"><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></Composite><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:EnumCombo input="{Binding}" property="UML:NamedElement:visibility"></ppe:EnumCombo></Composite><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:MultiReference input="{Binding}" property="UML:Package:packageMerge"></ppe:MultiReference></Composite></Composite>
+\ No newline at end of file
diff --git a/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/SinglePackageProfile.xwt b/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/SinglePackageProfile.xwt
index 8b703fcdc86..29dc0173892 100644
--- a/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/SinglePackageProfile.xwt
+++ b/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/SinglePackageProfile.xwt
@@ -1,2 +1,2 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<Composite xmlns:x="http://www.eclipse.org/xwt" xmlns:ppe="clr-namespace:org.eclipse.papyrus.properties.widgets" xmlns="http://www.eclipse.org/xwt/presentation" xmlns:uml="clr-namespace:org.eclipse.papyrus.properties.uml.widgets" xmlns:ppel="clr-namespace:org.eclipse.papyrus.properties.widgets.layout"><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><uml:ProfileApplicationPropertyEditor input="{Binding}" property="StereotypeApplication:profileApplication"></uml:ProfileApplicationPropertyEditor></Composite>
-\ No newline at end of file
+<Composite xmlns:uml="clr-namespace:org.eclipse.papyrus.properties.uml.widgets" xmlns:ppe="clr-namespace:org.eclipse.papyrus.properties.widgets" xmlns:ppel="clr-namespace:org.eclipse.papyrus.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><uml:ProfileApplicationPropertyEditor input="{Binding}" property="StereotypeApplication:profileApplication"></uml:ProfileApplicationPropertyEditor></Composite>
+\ No newline at end of file
diff --git a/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/SingleParameter.xwt b/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/SingleParameter.xwt
index 969f2571b66..18c018d06da 100644
--- a/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/SingleParameter.xwt
+++ b/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/SingleParameter.xwt
@@ -1,2 +1,2 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<Composite xmlns:j="clr-namespace:java.lang" xmlns="http://www.eclipse.org/xwt/presentation" xmlns:ppe="clr-namespace:org.eclipse.papyrus.properties.widgets" xmlns:x="http://www.eclipse.org/xwt" xmlns:uml="clr-namespace:org.eclipse.papyrus.properties.uml.widgets" xmlns:ppel="clr-namespace:org.eclipse.papyrus.properties.widgets.layout"><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></Composite><Composite><Composite.layout><ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout></Composite.layout><ppe:BooleanRadio input="{Binding}" property="UML:Parameter:isException"></ppe:BooleanRadio><ppe:BooleanRadio input="{Binding}" property="UML:MultiplicityElement:isOrdered"></ppe:BooleanRadio><ppe:BooleanRadio input="{Binding}" property="UML:Parameter:isStream"></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:Parameter:direction"></ppe:EnumCombo><ppe:EnumCombo input="{Binding}" property="UML:Parameter:effect"></ppe:EnumCombo><ppe:EnumCombo input="{Binding}" property="UML:NamedElement:visibility"></ppe:EnumCombo></Composite><Composite><Composite.layout><ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout></Composite.layout><ppe:ReferenceDialog input="{Binding}" property="UML:Parameter:defaultValue"></ppe:ReferenceDialog><ppe:EnumRadio input="{Binding}" property="Multiplicity:multiplicity"></ppe:EnumRadio><ppe:ReferenceDialog property="UML:TypedElement:type" input="{Binding}"></ppe:ReferenceDialog></Composite></Composite>
-\ No newline at end of file
+<Composite xmlns:j="clr-namespace:java.lang" xmlns="http://www.eclipse.org/xwt/presentation" xmlns:ppe="clr-namespace:org.eclipse.papyrus.properties.widgets" xmlns:x="http://www.eclipse.org/xwt" xmlns:uml="clr-namespace:org.eclipse.papyrus.properties.uml.widgets" xmlns:ppel="clr-namespace:org.eclipse.papyrus.properties.widgets.layout"><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></Composite><Composite><Composite.layout><ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout></Composite.layout><ppe:BooleanRadio input="{Binding}" property="UML:Parameter:isException"></ppe:BooleanRadio><ppe:BooleanRadio input="{Binding}" property="UML:MultiplicityElement:isOrdered"></ppe:BooleanRadio><ppe:BooleanRadio input="{Binding}" property="UML:Parameter:isStream"></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:Parameter:direction"></ppe:EnumCombo><ppe:EnumCombo input="{Binding}" property="UML:Parameter:effect"></ppe:EnumCombo><ppe:EnumCombo input="{Binding}" property="UML:NamedElement:visibility"></ppe:EnumCombo></Composite><Composite><Composite.layout><ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout></Composite.layout><ppe:ReferenceDialog input="{Binding}" property="UML:Parameter:defaultValue"></ppe:ReferenceDialog><ppe:StringCombo input="{Binding}" property="Multiplicity:multiplicity"></ppe:StringCombo><ppe:ReferenceDialog property="UML:TypedElement:type" input="{Binding}"></ppe:ReferenceDialog></Composite></Composite>
+\ No newline at end of file
diff --git a/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/SinglePin.xwt b/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/SinglePin.xwt
index d19fd835f86..5e8a9b88daa 100644
--- a/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/SinglePin.xwt
+++ b/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/SinglePin.xwt
@@ -1,2 +1,2 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<Composite xmlns="http://www.eclipse.org/xwt/presentation" xmlns:j="clr-namespace:java.lang" xmlns:ppel="clr-namespace:org.eclipse.papyrus.properties.widgets.layout" xmlns:ppe="clr-namespace:org.eclipse.papyrus.properties.widgets" xmlns:x="http://www.eclipse.org/xwt" xmlns:uml="clr-namespace:org.eclipse.papyrus.properties.uml.widgets"><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></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:RedefinableElement:isLeaf"></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><ppe:EnumRadio input="{Binding}" property="Multiplicity:multiplicity"></ppe:EnumRadio><ppe:ReferenceDialog input="{Binding}" property="UML:ObjectNode:selection"></ppe:ReferenceDialog><ppe:ReferenceDialog property="UML:TypedElement:type" input="{Binding}"></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></Composite>
-\ No newline at end of file
+<Composite xmlns="http://www.eclipse.org/xwt/presentation" xmlns:j="clr-namespace:java.lang" xmlns:ppel="clr-namespace:org.eclipse.papyrus.properties.widgets.layout" xmlns:ppe="clr-namespace:org.eclipse.papyrus.properties.widgets" xmlns:x="http://www.eclipse.org/xwt" xmlns:uml="clr-namespace:org.eclipse.papyrus.properties.uml.widgets"><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></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:RedefinableElement:isLeaf"></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><ppe:StringCombo input="{Binding}" property="Multiplicity:multiplicity"></ppe:StringCombo><ppe:ReferenceDialog input="{Binding}" property="UML:ObjectNode:selection"></ppe:ReferenceDialog><ppe:ReferenceDialog property="UML:TypedElement:type" input="{Binding}"></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></Composite>
+\ No newline at end of file
diff --git a/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/SinglePort.xwt b/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/SinglePort.xwt
index da6df3757f8..45c2d020549 100644
--- a/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/SinglePort.xwt
+++ b/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/SinglePort.xwt
@@ -1,2 +1,2 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<Composite xmlns:uml="clr-namespace:org.eclipse.papyrus.properties.uml.widgets" xmlns:ppe="clr-namespace:org.eclipse.papyrus.properties.widgets" xmlns:ppel="clr-namespace:org.eclipse.papyrus.properties.widgets.layout" xmlns:j="clr-namespace:java.lang" xmlns="http://www.eclipse.org/xwt/presentation" 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></Composite><Composite><Composite.layout><ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout></Composite.layout><ppe:BooleanRadio input="{Binding}" property="UML:Port:isBehavior"></ppe:BooleanRadio><ppe:BooleanRadio input="{Binding}" property="UML:Property:isDerived"></ppe:BooleanRadio><ppe:BooleanRadio input="{Binding}" property="UML:Property:isDerivedUnion"></ppe:BooleanRadio><ppe:BooleanRadio input="{Binding}" property="UML:RedefinableElement:isLeaf"></ppe:BooleanRadio><ppe:BooleanRadio input="{Binding}" property="UML:MultiplicityElement:isOrdered"></ppe:BooleanRadio><ppe:BooleanRadio input="{Binding}" property="UML:Port:isService"></ppe:BooleanRadio></Composite><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:EnumCombo input="{Binding}" property="UML:NamedElement:visibility"></ppe:EnumCombo></Composite><Composite><Composite.layout><ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout></Composite.layout><ppe:ReferenceDialog input="{Binding}" property="UML:Property:defaultValue"></ppe:ReferenceDialog><ppe:EnumRadio input="{Binding}" property="Multiplicity:multiplicity"></ppe:EnumRadio><ppe:ReferenceDialog property="UML:TypedElement:type" input="{Binding}"></ppe:ReferenceDialog></Composite><Composite><Composite.layout><ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout></Composite.layout><ppe:MultiReference input="{Binding}" property="UML:Port:provided"></ppe:MultiReference><ppe:MultiReference input="{Binding}" property="UML:Port:required"></ppe:MultiReference></Composite><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:MultiReference input="{Binding}" property="UML:Property:subsettedProperty"></ppe:MultiReference></Composite></Composite>
-\ No newline at end of file
+<Composite xmlns:uml="clr-namespace:org.eclipse.papyrus.properties.uml.widgets" xmlns:ppe="clr-namespace:org.eclipse.papyrus.properties.widgets" xmlns:ppel="clr-namespace:org.eclipse.papyrus.properties.widgets.layout" xmlns:j="clr-namespace:java.lang" xmlns="http://www.eclipse.org/xwt/presentation" 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></Composite><Composite><Composite.layout><ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout></Composite.layout><ppe:BooleanRadio input="{Binding}" property="UML:Port:isBehavior"></ppe:BooleanRadio><ppe:BooleanRadio input="{Binding}" property="UML:Property:isDerived"></ppe:BooleanRadio><ppe:BooleanRadio input="{Binding}" property="UML:Property:isDerivedUnion"></ppe:BooleanRadio><ppe:BooleanRadio input="{Binding}" property="UML:RedefinableElement:isLeaf"></ppe:BooleanRadio><ppe:BooleanRadio input="{Binding}" property="UML:MultiplicityElement:isOrdered"></ppe:BooleanRadio><ppe:BooleanRadio input="{Binding}" property="UML:Port:isService"></ppe:BooleanRadio></Composite><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:EnumCombo input="{Binding}" property="UML:NamedElement:visibility"></ppe:EnumCombo></Composite><Composite><Composite.layout><ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout></Composite.layout><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></Composite><Composite><Composite.layout><ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout></Composite.layout><ppe:MultiReference input="{Binding}" property="UML:Port:provided"></ppe:MultiReference><ppe:MultiReference input="{Binding}" property="UML:Port:required"></ppe:MultiReference></Composite><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:MultiReference input="{Binding}" property="UML:Property:subsettedProperty"></ppe:MultiReference></Composite></Composite>
+\ No newline at end of file
diff --git a/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/SingleProperty.xwt b/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/SingleProperty.xwt
index eb4b2bcb2bf..9e386409d61 100644
--- a/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/SingleProperty.xwt
+++ b/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/SingleProperty.xwt
@@ -1,2 +1,2 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<Composite xmlns="http://www.eclipse.org/xwt/presentation" xmlns:uml="clr-namespace:org.eclipse.papyrus.properties.uml.widgets" xmlns:x="http://www.eclipse.org/xwt" xmlns:j="clr-namespace:java.lang" xmlns:ppel="clr-namespace:org.eclipse.papyrus.properties.widgets.layout" xmlns:ppe="clr-namespace:org.eclipse.papyrus.properties.widgets"><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></Composite><Composite><Composite.layout><ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout></Composite.layout><ppe:BooleanRadio input="{Binding}" property="UML:Property:isDerived"></ppe:BooleanRadio><ppe:BooleanRadio input="{Binding}" property="UML:Property:isDerivedUnion"></ppe:BooleanRadio><ppe:BooleanRadio input="{Binding}" property="UML:RedefinableElement:isLeaf"></ppe:BooleanRadio><ppe:BooleanRadio input="{Binding}" property="UML:MultiplicityElement:isOrdered"></ppe:BooleanRadio><ppe:BooleanRadio input="{Binding}" property="UML:StructuralFeature:isReadOnly"></ppe:BooleanRadio><ppe:BooleanRadio input="{Binding}" property="UML:Feature:isStatic"></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:Property:aggregation"></ppe:EnumCombo><ppe:EnumCombo input="{Binding}" property="UML:NamedElement:visibility"></ppe:EnumCombo></Composite><Composite><Composite.layout><ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout></Composite.layout><ppe:ReferenceDialog input="{Binding}" property="UML:Property:defaultValue"></ppe:ReferenceDialog><ppe:EnumCombo input="{Binding}" property="Multiplicity:multiplicity"></ppe:EnumCombo><ppe:ReferenceDialog input="{Binding}" property="UML:TypedElement:type"></ppe:ReferenceDialog></Composite><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:MultiReference input="{Binding}" property="UML:Property:subsettedProperty"></ppe:MultiReference></Composite></Composite>
-\ No newline at end of file
+<Composite xmlns="http://www.eclipse.org/xwt/presentation" xmlns:uml="clr-namespace:org.eclipse.papyrus.properties.uml.widgets" xmlns:x="http://www.eclipse.org/xwt" xmlns:j="clr-namespace:java.lang" xmlns:ppel="clr-namespace:org.eclipse.papyrus.properties.widgets.layout" xmlns:ppe="clr-namespace:org.eclipse.papyrus.properties.widgets"><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></Composite><Composite><Composite.layout><ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout></Composite.layout><ppe:BooleanRadio input="{Binding}" property="UML:Property:isDerived"></ppe:BooleanRadio><ppe:BooleanRadio input="{Binding}" property="UML:Property:isDerivedUnion"></ppe:BooleanRadio><ppe:BooleanRadio input="{Binding}" property="UML:RedefinableElement:isLeaf"></ppe:BooleanRadio><ppe:BooleanRadio input="{Binding}" property="UML:MultiplicityElement:isOrdered"></ppe:BooleanRadio><ppe:BooleanRadio input="{Binding}" property="UML:StructuralFeature:isReadOnly"></ppe:BooleanRadio><ppe:BooleanRadio input="{Binding}" property="UML:Feature:isStatic"></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:Property:aggregation"></ppe:EnumCombo><ppe:EnumCombo input="{Binding}" property="UML:NamedElement:visibility"></ppe:EnumCombo></Composite><Composite><Composite.layout><ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout></Composite.layout><ppe:ReferenceDialog input="{Binding}" property="UML:Property:defaultValue"></ppe:ReferenceDialog><ppe:StringCombo input="{Binding}" property="Multiplicity:multiplicity"></ppe:StringCombo><ppe:ReferenceDialog input="{Binding}" property="UML:TypedElement:type"></ppe:ReferenceDialog></Composite><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:MultiReference input="{Binding}" property="UML:Property:subsettedProperty"></ppe:MultiReference></Composite></Composite>
+\ No newline at end of file
diff --git a/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/SingleStructuralFeature.xwt b/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/SingleStructuralFeature.xwt
index ab48aa46b4c..4867026cab4 100644
--- a/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/SingleStructuralFeature.xwt
+++ b/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/SingleStructuralFeature.xwt
@@ -1,2 +1,2 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<Composite xmlns:j="clr-namespace:java.lang" xmlns:ppe="clr-namespace:org.eclipse.papyrus.properties.widgets" xmlns:x="http://www.eclipse.org/xwt" xmlns:ppel="clr-namespace:org.eclipse.papyrus.properties.widgets.layout" xmlns="http://www.eclipse.org/xwt/presentation" xmlns:uml="clr-namespace:org.eclipse.papyrus.properties.uml.widgets"><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></Composite><Composite><Composite.layout><ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout></Composite.layout><ppe:BooleanRadio input="{Binding}" property="UML:RedefinableElement:isLeaf"></ppe:BooleanRadio><ppe:BooleanRadio input="{Binding}" property="UML:MultiplicityElement:isOrdered"></ppe:BooleanRadio><ppe:BooleanRadio input="{Binding}" property="UML:StructuralFeature:isReadOnly"></ppe:BooleanRadio><ppe:BooleanRadio input="{Binding}" property="UML:Feature:isStatic"></ppe:BooleanRadio><ppe:BooleanRadio input="{Binding}" property="UML:MultiplicityElement:isUnique"></ppe:BooleanRadio></Composite><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:EnumCombo input="{Binding}" property="UML:NamedElement:visibility"></ppe:EnumCombo></Composite><Composite><Composite.layout><ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout></Composite.layout><ppe:EnumRadio input="{Binding}" property="Multiplicity:multiplicity"></ppe:EnumRadio><ppe:ReferenceDialog input="{Binding}" property="UML:TypedElement:type"></ppe:ReferenceDialog></Composite></Composite>
-\ No newline at end of file
+<Composite xmlns:j="clr-namespace:java.lang" xmlns:ppe="clr-namespace:org.eclipse.papyrus.properties.widgets" xmlns:x="http://www.eclipse.org/xwt" xmlns:ppel="clr-namespace:org.eclipse.papyrus.properties.widgets.layout" xmlns="http://www.eclipse.org/xwt/presentation" xmlns:uml="clr-namespace:org.eclipse.papyrus.properties.uml.widgets"><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></Composite><Composite><Composite.layout><ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout></Composite.layout><ppe:BooleanRadio input="{Binding}" property="UML:RedefinableElement:isLeaf"></ppe:BooleanRadio><ppe:BooleanRadio input="{Binding}" property="UML:MultiplicityElement:isOrdered"></ppe:BooleanRadio><ppe:BooleanRadio input="{Binding}" property="UML:StructuralFeature:isReadOnly"></ppe:BooleanRadio><ppe:BooleanRadio input="{Binding}" property="UML:Feature:isStatic"></ppe:BooleanRadio><ppe:BooleanRadio input="{Binding}" property="UML:MultiplicityElement:isUnique"></ppe:BooleanRadio></Composite><Composite><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:EnumCombo input="{Binding}" property="UML:NamedElement:visibility"></ppe:EnumCombo></Composite><Composite><Composite.layout><ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout></Composite.layout><ppe:StringCombo input="{Binding}" property="Multiplicity:multiplicity"></ppe:StringCombo><ppe:ReferenceDialog input="{Binding}" property="UML:TypedElement:type"></ppe:ReferenceDialog></Composite></Composite>
+\ No newline at end of file
diff --git a/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/SingleValuePin.xwt b/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/SingleValuePin.xwt
index 74a6ddb4070..0d4f43390a2 100644
--- a/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/SingleValuePin.xwt
+++ b/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/SingleValuePin.xwt
@@ -1,2 +1,2 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<Composite xmlns:ppe="clr-namespace:org.eclipse.papyrus.properties.widgets" xmlns:j="clr-namespace:java.lang" xmlns:ppel="clr-namespace:org.eclipse.papyrus.properties.widgets.layout" xmlns="http://www.eclipse.org/xwt/presentation" xmlns:x="http://www.eclipse.org/xwt" xmlns:uml="clr-namespace:org.eclipse.papyrus.properties.uml.widgets"><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></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:RedefinableElement:isLeaf"></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><ppe:EnumRadio input="{Binding}" property="Multiplicity:multiplicity"></ppe:EnumRadio><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 input="{Binding}" property="UML:ValuePin:value"></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
+<Composite xmlns:ppe="clr-namespace:org.eclipse.papyrus.properties.widgets" xmlns:j="clr-namespace:java.lang" xmlns:ppel="clr-namespace:org.eclipse.papyrus.properties.widgets.layout" xmlns="http://www.eclipse.org/xwt/presentation" xmlns:x="http://www.eclipse.org/xwt" xmlns:uml="clr-namespace:org.eclipse.papyrus.properties.uml.widgets"><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></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:RedefinableElement:isLeaf"></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><ppe:StringCombo input="{Binding}" property="Multiplicity:multiplicity"></ppe:StringCombo><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 input="{Binding}" property="UML:ValuePin:value"></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
diff --git a/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/SingleVariable.xwt b/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/SingleVariable.xwt
index 120a6e857f7..82852197e1a 100644
--- a/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/SingleVariable.xwt
+++ b/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/ui/SingleVariable.xwt
@@ -1,2 +1,2 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<Composite xmlns:j="clr-namespace:java.lang" xmlns:ppel="clr-namespace:org.eclipse.papyrus.properties.widgets.layout" xmlns:uml="clr-namespace:org.eclipse.papyrus.properties.uml.widgets" xmlns:x="http://www.eclipse.org/xwt" xmlns="http://www.eclipse.org/xwt/presentation" xmlns:ppe="clr-namespace:org.eclipse.papyrus.properties.widgets"><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></Composite><Composite><Composite.layout><ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout></Composite.layout><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></ppel:PropertiesLayout></Composite.layout><ppe:EnumCombo input="{Binding}" property="UML:NamedElement:visibility"></ppe:EnumCombo></Composite><Composite><Composite.layout><ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout></Composite.layout><ppe:EnumRadio input="{Binding}" property="Multiplicity:multiplicity"></ppe:EnumRadio><ppe:ReferenceDialog property="UML:TypedElement:type" input="{Binding}"></ppe:ReferenceDialog></Composite></Composite>
-\ No newline at end of file
+<Composite xmlns:j="clr-namespace:java.lang" xmlns:ppel="clr-namespace:org.eclipse.papyrus.properties.widgets.layout" xmlns:uml="clr-namespace:org.eclipse.papyrus.properties.uml.widgets" xmlns:x="http://www.eclipse.org/xwt" xmlns="http://www.eclipse.org/xwt/presentation" xmlns:ppe="clr-namespace:org.eclipse.papyrus.properties.widgets"><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></Composite><Composite><Composite.layout><ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout></Composite.layout><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></ppel:PropertiesLayout></Composite.layout><ppe:EnumCombo input="{Binding}" property="UML:NamedElement:visibility"></ppe:EnumCombo></Composite><Composite><Composite.layout><ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout></Composite.layout><ppe:StringCombo input="{Binding}" property="Multiplicity:multiplicity"></ppe:StringCombo><ppe:ReferenceDialog property="UML:TypedElement:type" input="{Binding}"></ppe:ReferenceDialog></Composite></Composite>
+\ No newline at end of file
diff --git a/plugins/uml/org.eclipse.papyrus.properties.uml/src/org/eclipse/papyrus/properties/uml/constraints/UmlInstanceOfConstraint.java b/plugins/uml/org.eclipse.papyrus.properties.uml/src/org/eclipse/papyrus/properties/uml/constraints/UmlInstanceOfConstraint.java
index 862f35b8e50..1d58adf58fb 100644
--- a/plugins/uml/org.eclipse.papyrus.properties.uml/src/org/eclipse/papyrus/properties/uml/constraints/UmlInstanceOfConstraint.java
+++ b/plugins/uml/org.eclipse.papyrus.properties.uml/src/org/eclipse/papyrus/properties/uml/constraints/UmlInstanceOfConstraint.java
@@ -66,18 +66,23 @@ public class UmlInstanceOfConstraint extends AbstractConstraint {
 
 	@Override
 	protected boolean equivalent(Constraint constraint) {
-		if(this == constraint)
+		if(this == constraint) {
 			return true;
-		if(constraint == null)
+		}
+		if(constraint == null) {
 			return false;
-		if(!(constraint instanceof UmlInstanceOfConstraint))
+		}
+		if(!(constraint instanceof UmlInstanceOfConstraint)) {
 			return false;
+		}
 		UmlInstanceOfConstraint other = (UmlInstanceOfConstraint)constraint;
 		if(umlClassName == null) {
-			if(other.umlClassName != null)
+			if(other.umlClassName != null) {
 				return false;
-		} else if(!umlClassName.equals(other.umlClassName))
+			}
+		} else if(!umlClassName.equals(other.umlClassName)) {
 			return false;
+		}
 		return true;
 	}
 
diff --git a/plugins/uml/org.eclipse.papyrus.properties.uml/src/org/eclipse/papyrus/properties/uml/databinding/MultiplicityObservableValue.java b/plugins/uml/org.eclipse.papyrus.properties.uml/src/org/eclipse/papyrus/properties/uml/databinding/MultiplicityObservableValue.java
index fd2dd364eaf..15b3bb6166e 100644
--- a/plugins/uml/org.eclipse.papyrus.properties.uml/src/org/eclipse/papyrus/properties/uml/databinding/MultiplicityObservableValue.java
+++ b/plugins/uml/org.eclipse.papyrus.properties.uml/src/org/eclipse/papyrus/properties/uml/databinding/MultiplicityObservableValue.java
@@ -1,6 +1,6 @@
 /*****************************************************************************
  * Copyright (c) 2010 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
@@ -39,6 +39,37 @@ import org.eclipse.papyrus.service.edit.service.IElementEditService;
  */
 public class MultiplicityObservableValue extends AbstractObservableValue {
 
+	/**
+	 * The 0..* multiplicity (Any)
+	 */
+	public static String ANY = "0..*"; //$NON-NLS-1$
+
+	/**
+	 * The * multiplicity (Any)
+	 * Equivalent to 0..*
+	 */
+	public static String STAR = "*"; //$NON-NLS-1$
+
+	/***
+	 * The 1 multiplicity (One)
+	 */
+	public static String ONE = "1"; //$NON-NLS-1$
+
+	/**
+	 * The 0..1 multiplicity (Optional)
+	 */
+	public static String OPTIONAL = "0..1"; //$NON-NLS-1$
+
+	/**
+	 * The 1..* multiplicity (One or more)
+	 */
+	public static String ONE_OR_MORE = "1..*"; //$NON-NLS-1$
+
+	/**
+	 * The multiplicity separator (..)
+	 */
+	public static String SEPARATOR = ".."; //$NON-NLS-1$
+
 	private IObservableValue lowerBound, upperBound;
 
 	private EStructuralFeature lowerFeature, upperFeature;
@@ -56,15 +87,16 @@ public class MultiplicityObservableValue extends AbstractObservableValue {
 	 *        The Editing Domain on which the commands will be executed
 	 */
 	public MultiplicityObservableValue(EObject eObject, EditingDomain domain) {
-
 		this.eObject = eObject;
 		this.domain = domain;
 
+		//Several eClasses have the lower/upper features, we can't access them statically
+
 		lowerFeature = eObject.eClass().getEStructuralFeature("lower"); //$NON-NLS-1$
 		upperFeature = eObject.eClass().getEStructuralFeature("upper"); //$NON-NLS-1$
 
-		lowerBound = EMFProperties.value(lowerFeature).observe(eObject);
-		upperBound = EMFProperties.value(upperFeature).observe(eObject);
+		lowerBound = domain == null ? EMFProperties.value(lowerFeature).observe(eObject) : new PapyrusObservableValue(eObject, lowerFeature, domain);
+		upperBound = domain == null ? EMFProperties.value(upperFeature).observe(eObject) : new PapyrusObservableValue(eObject, upperFeature, domain);;
 	}
 
 	public Object getValueType() {
@@ -81,16 +113,16 @@ public class MultiplicityObservableValue extends AbstractObservableValue {
 		lower = (Integer)lowerValue;
 		upper = (Integer)upperValue;
 
-		if(lower == 0 && upper != 1) {
-			return "0..*"; //$NON-NLS-1$
+		if(lower == 0 && upper == -1) {
+			return ANY;
 		} else if(lower == 0 && upper == 1) {
-			return "0..1"; //$NON-NLS-1$
-		} else if(lower == 1 && upper != 1) {
-			return "1..*"; //$NON-NLS-1$
+			return OPTIONAL;
+		} else if(lower == 1 && upper == -1) {
+			return ONE_OR_MORE;
 		} else if(lower == 1 && upper == 1) {
-			return "1"; //$NON-NLS-1$
+			return ONE;
 		} else {
-			return "0..*"; //Default value for non-standard multiplicity //$NON-NLS-1$
+			return lower + SEPARATOR + upper;
 		}
 	}
 
@@ -98,18 +130,43 @@ public class MultiplicityObservableValue extends AbstractObservableValue {
 	protected void doSetValue(Object value) {
 		int lower, upper;
 		String val = (String)value;
-		if(val.equals("0..*")) { //$NON-NLS-1$
+		if(val.equals(ANY) || val.equals(STAR)) {
 			lower = 0;
 			upper = -1;
-		} else if(val.equals("0..1")) { //$NON-NLS-1$
+		} else if(val.equals(OPTIONAL)) {
 			lower = 0;
 			upper = 1;
-		} else if(val.equals("1..*")) { //$NON-NLS-1$
+		} else if(val.equals(ONE_OR_MORE)) {
 			lower = 1;
 			upper = -1;
-		} else { //if(val.equals("1")) { //Default
+		} else if(val.equals(ONE)) {
 			lower = 1;
 			upper = 1;
+		} else {
+			if(val.matches("^[0-9]+(..[0-9*]+)?$")) { //$NON-NLS-1$
+				try {
+					if (val.contains(SEPARATOR)){
+						lower = Integer.parseInt(val.substring(0, val.indexOf(SEPARATOR)));
+						String upperString = val.substring(val.indexOf(SEPARATOR) + SEPARATOR.length(), val.length());
+						if (STAR.equals(upperString)){
+							upper = -1;
+						} else {
+							upper = Integer.parseInt(upperString);
+						}
+					} else {
+						lower = Integer.parseInt(val);
+						upper = Integer.parseInt(val);
+					}
+				} catch (NumberFormatException ex) {
+					return; //Invalid multiplicity
+				}
+			} else {
+				return; //Invalid multiplicity
+			}
+		}
+		
+		if (upper > 0 && upper < lower){
+			return;
 		}
 
 		try {
diff --git a/plugins/uml/org.eclipse.papyrus.properties.uml/src/org/eclipse/papyrus/properties/uml/databinding/OwnerObservableValue.java b/plugins/uml/org.eclipse.papyrus.properties.uml/src/org/eclipse/papyrus/properties/uml/databinding/OwnerObservableValue.java
index 1091df835d6..a42d0c999c7 100644
--- a/plugins/uml/org.eclipse.papyrus.properties.uml/src/org/eclipse/papyrus/properties/uml/databinding/OwnerObservableValue.java
+++ b/plugins/uml/org.eclipse.papyrus.properties.uml/src/org/eclipse/papyrus/properties/uml/databinding/OwnerObservableValue.java
@@ -1,6 +1,6 @@
 /*****************************************************************************
  * Copyright (c) 2010 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
@@ -56,6 +56,10 @@ public class OwnerObservableValue extends AbstractObservableValue {
 
 	private String currentValue;
 
+	public static String CLASSIFIER = "Classifier"; //$NON-NLS-1$
+
+	public static String ASSOCIATION = "Association"; //$NON-NLS-1$
+
 	/**
 	 * Constructor.
 	 * 
@@ -90,7 +94,7 @@ public class OwnerObservableValue extends AbstractObservableValue {
 	protected void doSetValue(Object value) {
 		if(value instanceof String) {
 			String owner = (String)value;
-			boolean isOwnedByAssociation = "Association".equals(owner); //$NON-NLS-1$
+			boolean isOwnedByAssociation = ASSOCIATION.equals(owner);
 
 			Association association = memberEnd.getAssociation();
 
diff --git a/plugins/uml/org.eclipse.papyrus.properties.uml/src/org/eclipse/papyrus/properties/uml/modelelement/MemberEndModelElement.java b/plugins/uml/org.eclipse.papyrus.properties.uml/src/org/eclipse/papyrus/properties/uml/modelelement/MemberEndModelElement.java
index 2a443ab2b73..8e89b4814a3 100644
--- a/plugins/uml/org.eclipse.papyrus.properties.uml/src/org/eclipse/papyrus/properties/uml/modelelement/MemberEndModelElement.java
+++ b/plugins/uml/org.eclipse.papyrus.properties.uml/src/org/eclipse/papyrus/properties/uml/modelelement/MemberEndModelElement.java
@@ -1,6 +1,6 @@
 /*****************************************************************************
  * Copyright (c) 2010 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
@@ -11,6 +11,13 @@
  *****************************************************************************/
 package org.eclipse.papyrus.properties.uml.modelelement;
 
+import static org.eclipse.papyrus.properties.uml.databinding.MultiplicityObservableValue.ANY;
+import static org.eclipse.papyrus.properties.uml.databinding.MultiplicityObservableValue.ONE;
+import static org.eclipse.papyrus.properties.uml.databinding.MultiplicityObservableValue.ONE_OR_MORE;
+import static org.eclipse.papyrus.properties.uml.databinding.MultiplicityObservableValue.OPTIONAL;
+import static org.eclipse.papyrus.properties.uml.databinding.OwnerObservableValue.ASSOCIATION;
+import static org.eclipse.papyrus.properties.uml.databinding.OwnerObservableValue.CLASSIFIER;
+
 import org.eclipse.core.databinding.observable.IObservable;
 import org.eclipse.emf.ecore.EObject;
 import org.eclipse.emf.edit.domain.EditingDomain;
@@ -35,6 +42,21 @@ public class MemberEndModelElement extends AbstractModelElement {
 	private EditingDomain domain;
 
 	/**
+	 * The "multiplicity" virtual property
+	 */
+	public static String MULTIPLICITY = "multiplicity"; //$NON-NLS-1$
+
+	/**
+	 * The "owner" virtual property
+	 */
+	public static String OWNER = "owner"; //$NON-NLS-1$
+
+	/**
+	 * The "navigable" virtual property
+	 */
+	public static String NAVIGABLE = "navigable"; //$NON-NLS-1$
+
+	/**
 	 * 
 	 * Constructor.
 	 * 
@@ -49,11 +71,11 @@ public class MemberEndModelElement extends AbstractModelElement {
 	}
 
 	public IObservable getObservable(String propertyPath) {
-		if(propertyPath.equals("multiplicity")) { //$NON-NLS-1$
+		if(propertyPath.equals(MULTIPLICITY)) {
 			return new MultiplicityObservableValue(source, domain);
-		} else if(propertyPath.equals("owner")) { //$NON-NLS-1$
+		} else if(propertyPath.equals(OWNER)) {
 			return new OwnerObservableValue(source, domain);
-		} else if(propertyPath.equals("navigable")) { //$NON-NLS-1$
+		} else if(propertyPath.equals(NAVIGABLE)) {
 			return new NavigationObservableValue(source, domain);
 		}
 		Activator.log.warn("The property " + propertyPath + " doesn't exist"); //$NON-NLS-1$ //$NON-NLS-2$
@@ -62,11 +84,12 @@ public class MemberEndModelElement extends AbstractModelElement {
 
 	@Override
 	public IStaticContentProvider getContentProvider(String propertyPath) {
-		if(propertyPath.equals("multiplicity")) { //$NON-NLS-1$
-			return new StaticContentProvider(new String[]{ "0..*", "1..*", "0..1", "1" }); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$
-		} else {
-			return new StaticContentProvider(new String[]{ "Association", "Classifier" }); //$NON-NLS-1$ //$NON-NLS-2$
+		if(propertyPath.equals(MULTIPLICITY)) {
+			return new StaticContentProvider(new String[]{ ANY, ONE_OR_MORE, OPTIONAL, ONE });
+		} else if(propertyPath.equals(OWNER)) {
+			return new StaticContentProvider(new String[]{ ASSOCIATION, CLASSIFIER });
 		}
+		return super.getContentProvider(propertyPath);
 	}
 
 	@Override
@@ -76,7 +99,7 @@ public class MemberEndModelElement extends AbstractModelElement {
 
 	@Override
 	public boolean isEditable(String propertyPath) {
-		if(propertyPath.equals("owner")) { //$NON-NLS-1$
+		if(propertyPath.equals(OWNER)) {
 			return ((Property)source).getAssociation().getMemberEnds().size() <= 2;
 		}
 		return true;
@@ -84,6 +107,6 @@ public class MemberEndModelElement extends AbstractModelElement {
 
 	@Override
 	public boolean forceRefresh(String propertyPath) {
-		return propertyPath.equals("navigable") || propertyPath.equals("owner"); //$NON-NLS-1$ //$NON-NLS-2$
+		return propertyPath.equals(NAVIGABLE) || propertyPath.equals(OWNER);
 	}
 }
author	cletavernie	2011-07-13 09:10:39 +0000
committer	cletavernie	2011-07-13 09:10:39 +0000
commit	0380239f0c2d9240bc9f1c56c15684a6290dbd71 (patch)
tree	8c66d07dc6d76e4042ef2458d0b880598010e4e6
parent	823754baef9ba1619e46abfa53f694112c2edafd (diff)
download	org.eclipse.papyrus-0380239f0c2d9240bc9f1c56c15684a6290dbd71.tar.gz org.eclipse.papyrus-0380239f0c2d9240bc9f1c56c15684a6290dbd71.tar.xz org.eclipse.papyrus-0380239f0c2d9240bc9f1c56c15684a6290dbd71.zip