diff options
Diffstat (limited to 'plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/custom-src/org/eclipse/papyrus/uml/diagram/statemachine')
11 files changed, 52 insertions, 20 deletions
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/custom-src/org/eclipse/papyrus/uml/diagram/statemachine/UmlStateMachineDiagramForMultiEditor.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/custom-src/org/eclipse/papyrus/uml/diagram/statemachine/UmlStateMachineDiagramForMultiEditor.java index 47b38356238..cd73ee7fad0 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/custom-src/org/eclipse/papyrus/uml/diagram/statemachine/UmlStateMachineDiagramForMultiEditor.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/custom-src/org/eclipse/papyrus/uml/diagram/statemachine/UmlStateMachineDiagramForMultiEditor.java @@ -8,6 +8,7 @@ * * Contributors: * CEA LIST - Initial API and implementation + * Nicolas FAUVERGUE (ALL4TEC) nicolas.fauvergue@all4tec.net - Bug 496905 */ package org.eclipse.papyrus.uml.diagram.statemachine; @@ -22,6 +23,7 @@ import org.eclipse.jface.util.LocalSelectionTransfer; import org.eclipse.papyrus.infra.core.editor.BackboneException; import org.eclipse.papyrus.infra.core.services.ServiceException; import org.eclipse.papyrus.infra.core.services.ServicesRegistry; +import org.eclipse.papyrus.infra.internationalization.utils.utils.LabelInternationalization; import org.eclipse.papyrus.uml.diagram.common.listeners.DropTargetListener; import org.eclipse.papyrus.uml.diagram.statemachine.custom.util.FixNestedStateAndRegionOnOpening; import org.eclipse.papyrus.uml.diagram.statemachine.part.UMLDiagramEditor; @@ -90,7 +92,7 @@ public class UmlStateMachineDiagramForMultiEditor extends UMLDiagramEditor { @Override public void init(IEditorSite site, IEditorInput input) throws PartInitException { super.init(site, input); - setPartName(getDiagram().getName()); + setPartName(LabelInternationalization.getInstance().getDiagramLabel(getDiagram())); titleImage = DIAG_IMG_DESC.createImage(); setTitleImage(titleImage); } diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/custom-src/org/eclipse/papyrus/uml/diagram/statemachine/custom/edit/part/CustomConnectionPointReferenceNameEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/custom-src/org/eclipse/papyrus/uml/diagram/statemachine/custom/edit/part/CustomConnectionPointReferenceNameEditPart.java index 0d23b2c45be..487ad184468 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/custom-src/org/eclipse/papyrus/uml/diagram/statemachine/custom/edit/part/CustomConnectionPointReferenceNameEditPart.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/custom-src/org/eclipse/papyrus/uml/diagram/statemachine/custom/edit/part/CustomConnectionPointReferenceNameEditPart.java @@ -8,6 +8,7 @@ * * Contributors: * CEA LIST - Initial API and implementation + * Nicolas FAUVERGUE (ALL4TEC) nicolas.fauvergue@all4tec.net - Bug 496905 */ package org.eclipse.papyrus.uml.diagram.statemachine.custom.edit.part; @@ -16,6 +17,7 @@ import org.eclipse.gmf.runtime.notation.View; import org.eclipse.papyrus.uml.diagram.statemachine.custom.figures.ConnectionPointReferenceFigure; import org.eclipse.papyrus.uml.diagram.statemachine.edit.parts.ConnectionPointReferenceEditPart; import org.eclipse.papyrus.uml.diagram.statemachine.edit.parts.ConnectionPointReferenceNameEditPart; +import org.eclipse.papyrus.uml.internationalization.utils.utils.UMLLabelInternationalization; import org.eclipse.uml2.uml.ConnectionPointReference; import org.eclipse.uml2.uml.Pseudostate; @@ -44,7 +46,7 @@ public class CustomConnectionPointReferenceNameEditPart extends ConnectionPointR } else { first = false; } - label += p.getName(); + label += UMLLabelInternationalization.getInstance().getLabel(p); } } else if (!ref.getExits().isEmpty()) { boolean first = true; @@ -54,7 +56,7 @@ public class CustomConnectionPointReferenceNameEditPart extends ConnectionPointR } else { first = false; } - label += p.getName(); + label += UMLLabelInternationalization.getInstance().getLabel(p); } } return label; diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/custom-src/org/eclipse/papyrus/uml/diagram/statemachine/custom/edit/part/CustomRegionCompartmentEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/custom-src/org/eclipse/papyrus/uml/diagram/statemachine/custom/edit/part/CustomRegionCompartmentEditPart.java index 0917f662597..6d13e720ef9 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/custom-src/org/eclipse/papyrus/uml/diagram/statemachine/custom/edit/part/CustomRegionCompartmentEditPart.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/custom-src/org/eclipse/papyrus/uml/diagram/statemachine/custom/edit/part/CustomRegionCompartmentEditPart.java @@ -8,6 +8,7 @@ * * Contributors: * CEA LIST - Initial API and implementation + * Nicolas FAUVERGUE (ALL4TEC) nicolas.fauvergue@all4tec.net - Bug 496905 */ package org.eclipse.papyrus.uml.diagram.statemachine.custom.edit.part; @@ -22,6 +23,7 @@ import org.eclipse.gmf.runtime.diagram.ui.internal.tools.RubberbandDragTracker; import org.eclipse.gmf.runtime.notation.View; import org.eclipse.papyrus.uml.diagram.statemachine.custom.figures.CustomRegionCompartmentFigure; import org.eclipse.papyrus.uml.diagram.statemachine.edit.parts.RegionCompartmentEditPart; +import org.eclipse.papyrus.uml.internationalization.utils.utils.UMLLabelInternationalization; import org.eclipse.uml2.uml.Region; public class CustomRegionCompartmentEditPart extends RegionCompartmentEditPart { @@ -78,7 +80,7 @@ public class CustomRegionCompartmentEditPart extends RegionCompartmentEditPart { View regionView = (View) ((View) getModel()).eContainer(); Region region = (Region) regionView.getElement(); - ((ResizableCompartmentFigure) getFigure()).setToolTip(region.getName()); + ((ResizableCompartmentFigure) getFigure()).setToolTip(UMLLabelInternationalization.getInstance().getLabel(region)); } } diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/custom-src/org/eclipse/papyrus/uml/diagram/statemachine/custom/edit/part/CustomStateCompartmentEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/custom-src/org/eclipse/papyrus/uml/diagram/statemachine/custom/edit/part/CustomStateCompartmentEditPart.java index 195da33523f..03c590a4247 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/custom-src/org/eclipse/papyrus/uml/diagram/statemachine/custom/edit/part/CustomStateCompartmentEditPart.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/custom-src/org/eclipse/papyrus/uml/diagram/statemachine/custom/edit/part/CustomStateCompartmentEditPart.java @@ -8,6 +8,7 @@ * * Contributors: * CEA LIST - Initial API and implementation + * Nicolas FAUVERGUE (ALL4TEC) nicolas.fauvergue@all4tec.net - Bug 496905 */ package org.eclipse.papyrus.uml.diagram.statemachine.custom.edit.part; @@ -17,6 +18,7 @@ import org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles; import org.eclipse.gmf.runtime.notation.View; import org.eclipse.papyrus.uml.diagram.statemachine.custom.figures.CustomStateCompartmentFigure; import org.eclipse.papyrus.uml.diagram.statemachine.edit.parts.StateCompartmentEditPart; +import org.eclipse.papyrus.uml.internationalization.utils.utils.UMLLabelInternationalization; import org.eclipse.uml2.uml.State; public class CustomStateCompartmentEditPart extends StateCompartmentEditPart { @@ -55,7 +57,7 @@ public class CustomStateCompartmentEditPart extends StateCompartmentEditPart { if (stateView != null) { State state = (State) stateView.getElement(); - ((CustomStateCompartmentFigure) getFigure()).setToolTip(state.getName()); + ((CustomStateCompartmentFigure) getFigure()).setToolTip(UMLLabelInternationalization.getInstance().getLabel(state)); } } diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/custom-src/org/eclipse/papyrus/uml/diagram/statemachine/custom/edit/part/CustomStateCompartmentEditPartTN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/custom-src/org/eclipse/papyrus/uml/diagram/statemachine/custom/edit/part/CustomStateCompartmentEditPartTN.java index c4e46d385ba..52bb00ddb53 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/custom-src/org/eclipse/papyrus/uml/diagram/statemachine/custom/edit/part/CustomStateCompartmentEditPartTN.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/custom-src/org/eclipse/papyrus/uml/diagram/statemachine/custom/edit/part/CustomStateCompartmentEditPartTN.java @@ -8,6 +8,7 @@ * * Contributors: * CEA LIST - Initial API and implementation + * Nicolas FAUVERGUE (ALL4TEC) nicolas.fauvergue@all4tec.net - Bug 496905 */ package org.eclipse.papyrus.uml.diagram.statemachine.custom.edit.part; @@ -17,6 +18,7 @@ import org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles; import org.eclipse.gmf.runtime.notation.View; import org.eclipse.papyrus.uml.diagram.statemachine.custom.figures.CustomStateCompartmentFigure; import org.eclipse.papyrus.uml.diagram.statemachine.edit.parts.StateCompartmentEditPartTN; +import org.eclipse.papyrus.uml.internationalization.utils.utils.UMLLabelInternationalization; import org.eclipse.uml2.uml.State; public class CustomStateCompartmentEditPartTN extends StateCompartmentEditPartTN { @@ -53,7 +55,7 @@ public class CustomStateCompartmentEditPartTN extends StateCompartmentEditPartTN if (stateView != null) { State state = (State) stateView.getElement(); - ((CustomStateCompartmentFigure) getFigure()).setToolTip(state.getName()); + ((CustomStateCompartmentFigure) getFigure()).setToolTip(UMLLabelInternationalization.getInstance().getLabel(state)); } } diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/custom-src/org/eclipse/papyrus/uml/diagram/statemachine/custom/edit/part/CustomStateMachineCompartmentEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/custom-src/org/eclipse/papyrus/uml/diagram/statemachine/custom/edit/part/CustomStateMachineCompartmentEditPart.java index 666ad41fc2f..9537f11b83e 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/custom-src/org/eclipse/papyrus/uml/diagram/statemachine/custom/edit/part/CustomStateMachineCompartmentEditPart.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/custom-src/org/eclipse/papyrus/uml/diagram/statemachine/custom/edit/part/CustomStateMachineCompartmentEditPart.java @@ -8,6 +8,7 @@ * * Contributors: * CEA LIST - Initial API and implementation + * Nicolas FAUVERGUE (ALL4TEC) nicolas.fauvergue@all4tec.net - Bug 496905 */ package org.eclipse.papyrus.uml.diagram.statemachine.custom.edit.part; @@ -17,6 +18,7 @@ import org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles; import org.eclipse.gmf.runtime.notation.View; import org.eclipse.papyrus.uml.diagram.statemachine.custom.figures.CustomStateCompartmentFigure; import org.eclipse.papyrus.uml.diagram.statemachine.edit.parts.StateMachineCompartmentEditPart; +import org.eclipse.papyrus.uml.internationalization.utils.utils.UMLLabelInternationalization; import org.eclipse.uml2.uml.StateMachine; public class CustomStateMachineCompartmentEditPart extends StateMachineCompartmentEditPart { @@ -56,7 +58,7 @@ public class CustomStateMachineCompartmentEditPart extends StateMachineCompartme View smView = (View) ((View) getModel()).eContainer(); StateMachine sm = (StateMachine) smView.getElement(); - ((CustomStateCompartmentFigure) getFigure()).setToolTip(sm.getName()); + ((CustomStateCompartmentFigure) getFigure()).setToolTip(UMLLabelInternationalization.getInstance().getLabel(sm)); } diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/custom-src/org/eclipse/papyrus/uml/diagram/statemachine/custom/edit/part/CustomStateNameEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/custom-src/org/eclipse/papyrus/uml/diagram/statemachine/custom/edit/part/CustomStateNameEditPart.java index 41820f6d86f..4fdc034e0ef 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/custom-src/org/eclipse/papyrus/uml/diagram/statemachine/custom/edit/part/CustomStateNameEditPart.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/custom-src/org/eclipse/papyrus/uml/diagram/statemachine/custom/edit/part/CustomStateNameEditPart.java @@ -8,6 +8,7 @@ * * Contributors: * CEA LIST - Initial API and implementation + * Nicolas FAUVERGUE (ALL4TEC) nicolas.fauvergue@all4tec.net - Bug 496905 */ package org.eclipse.papyrus.uml.diagram.statemachine.custom.edit.part; @@ -30,6 +31,7 @@ import org.eclipse.papyrus.uml.diagram.statemachine.custom.figures.StateFigure; import org.eclipse.papyrus.uml.diagram.statemachine.custom.helpers.Zone; import org.eclipse.papyrus.uml.diagram.statemachine.edit.parts.StateEditPart; import org.eclipse.papyrus.uml.diagram.statemachine.edit.parts.StateNameEditPart; +import org.eclipse.papyrus.uml.internationalization.utils.utils.UMLLabelInternationalization; import org.eclipse.uml2.uml.State; /***************************************************************************** @@ -92,7 +94,7 @@ public class CustomStateNameEditPart extends StateNameEditPart { if (state.isSubmachineState()) { - stateFigure.setSubmachineStateName(state.getName() + " : " + state.getSubmachine().getQualifiedName()); + stateFigure.setSubmachineStateName(UMLLabelInternationalization.getInstance().getLabel(state) + " : " + state.getSubmachine().getQualifiedName()); stateFigure.setIsSubmachineState(true); } else { stateFigure.setIsSubmachineState(false); diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/custom-src/org/eclipse/papyrus/uml/diagram/statemachine/custom/edit/part/CustomStateNameEditPartTN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/custom-src/org/eclipse/papyrus/uml/diagram/statemachine/custom/edit/part/CustomStateNameEditPartTN.java index 1bf636d2bb4..2fc23679173 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/custom-src/org/eclipse/papyrus/uml/diagram/statemachine/custom/edit/part/CustomStateNameEditPartTN.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/custom-src/org/eclipse/papyrus/uml/diagram/statemachine/custom/edit/part/CustomStateNameEditPartTN.java @@ -8,6 +8,7 @@ * * Contributors: * CEA LIST - Initial API and implementation + * Nicolas FAUVERGUE (ALL4TEC) nicolas.fauvergue@all4tec.net - Bug 496905 */ package org.eclipse.papyrus.uml.diagram.statemachine.custom.edit.part; @@ -31,6 +32,7 @@ import org.eclipse.papyrus.uml.diagram.statemachine.custom.helpers.Zone; import org.eclipse.papyrus.uml.diagram.statemachine.edit.parts.StateEditPart; import org.eclipse.papyrus.uml.diagram.statemachine.edit.parts.StateEditPartTN; import org.eclipse.papyrus.uml.diagram.statemachine.edit.parts.StateNameEditPartTN; +import org.eclipse.papyrus.uml.internationalization.utils.utils.UMLLabelInternationalization; import org.eclipse.uml2.uml.State; /***************************************************************************** @@ -93,7 +95,7 @@ public class CustomStateNameEditPartTN extends StateNameEditPartTN { if (state.isSubmachineState()) { - stateFigure.setSubmachineStateName(state.getName() + " : " + state.getSubmachine().getQualifiedName()); + stateFigure.setSubmachineStateName(UMLLabelInternationalization.getInstance().getLabel(state) + " : " + state.getSubmachine().getQualifiedName()); stateFigure.setIsSubmachineState(true); } else { stateFigure.setIsSubmachineState(false); diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/custom-src/org/eclipse/papyrus/uml/diagram/statemachine/custom/parsers/AbstractStateBehaviorsParser.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/custom-src/org/eclipse/papyrus/uml/diagram/statemachine/custom/parsers/AbstractStateBehaviorsParser.java index 9cedd6fd6ec..bae1f7e420e 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/custom-src/org/eclipse/papyrus/uml/diagram/statemachine/custom/parsers/AbstractStateBehaviorsParser.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/custom-src/org/eclipse/papyrus/uml/diagram/statemachine/custom/parsers/AbstractStateBehaviorsParser.java @@ -8,6 +8,7 @@ * * Contributors: * CEA LIST - Initial API and implementation + * Nicolas FAUVERGUE (ALL4TEC) nicolas.fauvergue@all4tec.net - Bug 496905 */ package org.eclipse.papyrus.uml.diagram.statemachine.custom.parsers; @@ -34,6 +35,8 @@ import org.eclipse.gmf.runtime.emf.core.util.EObjectAdapter; import org.eclipse.gmf.runtime.emf.ui.services.parser.ISemanticParser; import org.eclipse.gmf.runtime.notation.View; import org.eclipse.jface.text.contentassist.IContentAssistProcessor; +import org.eclipse.papyrus.infra.internationalization.common.utils.InternationalizationPreferencesUtils; +import org.eclipse.papyrus.uml.internationalization.utils.utils.UMLLabelInternationalization; import org.eclipse.uml2.uml.Behavior; import org.eclipse.uml2.uml.OpaqueBehavior; @@ -92,7 +95,7 @@ public abstract class AbstractStateBehaviorsParser implements ISemanticParser { Object obj = element.getAdapter(Behavior.class); if (obj instanceof Behavior) { final Behavior behavior = ((Behavior) obj); - return behavior.getName(); + return UMLLabelInternationalization.getInstance().getLabel(behavior); } return EMPTY_STRING; } @@ -121,7 +124,11 @@ public abstract class AbstractStateBehaviorsParser implements ISemanticParser { AbstractTransactionalCommand cmd = new AbstractTransactionalCommand((TransactionalEditingDomain) editingDomain, "Set new name in " + behavior.getName(), null) { @Override protected CommandResult doExecuteWithResult(IProgressMonitor monitor, IAdaptable info) throws ExecutionException { - behavior.setName(newStringResult); + if (InternationalizationPreferencesUtils.getInternationalizationPreference(behavior) && null != UMLLabelInternationalization.getInstance().getLabelWithoutUML(behavior)) { + UMLLabelInternationalization.getInstance().setLabel(behavior, newStringResult, null); + }else{ + behavior.setName(newStringResult); + } return CommandResult.newOKCommandResult(); } }; @@ -165,7 +172,7 @@ public abstract class AbstractStateBehaviorsParser implements ISemanticParser { result.append(kind); addExtraSpace(result, kind); // Append behavior name - result.append(behavior.getName()); + result.append(UMLLabelInternationalization.getInstance().getLabel(behavior)); } return result.toString(); } diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/custom-src/org/eclipse/papyrus/uml/diagram/statemachine/custom/parsers/InternalTransitionParser.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/custom-src/org/eclipse/papyrus/uml/diagram/statemachine/custom/parsers/InternalTransitionParser.java index 4407bfb206d..9e53b7170c5 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/custom-src/org/eclipse/papyrus/uml/diagram/statemachine/custom/parsers/InternalTransitionParser.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/custom-src/org/eclipse/papyrus/uml/diagram/statemachine/custom/parsers/InternalTransitionParser.java @@ -8,12 +8,14 @@ * * Contributors: * CEA LIST - Initial API and implementation + * Nicolas FAUVERGUE (ALL4TEC) nicolas.fauvergue@all4tec.net - Bug 496905 */ package org.eclipse.papyrus.uml.diagram.statemachine.custom.parsers; import org.eclipse.core.runtime.IAdaptable; import org.eclipse.emf.ecore.EObject; import org.eclipse.gmf.runtime.notation.View; +import org.eclipse.papyrus.uml.internationalization.utils.utils.UMLLabelInternationalization; import org.eclipse.uml2.uml.Transition; /** @@ -37,7 +39,7 @@ public class InternalTransitionParser extends TransitionPropertiesParser { boolean noGuard = tran.getGuard() == null; boolean noEffect = tran.getEffect() == null; if (noEffect && noGuard && noTrigger) { - return tran.getName(); + return UMLLabelInternationalization.getInstance().getLabel(tran); } } return super.getValueString(element, flags); diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/custom-src/org/eclipse/papyrus/uml/diagram/statemachine/custom/parsers/TransitionPropertiesParser.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/custom-src/org/eclipse/papyrus/uml/diagram/statemachine/custom/parsers/TransitionPropertiesParser.java index 71e0dd91e4a..2be5fd069b2 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/custom-src/org/eclipse/papyrus/uml/diagram/statemachine/custom/parsers/TransitionPropertiesParser.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/custom-src/org/eclipse/papyrus/uml/diagram/statemachine/custom/parsers/TransitionPropertiesParser.java @@ -9,6 +9,7 @@ * Contributors: * CEA LIST - Initial API and implementation * Jeremie TATIBOUET (CEA LIST) - Fix https://bugs.eclipse.org/bugs/show_bug.cgi?id=477573 + * Nicolas FAUVERGUE (ALL4TEC) nicolas.fauvergue@all4tec.net - Bug 496905 */ package org.eclipse.papyrus.uml.diagram.statemachine.custom.parsers; @@ -41,9 +42,11 @@ import org.eclipse.jface.util.SafeRunnable; import org.eclipse.papyrus.infra.core.services.ServiceException; import org.eclipse.papyrus.infra.emf.utils.ServiceUtilsForEObject; import org.eclipse.papyrus.infra.gmfdiag.common.model.NotationUtils; +import org.eclipse.papyrus.infra.internationalization.common.utils.InternationalizationPreferencesUtils; import org.eclipse.papyrus.uml.diagram.statemachine.custom.preferences.CSSOptionsConstants; import org.eclipse.papyrus.uml.diagram.statemachine.custom.preferences.PreferenceConstants; import org.eclipse.papyrus.uml.diagram.statemachine.part.UMLDiagramEditorPlugin; +import org.eclipse.papyrus.uml.internationalization.utils.utils.UMLLabelInternationalization; import org.eclipse.papyrus.uml.tools.utils.ValueSpecificationUtil; import org.eclipse.uml2.uml.Behavior; import org.eclipse.uml2.uml.CallEvent; @@ -111,7 +114,11 @@ public class TransitionPropertiesParser implements IParser, ISemanticParser { // 2. no constraint exists already if (guardConstraint == null) { guardConstraint = UMLFactory.eINSTANCE.createConstraint(); - guardConstraint.setName(result); + if (InternationalizationPreferencesUtils.getInternationalizationPreference(guardConstraint) && null != UMLLabelInternationalization.getInstance().getLabelWithoutUML(guardConstraint)) { + UMLLabelInternationalization.getInstance().setLabel(guardConstraint, result, null); + }else{ + guardConstraint.setName(result); + } guardConstraint.setContext(transition.getNamespace()); transition.setGuard(guardConstraint); } @@ -197,7 +204,7 @@ public class TransitionPropertiesParser implements IParser, ISemanticParser { value = ValueSpecificationUtil.getConstraintnValue(constraint); } else { - String name = constraint.getName(); + String name = UMLLabelInternationalization.getInstance().getLabel(constraint); if (name == null) { name = "<undef>"; //$NON-NLS-1$ } @@ -230,7 +237,7 @@ public class TransitionPropertiesParser implements IParser, ISemanticParser { } } if (eClass != null) { - result.append(eClass.getName()).append(": ").append(effect.getName()); //$NON-NLS-1$ + result.append(eClass.getName()).append(": ").append(UMLLabelInternationalization.getInstance().getLabel(effect)); //$NON-NLS-1$ } } return result.toString(); @@ -256,22 +263,22 @@ public class TransitionPropertiesParser implements IParser, ISemanticParser { if (e instanceof CallEvent) { Operation op = ((CallEvent) e).getOperation(); if (op != null) { - result.append(op.getName()); + result.append(UMLLabelInternationalization.getInstance().getLabel(op)); if ((op.getOwnedParameters().size() > 0) && OpaqueBehaviorViewUtil.displayParamDots(view)) { result.append(OpaqueBehaviorViewUtil.PARAM_DOTS); } } else { - result.append(((CallEvent) e).getName()); + result.append(UMLLabelInternationalization.getInstance().getLabel(((CallEvent) e))); } } else if (e instanceof SignalEvent) { Signal signal = ((SignalEvent) e).getSignal(); if (signal != null) { - result.append(signal.getName()); + result.append(UMLLabelInternationalization.getInstance().getLabel(signal)); if ((signal.getAttributes().size() > 0) && OpaqueBehaviorViewUtil.displayParamDots(view)) { result.append(OpaqueBehaviorViewUtil.PARAM_DOTS); } } else { - result.append(((SignalEvent) e).getName()); + result.append(UMLLabelInternationalization.getInstance().getLabel(((SignalEvent) e))); } } else if (e instanceof ChangeEvent) { ValueSpecification vs = ((ChangeEvent) e).getChangeExpression(); |