regen examples

Signed-off-by: Christian Dietrich <christian.dietrich.opensource@gmail.com>
xtext · Feb 20, 2024 · e234197 · e234197
1 parent da0b0db
commit e234197
Show file tree

Hide file tree

Showing 5 changed files with 26 additions and 3 deletions.
diff --git a/...mple.domainmodel.tests/src/org/eclipse/xtext/example/domainmodel/tests/CompilerTest.xtend b/...mple.domainmodel.tests/src/org/eclipse/xtext/example/domainmodel/tests/CompilerTest.xtend
@@ -68,6 +68,29 @@ class CompilerTest {
 		]
 	}
 
+	@Test def void testGeneratedJavaInheritedMethod() throws Exception {
+		#[
+		'''
+			entity Foo extends Bar {
+				// getName and setName inherited from Bar
+				op doStuff(String x) : String {
+					return x + ' ' + getName()
+				}
+			}
+		''',
+		'''
+			entity Bar {
+				name : String
+			}
+		'''
+		].compile [
+			val fooObj = it.getCompiledClass("Foo").getDeclaredConstructor().newInstance
+			fooObj.invoke('setName', 'World')
+			assertEquals("Hello World", fooObj.invoke('doStuff','Hello'))
+		]
+	}
+
+
 	@Test def void compareGeneratedJava() throws Exception {
 		'''
 			entity Foo {

diff --git a/domainmodel/2.34.0/org.eclipse.xtext.example.domainmodel/META-INF/MANIFEST.MF b/domainmodel/2.34.0/org.eclipse.xtext.example.domainmodel/META-INF/MANIFEST.MF
@@ -12,7 +12,6 @@ Require-Bundle: org.antlr.runtime;bundle-version="[3.2.0,3.2.1)",
  org.eclipse.xtend.lib;bundle-version="2.14.0",
  org.eclipse.xtext,
  org.eclipse.xtext.common.types,
- org.eclipse.xtext.util,
  org.eclipse.xtext.xbase,
  org.eclipse.xtext.xbase.lib;bundle-version="2.14.0",
  org.objectweb.asm;bundle-version="[9.6.0,9.7.0)";resolution:=optional

diff --git a/...odel/src/org/eclipse/xtext/example/domainmodel/jvmmodel/DomainmodelJvmModelInferrer.xtend b/...odel/src/org/eclipse/xtext/example/domainmodel/jvmmodel/DomainmodelJvmModelInferrer.xtend
@@ -32,8 +32,7 @@ class DomainmodelJvmModelInferrer extends AbstractModelInferrer {
 	def dispatch infer(Entity entity, extension IJvmDeclaredTypeAcceptor acceptor, boolean prelinkingPhase) {
 		accept(entity.toClass( entity.fullyQualifiedName )) [
 			documentation = entity.documentation
-			if (entity.superType !== null)
-				superTypes += entity.superType.cloneWithProxies
+			superClass = entity.superType
 
 			// let's add a default constructor
 			members += entity.toConstructor []

diff --git a/...ngs-tycho/2.34.0-J11/org.xtext.example.mydsl.target/org.xtext.example.mydsl.target.target b/...ngs-tycho/2.34.0-J11/org.xtext.example.mydsl.target/org.xtext.example.mydsl.target.target
@@ -26,6 +26,7 @@
 			<unit id="org.junit" version="4.13.2.v20230809-1000"/>
 			<unit id="org.hamcrest" version="2.2.0"/>
 			<unit id="org.hamcrest.core" version="2.2.0.v20230809-1000"/>
+			<unit id="org.apache.commons.logging" version="1.2.0"/>
 			<unit id="org.apiguardian.api" version="0.0.0"/>
 			<unit id="junit-jupiter-api" version="0.0.0"/>
 			<unit id="junit-jupiter-engine" version="0.0.0"/>

diff --git a/greetings-tycho/2.34.0/org.xtext.example.mydsl.target/org.xtext.example.mydsl.target.target b/greetings-tycho/2.34.0/org.xtext.example.mydsl.target/org.xtext.example.mydsl.target.target
@@ -26,6 +26,7 @@
 			<unit id="org.junit" version="4.13.2.v20230809-1000"/>
 			<unit id="org.hamcrest" version="2.2.0"/>
 			<unit id="org.hamcrest.core" version="2.2.0.v20230809-1000"/>
+			<unit id="org.apache.commons.logging" version="1.2.0"/>
 			<unit id="org.apiguardian.api" version="0.0.0"/>
 			<unit id="junit-jupiter-api" version="0.0.0"/>
 			<unit id="junit-jupiter-engine" version="0.0.0"/>