Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorNicolas FAUVERGUE2015-04-09 08:59:10 -0400
committerCamille Letavernier2015-04-27 08:12:44 -0400
commitf5d0993829fc8d5302fe932a1d69bc0ec7e15ce3 (patch)
tree00225f7cb186fa701a14ead1dfb7b14a4e5e1151 /examples/uml
parent2ea82a20a294dfd6603a0f8c60833794d6b33d0c (diff)
downloadorg.eclipse.papyrus-f5d0993829fc8d5302fe932a1d69bc0ec7e15ce3.tar.gz
org.eclipse.papyrus-f5d0993829fc8d5302fe932a1d69bc0ec7e15ce3.tar.xz
org.eclipse.papyrus-f5d0993829fc8d5302fe932a1d69bc0ec7e15ce3.zip
Bug 446865: lowerValue and upperValue cardinality values not accessible
through UI https://bugs.eclipse.org/bugs/show_bug.cgi?id=446865 Manage the multiplicity editor with 2 modes : - The 'simple' mode which allow to edit the lower and upper value in a single editor - The 'advanced' mode which allow to edit the lower and the upper values in two ValueSpecification editors. The editors of ValueSpecification can be : - Simple editor with CLabel - XText editor - Manage the JUnit tests for the specific lower and upper values The XText editors have some spcifications depending on lower or upper values : - The lower XText ValueSpecification editor always create LiteralInteger instead of LiteralUnlimitedNatural - The upper XText ValueSpecification editor always create LiteralUnlimitedNatural instead of LiteralInteger when this is possible (-1 (or *), 0 or positive) A validator on the upper value is available for the UnlimitedNatural help assist Preferences Multiplicity Editor are available to manage the mode display. Multiplicity editor help is available in this commit. Change-Id: If7bc2be230e25dde7e1c113cd09f4b0add8bb94d Signed-off-by: Nicolas FAUVERGUE <nicolas.fauvergue@all4tec.net> Reviewed-on: https://git.eclipse.org/r/45542 Tested-by: Hudson CI Reviewed-by: Gabriel Pascual <gabriel.pascual@all4tec.net> Reviewed-by: Camille Letavernier <camille.letavernier@cea.fr>
Diffstat (limited to 'examples/uml')
-rw-r--r--examples/uml/org.eclipse.papyrus.uml.textual.editors.example/model/UML/ui/PropertyExample.xwt3
1 files changed, 2 insertions, 1 deletions
diff --git a/examples/uml/org.eclipse.papyrus.uml.textual.editors.example/model/UML/ui/PropertyExample.xwt b/examples/uml/org.eclipse.papyrus.uml.textual.editors.example/model/UML/ui/PropertyExample.xwt
index afde1ae27a9..c9e45dd834a 100644
--- a/examples/uml/org.eclipse.papyrus.uml.textual.editors.example/model/UML/ui/PropertyExample.xwt
+++ b/examples/uml/org.eclipse.papyrus.uml.textual.editors.example/model/UML/ui/PropertyExample.xwt
@@ -32,7 +32,8 @@
customLabel="defaultEditor"></ppe:ReferenceDialog>
<ppe:CompletionStyledTextReferenceDialog
input="{Binding}" property="UML:TypedElement:type" customLabel="newType"></ppe:CompletionStyledTextReferenceDialog>
- <ppe:StringCombo input="{Binding}" property="Multiplicity:multiplicity"></ppe:StringCombo>
+ <xtexteditor:MultiplicityXTextDialog
+ property="Multiplicity:multiplicity" input="{Binding}"></xtexteditor:MultiplicityXTextDialog>
<ppe:ReferenceDialog input="{Binding}"
property="UML:Property:defaultValue"></ppe:ReferenceDialog>
<xtexteditor:UMLStyledTextReferenceDialog

Back to the top