Introduce examples modules

[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 8c0cf9d76bd7fb7a6786ad94fb19d857671eab93..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
@@ -5,7 +5,7 @@ import java.util.Vector;
 \r
 import org.apache.tools.ant.BuildException;\r
 import org.apache.tools.ant.Target;\r
-import org.argeo.slc.ant.SlcAntConstants;\r
+import org.argeo.slc.ant.AntConstants;\r
 import org.argeo.slc.ant.spring.AbstractSpringTask;\r
 import org.argeo.slc.ant.spring.SpringArg;\r
 import org.argeo.slc.core.SlcException;\r
@@ -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
@@ -124,13 +124,13 @@ public abstract class SAwareTask extends AbstractSpringTask {
        /** Gets the underlying structure registry. */\r
        protected StructureRegistry<TreeSPath> getRegistry() {\r
                return (StructureRegistry<TreeSPath>) getProject().getReference(\r
-                               SlcAntConstants.REF_STRUCTURE_REGISTRY);\r
+                               AntConstants.REF_STRUCTURE_REGISTRY);\r
        }\r
 \r
        /** Creates the treeSPath for a given Ant target. */\r
        protected static TreeSPath createTargetPath(Target target) {\r
                TreeSPath projectPath = (TreeSPath) target.getProject().getReference(\r
-                               SlcAntConstants.REF_PROJECT_PATH);\r
+                               AntConstants.REF_PROJECT_PATH);\r
                return projectPath.createChild(target.getName());\r
        }\r
 \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