From e04c125d22996f244e0b66e2e674cf44e01de8df Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bart=C5=82omiej=20Przemys=C5=82aw=20Pluta?= Date: Sun, 28 Nov 2021 23:24:19 +0100 Subject: [PATCH] [Editor] Fix circular dependencies --- .../base/editor/code/service/JavaClassService.kt | 7 ++++++- .../base/editor/map/serial/ProtobufMapDeserializer.kt | 7 ++++++- 2 files changed, 12 insertions(+), 2 deletions(-) diff --git a/editor/src/main/kotlin/com/bartlomiejpluta/base/editor/code/service/JavaClassService.kt b/editor/src/main/kotlin/com/bartlomiejpluta/base/editor/code/service/JavaClassService.kt index 916ff0de..7adf1ec1 100644 --- a/editor/src/main/kotlin/com/bartlomiejpluta/base/editor/code/service/JavaClassService.kt +++ b/editor/src/main/kotlin/com/bartlomiejpluta/base/editor/code/service/JavaClassService.kt @@ -6,6 +6,7 @@ import freemarker.template.Configuration import freemarker.template.TemplateExceptionHandler import freemarker.template.Version import org.springframework.beans.factory.annotation.Autowired +import org.springframework.context.ApplicationContext import org.springframework.stereotype.Component import java.io.File import java.nio.file.Path @@ -15,7 +16,11 @@ import java.util.* class JavaClassService { @Autowired - private lateinit var projectContext: ProjectContext + private lateinit var appContext: ApplicationContext + + private val projectContext: ProjectContext by lazy { + appContext.getBean(ProjectContext::class.java) + } private val config = Configuration(Version(2, 3, 20)).apply { defaultEncoding = "UTF-8" diff --git a/editor/src/main/kotlin/com/bartlomiejpluta/base/editor/map/serial/ProtobufMapDeserializer.kt b/editor/src/main/kotlin/com/bartlomiejpluta/base/editor/map/serial/ProtobufMapDeserializer.kt index a34d15c1..77dc93a5 100644 --- a/editor/src/main/kotlin/com/bartlomiejpluta/base/editor/map/serial/ProtobufMapDeserializer.kt +++ b/editor/src/main/kotlin/com/bartlomiejpluta/base/editor/map/serial/ProtobufMapDeserializer.kt @@ -10,6 +10,7 @@ import com.bartlomiejpluta.base.editor.tileset.model.Tile import com.bartlomiejpluta.base.editor.tileset.model.TileSet import com.bartlomiejpluta.base.proto.GameMapProto import org.springframework.beans.factory.annotation.Autowired +import org.springframework.context.ApplicationContext import org.springframework.stereotype.Component import java.io.InputStream @@ -17,7 +18,11 @@ import java.io.InputStream class ProtobufMapDeserializer : MapDeserializer { @Autowired - private lateinit var projectContext: ProjectContext + private lateinit var appContext: ApplicationContext + + private val projectContext: ProjectContext by lazy { + appContext.getBean(ProjectContext::class.java) + } override fun deserialize(input: InputStream): GameMap { val proto = GameMapProto.GameMap.parseFrom(input)