Add merge feature to override

[gpl/argeo-slc.git] / org.argeo.slc.agent / src / main / java / org / argeo / slc / ant / structure / SAwareTask.java

diff --git a/org.argeo.slc.agent/src/main/java/org/argeo/slc/ant/structure/SAwareTask.java b/org.argeo.slc.agent/src/main/java/org/argeo/slc/ant/structure/SAwareTask.java
index 343db96444868e3f4743de3dddb3d519b9f60105..134b2c1506e47fbaf0ae7d569e0e9c3b5ccb6b33 100644 (file)
--- a/org.argeo.slc.agent/src/main/java/org/argeo/slc/ant/structure/SAwareTask.java
+++ b/org.argeo.slc.agent/src/main/java/org/argeo/slc/ant/structure/SAwareTask.java
@@ -82,7 +82,7 @@ public abstract class SAwareTask extends AbstractSpringTask {
 \r
                // notify registered args\r
                for (SpringArg arg : sAwareArgs) {\r
-                       Object obj = arg.getBeanInstance();\r
+                       Object obj = arg.getInstance();\r
 \r
                        if (obj instanceof StructureAware) {\r
                                StructureAware<TreeSPath> sAwareT = (StructureAware<TreeSPath>) obj;\r
@@ -155,6 +155,6 @@ public abstract class SAwareTask extends AbstractSpringTask {
 \r
 class StructureElementArg extends SpringArg {\r
        public StructureElement getStructureElement() {\r
-               return (StructureElement) getBeanInstance();\r
+               return (StructureElement) getInstance();\r
        }\r
 }
\ No newline at end of file