Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorcletavernie2011-07-13 09:52:27 +0000
committercletavernie2011-07-13 09:52:27 +0000
commitdcd9c7ea96e316681f7e9c57f7dc1e2e41c0ccb7 (patch)
tree36a8499c4d454f374f5c4e204a70e18d9741441f
parent689fa20ae7340f040162df11af26242e24bc6f9d (diff)
downloadorg.eclipse.papyrus-dcd9c7ea96e316681f7e9c57f7dc1e2e41c0ccb7.tar.gz
org.eclipse.papyrus-dcd9c7ea96e316681f7e9c57f7dc1e2e41c0ccb7.tar.xz
org.eclipse.papyrus-dcd9c7ea96e316681f7e9c57f7dc1e2e41c0ccb7.zip
344857: [class diagram] too restricted mutliplicity values in property view
https://bugs.eclipse.org/bugs/show_bug.cgi?id=344857
-rw-r--r--plugins/uml/org.eclipse.papyrus.properties.uml/src/org/eclipse/papyrus/properties/uml/databinding/MultiplicityObservableValue.java6
1 files changed, 3 insertions, 3 deletions
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 15b3bb6166e..75ff19f0344 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
@@ -122,7 +122,7 @@ public class MultiplicityObservableValue extends AbstractObservableValue {
} else if(lower == 1 && upper == 1) {
return ONE;
} else {
- return lower + SEPARATOR + upper;
+ return lower + SEPARATOR + (upper < 0 ? STAR : upper);
}
}
@@ -164,8 +164,8 @@ public class MultiplicityObservableValue extends AbstractObservableValue {
return; //Invalid multiplicity
}
}
-
- if (upper > 0 && upper < lower){
+
+ if((upper > 0 && upper < lower) || upper == 0) {
return;
}

Back to the top