diff options
| author | ytanguy | 2011-11-21 14:27:30 +0000 |
|---|---|---|
| committer | ytanguy | 2011-11-21 14:27:30 +0000 |
| commit | 19ba5334cd9fc18b866cb6f048e88ca871e1ce1a (patch) | |
| tree | 63113b3f43ac3ed9b6a7bf4dc5d145aa160b0caa /plugins/sysml/diagram | |
| parent | 90b970bf4d469c5d82a96accab0770697456db08 (diff) | |
| download | org.eclipse.papyrus-19ba5334cd9fc18b866cb6f048e88ca871e1ce1a.tar.gz org.eclipse.papyrus-19ba5334cd9fc18b866cb6f048e88ca871e1ce1a.tar.xz org.eclipse.papyrus-19ba5334cd9fc18b866cb6f048e88ca871e1ce1a.zip | |
NEW - bug 364062: [Property Pages] Multiplicity parser should not be restricted to only integer literals
https://bugs.eclipse.org/bugs/show_bug.cgi?id=364062
Diffstat (limited to 'plugins/sysml/diagram')
5 files changed, 10 insertions, 10 deletions
diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-common-sysml/org/eclipse/papyrus/sysml/diagram/common/parser/FlowPortLabelParser.java b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-common-sysml/org/eclipse/papyrus/sysml/diagram/common/parser/FlowPortLabelParser.java index 33a5daeb7ae..5e061720947 100644 --- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-common-sysml/org/eclipse/papyrus/sysml/diagram/common/parser/FlowPortLabelParser.java +++ b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-common-sysml/org/eclipse/papyrus/sysml/diagram/common/parser/FlowPortLabelParser.java @@ -148,8 +148,8 @@ public class FlowPortLabelParser extends PropertyLabelParser { // If multiplicity is [1] (SysML default), only show when explicitly asked.
// TODO : add a case for default with multiplicity not set.
- String lower = ValueSpecificationUtil.getSpecificationValue(property.getLowerValue());
- String upper = ValueSpecificationUtil.getSpecificationValue(property.getUpperValue());
+ String lower = (property.getLowerValue() != null) ? ValueSpecificationUtil.getSpecificationValue(property.getLowerValue()) : "1";
+ String upper = (property.getLowerValue() != null) ? ValueSpecificationUtil.getSpecificationValue(property.getUpperValue()) : "1";
if(((flags & ILabelPreferenceConstants.DISP_DEFAULT_MULTIPLICITY) == ILabelPreferenceConstants.DISP_DEFAULT_MULTIPLICITY) || !("1".equals(lower) && "1".equals(upper))) {
if(lower.equals(upper)) {
diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-common-uml/org/eclipse/papyrus/uml/diagram/common/parser/AssociationEndLabelParser.java b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-common-uml/org/eclipse/papyrus/uml/diagram/common/parser/AssociationEndLabelParser.java index b2bca80a3ad..7377c20f32c 100644 --- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-common-uml/org/eclipse/papyrus/uml/diagram/common/parser/AssociationEndLabelParser.java +++ b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-common-uml/org/eclipse/papyrus/uml/diagram/common/parser/AssociationEndLabelParser.java @@ -111,8 +111,8 @@ public class AssociationEndLabelParser extends PropertyLabelParser { if(((flags & ILabelPreferenceConstants.DISP_MULTIPLICITY) == ILabelPreferenceConstants.DISP_MULTIPLICITY)) {
// If multiplicity is [1] (SysML default), only show when explicitly asked.
- String lower = ValueSpecificationUtil.getSpecificationValue(property.getLowerValue());
- String upper = ValueSpecificationUtil.getSpecificationValue(property.getUpperValue());
+ String lower = (property.getLowerValue() != null) ? ValueSpecificationUtil.getSpecificationValue(property.getLowerValue()) : "1";
+ String upper = (property.getLowerValue() != null) ? ValueSpecificationUtil.getSpecificationValue(property.getUpperValue()) : "1";
if(((flags & ILabelPreferenceConstants.DISP_DEFAULT_MULTIPLICITY) == ILabelPreferenceConstants.DISP_DEFAULT_MULTIPLICITY) || !("1".equals(lower) && "1".equals(upper))) {
if(lower.equals(upper)) {
diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-common-uml/org/eclipse/papyrus/uml/diagram/common/parser/MultiplicityElementLabelParser.java b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-common-uml/org/eclipse/papyrus/uml/diagram/common/parser/MultiplicityElementLabelParser.java index 90a209dd755..dfbc39694e7 100644 --- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-common-uml/org/eclipse/papyrus/uml/diagram/common/parser/MultiplicityElementLabelParser.java +++ b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-common-uml/org/eclipse/papyrus/uml/diagram/common/parser/MultiplicityElementLabelParser.java @@ -88,8 +88,8 @@ public class MultiplicityElementLabelParser implements IMaskManagedSemanticParse // If multiplicity is [1] (SysML default), only show when explicitly asked.
// TODO : add a case for default with multiplicity not set.
- String lower = ValueSpecificationUtil.getSpecificationValue(multElt.getLowerValue());
- String upper = ValueSpecificationUtil.getSpecificationValue(multElt.getUpperValue());
+ String lower = (multElt.getLowerValue() != null) ? ValueSpecificationUtil.getSpecificationValue(multElt.getLowerValue()) : "1";
+ String upper = (multElt.getLowerValue() != null) ? ValueSpecificationUtil.getSpecificationValue(multElt.getUpperValue()) : "1";
if(((flags & ILabelPreferenceConstants.DISP_DEFAULT_MULTIPLICITY) == ILabelPreferenceConstants.DISP_DEFAULT_MULTIPLICITY) || !("1".equals(lower) && "1".equals(upper))) {
if(lower.equals(upper)) {
diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-common-uml/org/eclipse/papyrus/uml/diagram/common/parser/ParameterLabelParser.java b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-common-uml/org/eclipse/papyrus/uml/diagram/common/parser/ParameterLabelParser.java index ae2705c5ec2..5e17b05dd39 100644 --- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-common-uml/org/eclipse/papyrus/uml/diagram/common/parser/ParameterLabelParser.java +++ b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-common-uml/org/eclipse/papyrus/uml/diagram/common/parser/ParameterLabelParser.java @@ -112,8 +112,8 @@ public class ParameterLabelParser extends NamedElementLabelParser { }
// manage multiplicity
- String lower = ValueSpecificationUtil.getSpecificationValue(parameter.getLowerValue());
- String upper = ValueSpecificationUtil.getSpecificationValue(parameter.getUpperValue());
+ String lower = (parameter.getLowerValue() != null) ? ValueSpecificationUtil.getSpecificationValue(parameter.getLowerValue()) : "1";
+ String upper = (parameter.getLowerValue() != null) ? ValueSpecificationUtil.getSpecificationValue(parameter.getUpperValue()) : "1";
if(((flags & ILabelPreferenceConstants.DISP_PARAM_MULTIPLICITY) == ILabelPreferenceConstants.DISP_PARAM_MULTIPLICITY) && !("1".equals(lower) && "1".equals(upper))) {
result = String.format(MULTIPLICITY_FORMAT, result, lower, upper);
}
diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-common-uml/org/eclipse/papyrus/uml/diagram/common/parser/PropertyLabelParser.java b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-common-uml/org/eclipse/papyrus/uml/diagram/common/parser/PropertyLabelParser.java index 783c3dc138b..33da2cfbf46 100644 --- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-common-uml/org/eclipse/papyrus/uml/diagram/common/parser/PropertyLabelParser.java +++ b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-common-uml/org/eclipse/papyrus/uml/diagram/common/parser/PropertyLabelParser.java @@ -129,8 +129,8 @@ public class PropertyLabelParser extends NamedElementLabelParser { // If multiplicity is [1] (SysML default), only show when explicitly asked.
// TODO : add a case for default with multiplicity not set.
- String lower = ValueSpecificationUtil.getSpecificationValue(property.getLowerValue());
- String upper = ValueSpecificationUtil.getSpecificationValue(property.getUpperValue());
+ String lower = (property.getLowerValue() != null) ? ValueSpecificationUtil.getSpecificationValue(property.getLowerValue()) : "1";
+ String upper = (property.getLowerValue() != null) ? ValueSpecificationUtil.getSpecificationValue(property.getUpperValue()) : "1";
if(((flags & ILabelPreferenceConstants.DISP_DEFAULT_MULTIPLICITY) == ILabelPreferenceConstants.DISP_DEFAULT_MULTIPLICITY) || !("1".equals(lower) && "1".equals(upper))) {
if(lower.equals(upper)) {
|