diff options
author | ashatilov | 2015-06-05 11:55:23 +0000 |
---|---|---|
committer | Gerrit Code Review @ Eclipse.org | 2015-09-18 08:46:07 +0000 |
commit | 2809ab62079f89faa8024f269543a038448754f5 (patch) | |
tree | 09fb13b1be41122bbc717425c8d48792f08f347e /plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src/org/eclipse | |
parent | 2e0b2580ba0f04536c610d890d93806bd721e16f (diff) | |
download | org.eclipse.papyrus-2809ab62079f89faa8024f269543a038448754f5.tar.gz org.eclipse.papyrus-2809ab62079f89faa8024f269543a038448754f5.tar.xz org.eclipse.papyrus-2809ab62079f89faa8024f269543a038448754f5.zip |
Multiplicity of associations shown in diagrams should not be between
square brackets (SySML contribution)
Change-Id: I20cab4b19bdb9592ba9a09afae0bd7ecebbe99ba
Signed-off-by: ashatilov <shatilov@montages.com>
Diffstat (limited to 'plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src/org/eclipse')
-rw-r--r-- | plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src/org/eclipse/papyrus/sysml/diagram/common/utils/SysMLMultiplicityElementUtil.java | 10 |
1 files changed, 1 insertions, 9 deletions
diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src/org/eclipse/papyrus/sysml/diagram/common/utils/SysMLMultiplicityElementUtil.java b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src/org/eclipse/papyrus/sysml/diagram/common/utils/SysMLMultiplicityElementUtil.java index 9df93007fbe..0a3c43d485a 100644 --- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src/org/eclipse/papyrus/sysml/diagram/common/utils/SysMLMultiplicityElementUtil.java +++ b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src/org/eclipse/papyrus/sysml/diagram/common/utils/SysMLMultiplicityElementUtil.java @@ -8,8 +8,6 @@ import org.eclipse.uml2.uml.MultiplicityElement; public class SysMLMultiplicityElementUtil extends org.eclipse.papyrus.uml.tools.utils.MultiplicityElementUtil {
- private static final String DEFAULT_MULTIPLICITY = "[1]";
-
/**
* If multiplicity is [1] (SysML default), only show when explicitly asked.
*/
@@ -19,12 +17,6 @@ public class SysMLMultiplicityElementUtil extends org.eclipse.papyrus.uml.tools. public static String formatMultiplicity(MultiplicityElement element, boolean blockDefault) {
String result = formatMultiplicity(element);
- if (result == null || result.isEmpty()) {
- result = DEFAULT_MULTIPLICITY;
- }
- if (blockDefault && DEFAULT_MULTIPLICITY.equals(result)) {
- result = "";
- }
- return result;
+ return manageDefaultMultiplicity(result, blockDefault);
}
}
|