diff options
| author | Christian W. Damus | 2021-04-30 14:15:49 +0000 |
|---|---|---|
| committer | Christian W. Damus | 2021-04-30 14:17:53 +0000 |
| commit | 002b8f1eb03d41e6406ce71c378b7939299082dd (patch) | |
| tree | 50f5341c9fdac91e6db8980fdbe7912f4ba65d63 | |
| parent | 86f984acefa80ba08d53cb623fb6ba116d468a4f (diff) | |
| download | org.eclipse.papyrus-002b8f1eb03d41e6406ce71c378b7939299082dd.tar.gz org.eclipse.papyrus-002b8f1eb03d41e6406ce71c378b7939299082dd.tar.xz org.eclipse.papyrus-002b8f1eb03d41e6406ce71c378b7939299082dd.zip | |
Bug 570486: Fix Xtend compilation error
- Xtend compilation fails on what failure to infer return type
from what it incorrectly thinks is a recursive call
- so, make the return type explicit
Change-Id: I94f88cbb3c76161b69e6f9ab39d56e651e0075b0
Signed-off-by: Christian W. Damus <give.a.damus@gmail.com>
| -rw-r--r-- | plugins/infra/architecture/org.eclipse.papyrus.infra.architecture/src/org/eclipse/papyrus/infra/core/internal/architecture/merger/RepresentationKindRule.xtend | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/plugins/infra/architecture/org.eclipse.papyrus.infra.architecture/src/org/eclipse/papyrus/infra/core/internal/architecture/merger/RepresentationKindRule.xtend b/plugins/infra/architecture/org.eclipse.papyrus.infra.architecture/src/org/eclipse/papyrus/infra/core/internal/architecture/merger/RepresentationKindRule.xtend index 35c11a30465..3f869ca888e 100644 --- a/plugins/infra/architecture/org.eclipse.papyrus.infra.architecture/src/org/eclipse/papyrus/infra/core/internal/architecture/merger/RepresentationKindRule.xtend +++ b/plugins/infra/architecture/org.eclipse.papyrus.infra.architecture/src/org/eclipse/papyrus/infra/core/internal/architecture/merger/RepresentationKindRule.xtend @@ -44,11 +44,11 @@ class RepresentationKindRule { * to other architecture model elements are rewritten to reference merged elements * in the merge result model. */ - def merged(RepresentationKind representation) { + def RepresentationKind merged(RepresentationKind representation) { representation.merged(currentScope) // Unique merge per domain scope } - private def create result: EcoreUtil.copy(representation) merged(RepresentationKind representation, Object scope) { + private def create result: EcoreUtil.<RepresentationKind> copy(representation) merged(RepresentationKind representation, Object scope) { // Replace the concerns with the merged copies. Also, any other cross-references to // architecture elements, e.g. PapyrusDiagram::parent reference. Do this reflectively // because we don't know the specifics of the representation kind model |