X-Git-Url: http://git.argeo.org/?a=blobdiff_plain;f=org.argeo.slc.agent%2Fsrc%2Fmain%2Fjava%2Forg%2Fargeo%2Fslc%2Fant%2Fstructure%2FSAwareTask.java;h=830c13ae3cfeb0f8fffcfb66d32d718786401165;hb=7d654aa1b6876c8c381d62733831ef72e81ebc91;hp=d248a38705378bfa318781385bf1a5400362e48d;hpb=a7b136d40c14e4559faa5c34dc2b4dd2170ac2d4;p=gpl%2Fargeo-slc.git

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 d248a3870..830c13ae3 100644
--- 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
@@ -8,7 +8,7 @@ import org.apache.tools.ant.Target;
 
 import org.argeo.slc.ant.SlcAntException;
 import org.argeo.slc.ant.SlcProjectHelper;
-import org.argeo.slc.ant.spring.AbstractSpringArg;
+import org.argeo.slc.ant.spring.SpringArg;
 import org.argeo.slc.ant.spring.AbstractSpringTask;
 import org.argeo.slc.core.structure.SimpleSElement;
 import org.argeo.slc.core.structure.StructureAware;
@@ -20,7 +20,7 @@ import org.argeo.slc.core.structure.tree.TreeSPath;
 public abstract class SAwareTask extends AbstractSpringTask {
 	private String path;
 	private TreeSPath treeSPath;
-	private final List<AbstractSpringArg> sAwareArgs = new Vector<AbstractSpringArg>();
+	private final List<SpringArg> sAwareArgs = new Vector<SpringArg>();
 
 	private StructureElementArg structureElementArg;
 
@@ -44,7 +44,7 @@ public abstract class SAwareTask extends AbstractSpringTask {
 	 * Includes this arg in the checks for propagation of structure related
 	 * information.
 	 */
-	protected void addSAwareArg(AbstractSpringArg arg) {
+	protected void addSAwareArg(SpringArg arg) {
 		sAwareArgs.add(arg);
 	}
 
@@ -82,7 +82,7 @@ public abstract class SAwareTask extends AbstractSpringTask {
 		}
 
 		// notify registered args
-		for (AbstractSpringArg arg : sAwareArgs) {
+		for (SpringArg arg : sAwareArgs) {
 			Object obj = arg.getBeanInstance();
 
 			if (obj instanceof StructureAware) {
@@ -110,6 +110,10 @@ public abstract class SAwareTask extends AbstractSpringTask {
 	/** Actions to be executed by the implementor. */
 	protected abstract void executeActions(String mode);
 
+	public <T> T getBean(String beanName) {
+		return (T) getContext().getBean(beanName);
+	}
+
 	/** Create a reference to an external structure element. */
 	public StructureElementArg createStructureElement() {
 		if (structureElementArg != null)
@@ -150,7 +154,7 @@ public abstract class SAwareTask extends AbstractSpringTask {
 	}
 }
 
-class StructureElementArg extends AbstractSpringArg {
+class StructureElementArg extends SpringArg {
 	public StructureElement getStructureElement() {
 		return (StructureElement) getBeanInstance();
 	}