replace GeneratedConcept._typed with .typed()

Author: slisson

editor-runtime/src/commonMain/kotlin/org/modelix/editor/CellTemplateBuilder.kt

@@ -5,7 +5,7 @@ import org.modelix.model.api.*
 import kotlin.jvm.JvmName
 
 open class CellTemplateBuilder<NodeT : ITypedNode, ConceptT : ITypedConcept>(val template: CellTemplate<NodeT, ConceptT>) {
-    val concept: ConceptT = template.concept._typed
+    val concept: ConceptT = template.concept.typed()
     val properties = CellProperties()
 
     fun ifEmpty(link: IChildLink, body: ()->Unit) {

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

@@ -149,8 +149,9 @@ class MetaModelGenerator(val outputDir: Path) {
             addProperty(PropertySpec.builder(GeneratedConcept<*, *>::instanceClass.name, instanceClassType, KModifier.OVERRIDE)
                 .initializer(concept.nodeWrapperImplName() + "::class")
                 .build())
-            addProperty(PropertySpec.builder(GeneratedConcept<*, *>::_typed.name, concept.conceptWrapperImplType(), KModifier.OVERRIDE)
-                .getter(FunSpec.getterBuilder().addStatement("""return %T""", concept.conceptWrapperInterfaceType()).build())
+            addFunction(FunSpec.builder(GeneratedConcept<*, *>::typed.name)
+                .addModifiers(KModifier.OVERRIDE)
+                .addStatement("""return %T""", concept.conceptWrapperInterfaceType())
                 .build())
             addProperty(PropertySpec.builder(IConcept::language.name, ILanguage::class, KModifier.OVERRIDE)
                 .initializer(concept.language.generatedClassName().simpleName)

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

@@ -7,7 +7,9 @@ abstract class GeneratedConcept<InstanceT : ITypedNode, WrapperT : ITypedConcept
     private val name: String,
     private val is_abstract: Boolean
 ) : IConcept {
-    abstract val _typed: WrapperT
+    @Deprecated("use .typed()", ReplaceWith("typed()"))
+    val _typed: WrapperT get() = typed()
+    abstract fun typed(): WrapperT
     abstract val instanceClass: KClass<InstanceT>
     private val propertiesMap: MutableMap<String, GeneratedProperty<*>> = LinkedHashMap()
     private val childLinksMap: MutableMap<String, GeneratedChildLink<*, *>> = LinkedHashMap()

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

@@ -15,7 +15,7 @@ class FallbackTypedConcept(private val untypedConcept: IConcept) : ITypedConcept
 }
 
 fun IConcept.typed(): ITypedConcept = when (this) {
-    is GeneratedConcept<*, *> -> this._typed
+    is GeneratedConcept<*, *> -> this.typed()
     else -> FallbackTypedConcept(this)
 }