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 160a636..0b81df3 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,7 @@ 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.dsl.LanguageSpecificationV2; +import org.lara.language.specification.dsl.LanguageSpecification; import org.suikasoft.jOptions.Interfaces.DataStore; import pt.up.fe.specs.anycompiler.ast.AnyNode; import pt.up.fe.specs.anycompiler.ast.GenericAnyNode; @@ -36,8 +36,8 @@ public class AnyWeaver extends AAnyWeaver { private DataStore args; private AnyNode root; - public static LanguageSpecificationV2 buildLanguageSpecification() { - return LanguageSpecificationV2.newInstance(() -> "anycompiler/weaverspecs/joinPointModel.xml", + public static LanguageSpecification buildLanguageSpecification() { + return LanguageSpecification.newInstance(() -> "anycompiler/weaverspecs/joinPointModel.xml", () -> "anycompiler/weaverspecs/artifacts.xml", () -> "anycompiler/weaverspecs/actionModel.xml"); } @@ -86,7 +86,7 @@ public boolean begin(List sources, File outputDir, DataStore args) { } - private LanguageSpecificationV2 buildLangSpec() { + private LanguageSpecification buildLangSpec() { // TODO Auto-generated method stub return null; } @@ -156,7 +156,7 @@ public List getOptions() { } @Override - protected LanguageSpecificationV2 buildLangSpecs() { + protected LanguageSpecification buildLangSpecs() { return buildLanguageSpecification(); } diff --git a/AnyWeaver/src/pt/up/fe/specs/anycompiler/weaver/abstracts/weaver/AAnyWeaver.java b/AnyWeaver/src/pt/up/fe/specs/anycompiler/weaver/abstracts/weaver/AAnyWeaver.java index 0939ea1..9261c7d 100644 --- a/AnyWeaver/src/pt/up/fe/specs/anycompiler/weaver/abstracts/weaver/AAnyWeaver.java +++ b/AnyWeaver/src/pt/up/fe/specs/anycompiler/weaver/abstracts/weaver/AAnyWeaver.java @@ -7,8 +7,8 @@ /** * Abstract Weaver Implementation for AnyWeaver
-Since the generated abstract classes are always overwritten, their implementation should be done by extending those abstract classes with user-defined classes.
-The abstract class {@link pt.up.fe.specs.anycompiler.weaver.abstracts.AAnyWeaverJoinPoint} contains attributes and actions common to all join points. + * Since the generated abstract classes are always overwritten, their implementation should be done by extending those abstract classes with user-defined classes.
+ * The abstract class {@link pt.up.fe.specs.anycompiler.weaver.abstracts.AAnyWeaverJoinPoint} contains attributes and actions common to all join points. * The implementation of the abstract methods is mandatory! * @author Lara C. */ @@ -21,7 +21,7 @@ public abstract class AAnyWeaver extends LaraWeaverEngine { */ @Override public final List getActions() { - String[] weaverActions= {"replaceWith", "replaceWith", "replaceWith", "replaceWithStrings", "insertBefore", "insertBefore", "insertAfter", "insertAfter", "detach", "setValue", "addAst"}; + String[] weaverActions= {"detach", "insertAfter", "insertAfter", "insertBefore", "insertBefore", "replaceWith", "replaceWith", "replaceWith", "replaceWithStrings", "setValue", "addAst"}; return Arrays.asList(weaverActions); }