Skip to content

Commit 894f5bc

Browse files
committed
replace GeneratedConcept.instanceClass with .getInstanceClass()
1 parent b0c5589 commit 894f5bc

File tree

2 files changed

+4
-4
lines changed

2 files changed

+4
-4
lines changed

metamodel-generator/src/main/kotlin/org/modelix/metamodel/generator/MetaModelGenerator.kt

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
package org.modelix.metamodel.generator
22

33
import com.squareup.kotlinpoet.*
4-
import com.squareup.kotlinpoet.MemberName.Companion.member
54
import com.squareup.kotlinpoet.ParameterizedTypeName.Companion.parameterizedBy
65
import org.modelix.metamodel.*
76
import org.modelix.model.api.*
@@ -146,8 +145,9 @@ class MetaModelGenerator(val outputDir: Path) {
146145
addSuperclassConstructorParameter("%S", concept.concept.name)
147146
addSuperclassConstructorParameter(concept.concept.abstract.toString())
148147
val instanceClassType = KClass::class.asClassName().parameterizedBy(concept.nodeWrapperImplType())
149-
addProperty(PropertySpec.builder(GeneratedConcept<*, *>::instanceClass.name, instanceClassType, KModifier.OVERRIDE)
150-
.initializer(concept.nodeWrapperImplName() + "::class")
148+
addFunction(FunSpec.builder(GeneratedConcept<*, *>::getInstanceClass.name)
149+
.addModifiers(KModifier.OVERRIDE)
150+
.addStatement("""return %T::class""", concept.nodeWrapperImplType())
151151
.build())
152152
addFunction(FunSpec.builder(GeneratedConcept<*, *>::typed.name)
153153
.addModifiers(KModifier.OVERRIDE)

metamodel-runtime/src/commonMain/kotlin/org/modelix/metamodel/GeneratedConcept.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ abstract class GeneratedConcept<InstanceT : ITypedNode, WrapperT : ITypedConcept
1010
@Deprecated("use .typed()", ReplaceWith("typed()"))
1111
val _typed: WrapperT get() = typed()
1212
abstract fun typed(): WrapperT
13-
abstract val instanceClass: KClass<InstanceT>
13+
abstract fun getInstanceClass(): KClass<InstanceT>
1414
private val propertiesMap: MutableMap<String, GeneratedProperty<*>> = LinkedHashMap()
1515
private val childLinksMap: MutableMap<String, GeneratedChildLink<*, *>> = LinkedHashMap()
1616
private val referenceLinksMap: MutableMap<String, GeneratedReferenceLink<*, *>> = LinkedHashMap()

0 commit comments

Comments
 (0)