From 016bf16d3b3dd19ae56ca3115845f7e26fdffa8c Mon Sep 17 00:00:00 2001 From: Christian Dietrich Date: Wed, 8 Nov 2017 09:59:59 +0100 Subject: [PATCH] reuse calculated genclasses/genpackages Signed-off-by: Christian Dietrich --- .../eclipse/xtext/xtext/generator/model/TypeReference.xtend | 4 ++-- .../eclipse/xtext/xtext/generator/model/TypeReference.java | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/org.eclipse.xtext.xtext.generator/src/org/eclipse/xtext/xtext/generator/model/TypeReference.xtend b/org.eclipse.xtext.xtext.generator/src/org/eclipse/xtext/xtext/generator/model/TypeReference.xtend index 23ec0d2fa..e7311bb9e 100644 --- a/org.eclipse.xtext.xtext.generator/src/org/eclipse/xtext/xtext/generator/model/TypeReference.xtend +++ b/org.eclipse.xtext.xtext.generator/src/org/eclipse/xtext/xtext/generator/model/TypeReference.xtend @@ -159,7 +159,7 @@ class TypeReference { val genClass = GenModelUtil2.getGenClass(clazz, resourceSet) val packageName = genClass.genPackage.getInterfacePackageName(); new QualifiedClassName(packageName, - GenModelUtil2.getGenClass(clazz, resourceSet).interfaceName) + genClass.interfaceName) } } @@ -167,7 +167,7 @@ class TypeReference { val genPackage = GenModelUtil2.getGenPackage(epackage, resourceSet) val packageName = if (genPackage.getGenModel().isSuppressEMFMetaData()) genPackage.getQualifiedPackageClassName() else genPackage.getReflectionPackageName() new QualifiedClassName(packageName, - GenModelUtil2.getGenPackage(epackage, resourceSet).packageInterfaceName) + genPackage.packageInterfaceName) } override toString() { diff --git a/org.eclipse.xtext.xtext.generator/xtend-gen/org/eclipse/xtext/xtext/generator/model/TypeReference.java b/org.eclipse.xtext.xtext.generator/xtend-gen/org/eclipse/xtext/xtext/generator/model/TypeReference.java index 616b9e57c..893eed302 100644 --- a/org.eclipse.xtext.xtext.generator/xtend-gen/org/eclipse/xtext/xtext/generator/model/TypeReference.java +++ b/org.eclipse.xtext.xtext.generator/xtend-gen/org/eclipse/xtext/xtext/generator/model/TypeReference.java @@ -270,7 +270,7 @@ public class TypeReference { { final GenClass genClass = GenModelUtil2.getGenClass(clazz, resourceSet); final String packageName = genClass.getGenPackage().getInterfacePackageName(); - String _interfaceName = GenModelUtil2.getGenClass(clazz, resourceSet).getInterfaceName(); + String _interfaceName = genClass.getInterfaceName(); _xblockexpression_1 = new TypeReference.QualifiedClassName(packageName, _interfaceName); } _xifexpression_1 = _xblockexpression_1; @@ -292,7 +292,7 @@ public class TypeReference { _xifexpression = genPackage.getReflectionPackageName(); } final String packageName = _xifexpression; - String _packageInterfaceName = GenModelUtil2.getGenPackage(epackage, resourceSet).getPackageInterfaceName(); + String _packageInterfaceName = genPackage.getPackageInterfaceName(); _xblockexpression = new TypeReference.QualifiedClassName(packageName, _packageInterfaceName); } return _xblockexpression;