374781: [BDD] Visibility and Direction cannot both be displayed in FlowPort label

https://bugs.eclipse.org/bugs/show_bug.cgi?id=374781

3 files changed, 19 insertions, 17 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 5d86d68866e..3936cdc2c9a 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
@@ -52,11 +52,11 @@ public class FlowPortLabelParser extends PropertyLabelParser {
 	 */

 	@Override

 	public String getPrintString(IAdaptable element, int flags) {

-		

-		if (flags == 0) {

+

+		if(flags == 0) {

 			return MaskedLabel;

 		}

-		

+

 		String result = "";

 		EObject eObject = (EObject)element.getAdapter(EObject.class);

 

@@ -67,6 +67,7 @@ public class FlowPortLabelParser extends PropertyLabelParser {
 			FlowPort flowPort = UMLUtil.getStereotypeApplication(property, FlowPort.class);

 			if(flowPort != null) {

 

+				int directionFlag = flags & ILabelPreferenceConstants.DISP_DIRECTION;

 				// manage direction only if the FlowPort is type and type is not a FlowSpecification

 				if((flags & ILabelPreferenceConstants.DISP_DIRECTION) == ILabelPreferenceConstants.DISP_DIRECTION) {

 					String direction;

@@ -84,9 +85,9 @@ public class FlowPortLabelParser extends PropertyLabelParser {
 						direction = "inout";

 						break;

 					}

-					

+

 					// manage direction only if the FlowPort is not a FlowSpecification

-					if ((property.getType() == null) || ((property.getType() != null) && (UMLUtil.getStereotypeApplication(property.getType(), FlowSpecification.class) == null))) {

+					if((property.getType() == null) || ((property.getType() != null) && (UMLUtil.getStereotypeApplication(property.getType(), FlowSpecification.class) == null))) {

 						result = String.format(DIRECTION_FORMAT, direction, result);

 					}

 				}

@@ -112,7 +113,7 @@ public class FlowPortLabelParser extends PropertyLabelParser {
 					visibility = "+";

 					break;

 				}

-				result = String.format(VISIBILITY_FORMAT, visibility);

+				result = String.format(VISIBILITY_FORMAT, visibility, result);

 			}

 

 			// manage derived modifier

@@ -231,7 +232,8 @@ public class FlowPortLabelParser extends PropertyLabelParser {
 		}

 		return semanticElementsBeingParsed;

 	}

-	

+

+	@Override

 	public Map<Integer, String> getMasks() {

 		Map<Integer, String> masks = new HashMap<Integer, String>(10);

 		masks.put(ILabelPreferenceConstants.DISP_DIRECTION, "Direction");

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 e495e3ead6e..03a21c5fca4 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
@@ -39,11 +39,11 @@ public class AssociationEndLabelParser extends PropertyLabelParser {
 	 */

 	@Override

 	public String getPrintString(IAdaptable element, int flags) {

-		

-		if (flags == 0) {

+

+		if(flags == 0) {

 			return MaskedLabel;

 		}

-		

+

 		String result = "";

 		EObject eObject = (EObject)element.getAdapter(EObject.class);

 

@@ -71,7 +71,7 @@ public class AssociationEndLabelParser extends PropertyLabelParser {
 					visibility = "+";

 					break;

 				}

-				result = String.format(VISIBILITY_FORMAT, visibility);

+				result = String.format(VISIBILITY_FORMAT, visibility, result);

 			}

 

 			// manage derived modifier

@@ -158,7 +158,7 @@ public class AssociationEndLabelParser extends PropertyLabelParser {
 		}

 		return result;

 	}

-	

+

 	/**

 	 * {@inheritDoc}

 	 */

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 33da2cfbf46..618b7701015 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
@@ -37,7 +37,7 @@ import org.eclipse.uml2.uml.VisibilityKind;
 public class PropertyLabelParser extends NamedElementLabelParser {

 

 	/** The String format for displaying a {@link Property} with visibility */

-	protected static final String VISIBILITY_FORMAT = "%s ";

+	protected static final String VISIBILITY_FORMAT = "%s %s";

 

 	/** The String format for displaying a {@link Property} label with derived modifier */

 	protected static final String DERIVED_FORMAT = "%s/";

@@ -65,11 +65,11 @@ public class PropertyLabelParser extends NamedElementLabelParser {
 	 */

 	@Override

 	public String getPrintString(IAdaptable element, int flags) {

-		

-		if (flags == 0) {

+

+		if(flags == 0) {

 			return MaskedLabel;

 		}

-		

+

 		String result = "";

 		EObject eObject = (EObject)element.getAdapter(EObject.class);

 

@@ -97,7 +97,7 @@ public class PropertyLabelParser extends NamedElementLabelParser {
 					visibility = "+";

 					break;

 				}

-				result = String.format(VISIBILITY_FORMAT, visibility);

+				result = String.format(VISIBILITY_FORMAT, visibility, result);

 			}

 

 			// manage derived modifier