1 files changed, 173 insertions, 171 deletions
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/custom-src/org/eclipse/papyrus/uml/diagram/activity/parser/custom/PinParser.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/custom-src/org/eclipse/papyrus/uml/diagram/activity/parser/custom/PinParser.java
index 07b8a2abe05..6d96e37e971 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/custom-src/org/eclipse/papyrus/uml/diagram/activity/parser/custom/PinParser.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/custom-src/org/eclipse/papyrus/uml/diagram/activity/parser/custom/PinParser.java
@@ -1,171 +1,173 @@
-/*****************************************************************************
- * Copyright (c) 2009 Atos Origin.
- *
- *
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *   Atos Origin - Initial API and implementation
- *
- *****************************************************************************/
-package org.eclipse.papyrus.uml.diagram.activity.parser.custom;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import org.eclipse.core.runtime.IAdaptable;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.ecore.EAttribute;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.EStructuralFeature;
-import org.eclipse.gmf.runtime.emf.ui.services.parser.ISemanticParser;
-import org.eclipse.papyrus.uml.diagram.activity.parsers.MessageFormatParser;
-import org.eclipse.uml2.uml.Element;
-import org.eclipse.uml2.uml.Pin;
-import org.eclipse.uml2.uml.State;
-import org.eclipse.uml2.uml.UMLPackage;
-
-/**
- * A specific parser for displaying the label of a Pin. This parser refreshes
- * the text displayed for the Pin.
- */
-public class PinParser extends MessageFormatParser implements ISemanticParser {
-
-	/** The String format for displaying in State property */
-	private static final String STATE_DISPLAY = System.getProperty("line.separator").concat("[%s]");
-
-	/** The String for separating states */
-	private static final String STATE_SEPARATOR = ", ";
-
-	public PinParser(EAttribute[] features, EAttribute[] editableFeatures) {
-		super(features, editableFeatures);
-	}
-
-	public PinParser(EAttribute[] features) {
-		super(features);
-	}
-
-	public PinParser() {
-		super(new EAttribute[] { UMLPackage.eINSTANCE.getNamedElement_Name() });
-	}
-
-	protected EStructuralFeature getEStructuralFeature(Object notification) {
-		EStructuralFeature featureImpl = null;
-		if (notification instanceof Notification) {
-			Object feature = ((Notification) notification).getFeature();
-			if (feature instanceof EStructuralFeature) {
-				featureImpl = (EStructuralFeature) feature;
-			}
-		}
-		return featureImpl;
-	}
-
-	/*
-	 * (non-Javadoc)
-	 *
-	 * @see
-	 * org.eclipse.papyrus.uml.diagram.sequence.parsers.AbstractParser#isAffectingEvent
-	 * (java.lang.Object , int)
-	 */
-	@Override
-	public boolean isAffectingEvent(Object event, int flags) {
-		EStructuralFeature feature = getEStructuralFeature(event);
-		return isValidFeature(feature);
-	}
-
-	/*
-	 * (non-Javadoc)
-	 *
-	 * @see org.eclipse.papyrus.uml.diagram.sequence.parsers.MessageFormatParser#
-	 * getPrintString(org.eclipse .core.runtime.IAdaptable, int)
-	 */
-	@Override
-	public String getPrintString(IAdaptable element, int flags) {
-		StringBuffer label = new StringBuffer();
-		Object obj = element.getAdapter(EObject.class);
-		if (obj instanceof Pin) {
-			Pin pin = (Pin) obj;
-			String name = pin.getName();
-			if (name == null) {
-				name = "";
-			}
-			label.append(name);
-			if (pin.getInStates() != null) {
-				// manage states
-				StringBuffer stateLabel = new StringBuffer();
-				for (State state : pin.getInStates()) {
-					if (state != null) {
-						String stateName = state.getName();
-						if (stateName == null) {
-							stateName = "";
-						}
-						if (!"".equals(stateName)) {
-							if (stateLabel.length() > 0) {
-								stateLabel.append(STATE_SEPARATOR);
-							}
-							stateLabel.append(stateName);
-						}
-					}
-				}
-				if (stateLabel.length() > 0) {
-					label.append(String.format(STATE_DISPLAY, stateLabel.toString()));
-				}
-			}
-		}
-		if (label.length() == 0) {
-			label.append(" ");
-		}
-		return label.toString();
-	}
-
-	/*
-	 * (non-Javadoc)
-	 *
-	 * @see org.eclipse.gmf.runtime.emf.ui.services.parser.ISemanticParser#
-	 * areSemanticElementsAffected (org.eclipse.emf.ecore.EObject,
-	 * java.lang.Object)
-	 */
-	@Override
-	public boolean areSemanticElementsAffected(EObject listener, Object notification) {
-		EStructuralFeature feature = getEStructuralFeature(notification);
-		return isValidFeature(feature);
-	}
-
-	/*
-	 * (non-Javadoc)
-	 *
-	 * @see org.eclipse.gmf.runtime.emf.ui.services.parser.ISemanticParser#
-	 * getSemanticElementsBeingParsed (org.eclipse.emf.ecore.EObject)
-	 */
-	@Override
-	public List<?> getSemanticElementsBeingParsed(EObject element) {
-		List<Element> semanticElementsBeingParsed = new ArrayList<Element>();
-		if (element instanceof Pin) {
-			Pin pin = (Pin) element;
-			semanticElementsBeingParsed.add(pin);
-			if (pin.getInStates() != null) {
-				for (State state : pin.getInStates()) {
-					if (state != null) {
-						semanticElementsBeingParsed.add(state);
-					}
-				}
-			}
-		}
-		return semanticElementsBeingParsed;
-	}
-
-	/**
-	 * Determines if the given feature has to be taken into account in this
-	 * parser
-	 *
-	 * @param feature
-	 *            the feature to test
-	 * @return true if is valid, false otherwise
-	 */
-	private boolean isValidFeature(EStructuralFeature feature) {
-		return UMLPackage.eINSTANCE.getNamedElement_Name().equals(feature) || UMLPackage.eINSTANCE.getObjectNode_InState().equals(feature);
-	}
-}
+/*****************************************************************************
+ * Copyright (c) 2009 Atos Origin.
+ *
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *   Atos Origin - Initial API and implementation
+ *   Nicolas FAUVERGUE (ALL4TEC) nicolas.fauvergue@all4tec.net - Bug 496905
+ *
+ *****************************************************************************/
+package org.eclipse.papyrus.uml.diagram.activity.parser.custom;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import org.eclipse.core.runtime.IAdaptable;
+import org.eclipse.emf.common.notify.Notification;
+import org.eclipse.emf.ecore.EAttribute;
+import org.eclipse.emf.ecore.EObject;
+import org.eclipse.emf.ecore.EStructuralFeature;
+import org.eclipse.gmf.runtime.emf.ui.services.parser.ISemanticParser;
+import org.eclipse.papyrus.uml.diagram.activity.parsers.MessageFormatParser;
+import org.eclipse.papyrus.uml.internationalization.utils.utils.UMLLabelInternationalization;
+import org.eclipse.uml2.uml.Element;
+import org.eclipse.uml2.uml.Pin;
+import org.eclipse.uml2.uml.State;
+import org.eclipse.uml2.uml.UMLPackage;
+
+/**
+ * A specific parser for displaying the label of a Pin. This parser refreshes
+ * the text displayed for the Pin.
+ */
+public class PinParser extends MessageFormatParser implements ISemanticParser {
+
+	/** The String format for displaying in State property */
+	private static final String STATE_DISPLAY = System.getProperty("line.separator").concat("[%s]");
+
+	/** The String for separating states */
+	private static final String STATE_SEPARATOR = ", ";
+
+	public PinParser(EAttribute[] features, EAttribute[] editableFeatures) {
+		super(features, editableFeatures);
+	}
+
+	public PinParser(EAttribute[] features) {
+		super(features);
+	}
+
+	public PinParser() {
+		super(new EAttribute[] { UMLPackage.eINSTANCE.getNamedElement_Name() });
+	}
+
+	protected EStructuralFeature getEStructuralFeature(Object notification) {
+		EStructuralFeature featureImpl = null;
+		if (notification instanceof Notification) {
+			Object feature = ((Notification) notification).getFeature();
+			if (feature instanceof EStructuralFeature) {
+				featureImpl = (EStructuralFeature) feature;
+			}
+		}
+		return featureImpl;
+	}
+
+	/*
+	 * (non-Javadoc)
+	 *
+	 * @see
+	 * org.eclipse.papyrus.uml.diagram.sequence.parsers.AbstractParser#isAffectingEvent
+	 * (java.lang.Object , int)
+	 */
+	@Override
+	public boolean isAffectingEvent(Object event, int flags) {
+		EStructuralFeature feature = getEStructuralFeature(event);
+		return isValidFeature(feature);
+	}
+
+	/*
+	 * (non-Javadoc)
+	 *
+	 * @see org.eclipse.papyrus.uml.diagram.sequence.parsers.MessageFormatParser#
+	 * getPrintString(org.eclipse .core.runtime.IAdaptable, int)
+	 */
+	@Override
+	public String getPrintString(IAdaptable element, int flags) {
+		StringBuffer label = new StringBuffer();
+		Object obj = element.getAdapter(EObject.class);
+		if (obj instanceof Pin) {
+			Pin pin = (Pin) obj;
+			String name = UMLLabelInternationalization.getInstance().getLabel(pin);
+			if (name == null) {
+				name = "";
+			}
+			label.append(name);
+			if (pin.getInStates() != null) {
+				// manage states
+				StringBuffer stateLabel = new StringBuffer();
+				for (State state : pin.getInStates()) {
+					if (state != null) {
+						String stateName = UMLLabelInternationalization.getInstance().getLabel(state);
+						if (stateName == null) {
+							stateName = "";
+						}
+						if (!"".equals(stateName)) {
+							if (stateLabel.length() > 0) {
+								stateLabel.append(STATE_SEPARATOR);
+							}
+							stateLabel.append(stateName);
+						}
+					}
+				}
+				if (stateLabel.length() > 0) {
+					label.append(String.format(STATE_DISPLAY, stateLabel.toString()));
+				}
+			}
+		}
+		if (label.length() == 0) {
+			label.append(" ");
+		}
+		return label.toString();
+	}
+
+	/*
+	 * (non-Javadoc)
+	 *
+	 * @see org.eclipse.gmf.runtime.emf.ui.services.parser.ISemanticParser#
+	 * areSemanticElementsAffected (org.eclipse.emf.ecore.EObject,
+	 * java.lang.Object)
+	 */
+	@Override
+	public boolean areSemanticElementsAffected(EObject listener, Object notification) {
+		EStructuralFeature feature = getEStructuralFeature(notification);
+		return isValidFeature(feature);
+	}
+
+	/*
+	 * (non-Javadoc)
+	 *
+	 * @see org.eclipse.gmf.runtime.emf.ui.services.parser.ISemanticParser#
+	 * getSemanticElementsBeingParsed (org.eclipse.emf.ecore.EObject)
+	 */
+	@Override
+	public List<?> getSemanticElementsBeingParsed(EObject element) {
+		List<Element> semanticElementsBeingParsed = new ArrayList<Element>();
+		if (element instanceof Pin) {
+			Pin pin = (Pin) element;
+			semanticElementsBeingParsed.add(pin);
+			if (pin.getInStates() != null) {
+				for (State state : pin.getInStates()) {
+					if (state != null) {
+						semanticElementsBeingParsed.add(state);
+					}
+				}
+			}
+		}
+		return semanticElementsBeingParsed;
+	}
+
+	/**
+	 * Determines if the given feature has to be taken into account in this
+	 * parser
+	 *
+	 * @param feature
+	 *            the feature to test
+	 * @return true if is valid, false otherwise
+	 */
+	private boolean isValidFeature(EStructuralFeature feature) {
+		return UMLPackage.eINSTANCE.getNamedElement_Name().equals(feature) || UMLPackage.eINSTANCE.getObjectNode_InState().equals(feature);
+	}
+}