diff options
| author | Laurent Redor | 2016-05-11 16:25:58 +0000 |
|---|---|---|
| committer | Laurent Redor | 2016-05-12 10:54:34 +0000 |
| commit | f1b84f4ac842b1272297bf4c765bdb9f03b22960 (patch) | |
| tree | 1e0f3e7aa1229fb439991a7b2e9a4ae86efb73a3 | |
| parent | 0ef6f91fa10f2aedc3c2f9bd2806400a76aaf59f (diff) | |
| download | org.eclipse.ecoretools-f1b84f4ac842b1272297bf4c765bdb9f03b22960.tar.gz org.eclipse.ecoretools-f1b84f4ac842b1272297bf4c765bdb9f03b22960.tar.xz org.eclipse.ecoretools-f1b84f4ac842b1272297bf4c765bdb9f03b22960.zip | |
[470297] Adapt service according to Sirius changes for labelFormat
According to changes of bug 470297 (following bug 424422), the services
must now return the Enumerator and not an EEnumLiteral.
The Sirius documentation has also been completed for this case.
Bug: 470297
Change-Id: Iaed662a88c8f430b5f012cf5e55dd39eb45c2a8c
Signed-off-by: Laurent Redor <laurent.redor@obeo.fr>
| -rw-r--r-- | org.eclipse.emf.ecoretools.design/src/org/eclipse/emf/ecoretools/design/service/DesignServices.java | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/org.eclipse.emf.ecoretools.design/src/org/eclipse/emf/ecoretools/design/service/DesignServices.java b/org.eclipse.emf.ecoretools.design/src/org/eclipse/emf/ecoretools/design/service/DesignServices.java index 4f9e56a..e37c0c1 100644 --- a/org.eclipse.emf.ecoretools.design/src/org/eclipse/emf/ecoretools/design/service/DesignServices.java +++ b/org.eclipse.emf.ecoretools.design/src/org/eclipse/emf/ecoretools/design/service/DesignServices.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2013 THALES GLOBAL SERVICES and Others + * Copyright (c) 2013, 2016 THALES GLOBAL SERVICES and Others * 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 @@ -51,7 +51,7 @@ import org.eclipse.sirius.diagram.DEdge; import org.eclipse.sirius.diagram.DNodeContainer; import org.eclipse.sirius.diagram.DNodeList; import org.eclipse.sirius.diagram.DSemanticDiagram; -import org.eclipse.sirius.diagram.DiagramPackage; +import org.eclipse.sirius.diagram.EdgeArrows; import org.eclipse.sirius.diagram.EdgeTarget; import org.eclipse.sirius.diagram.business.api.query.DDiagramQuery; import org.eclipse.sirius.diagram.business.internal.helper.task.operations.CreateViewTask; @@ -66,7 +66,7 @@ import org.eclipse.sirius.ext.emf.AllContents; import org.eclipse.sirius.tools.api.command.CommandContext; import org.eclipse.sirius.viewpoint.DRepresentation; import org.eclipse.sirius.viewpoint.DSemanticDecorator; -import org.eclipse.sirius.viewpoint.ViewpointPackage; +import org.eclipse.sirius.viewpoint.FontFormat; import com.google.common.base.Ascii; import com.google.common.base.CharMatcher; @@ -651,12 +651,12 @@ public class DesignServices extends EReferenceServices { return true; } - public EEnumLiteral arrowsFillDiamond(EObject any) { - return DiagramPackage.eINSTANCE.getEdgeArrows().getEEnumLiteral("FillDiamond"); + public EdgeArrows arrowsFillDiamond(EObject any) { + return EdgeArrows.FILL_DIAMOND_LITERAL; } - public EEnumLiteral fontFormatBold(EObject any) { - return ViewpointPackage.eINSTANCE.getFontFormat().getEEnumLiteral("bold"); + public FontFormat fontFormatBold(EObject any) { + return FontFormat.BOLD_LITERAL; } public void reconnectEReferenceSource(EObject element, EObject newValue) { |
