From 4210069d04e9e075afc4947a35f459c77b0e3751 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jo=C3=A3o=20Bispo?= Date: Tue, 31 Dec 2024 12:34:55 +0000 Subject: [PATCH] Adapts code to changes in WeaverEngine interface --- .../fe/specs/anycompiler/weaver/AnyWeaver.java | 16 +++++----------- 1 file changed, 5 insertions(+), 11 deletions(-) diff --git a/AnyWeaver/src/pt/up/fe/specs/anycompiler/weaver/AnyWeaver.java b/AnyWeaver/src/pt/up/fe/specs/anycompiler/weaver/AnyWeaver.java index 3fab83d..160a636 100644 --- a/AnyWeaver/src/pt/up/fe/specs/anycompiler/weaver/AnyWeaver.java +++ b/AnyWeaver/src/pt/up/fe/specs/anycompiler/weaver/AnyWeaver.java @@ -5,7 +5,6 @@ import org.lara.interpreter.weaver.interf.JoinPoint; import org.lara.interpreter.weaver.options.WeaverOption; import org.lara.interpreter.weaver.utils.LaraResourceProvider; -import org.lara.language.specification.LanguageSpecification; import org.lara.language.specification.dsl.LanguageSpecificationV2; import org.suikasoft.jOptions.Interfaces.DataStore; import pt.up.fe.specs.anycompiler.ast.AnyNode; @@ -37,15 +36,10 @@ public class AnyWeaver extends AAnyWeaver { private DataStore args; private AnyNode root; - /** - * @return - * @deprecated - */ - @Deprecated - public static LanguageSpecification buildLanguageSpecificationOld() { - return LanguageSpecification.newInstance(() -> "anycompiler/weaverspecs/joinPointModel.xml", + public static LanguageSpecificationV2 buildLanguageSpecification() { + return LanguageSpecificationV2.newInstance(() -> "anycompiler/weaverspecs/joinPointModel.xml", () -> "anycompiler/weaverspecs/artifacts.xml", - () -> "anycompiler/weaverspecs/actionModel.xml", true); + () -> "anycompiler/weaverspecs/actionModel.xml"); } public AnyWeaver() { @@ -162,8 +156,8 @@ public List getOptions() { } @Override - public LanguageSpecification getLanguageSpecification() { - return buildLanguageSpecificationOld(); + protected LanguageSpecificationV2 buildLangSpecs() { + return buildLanguageSpecification(); } @Override