X-Git-Url: http://git.argeo.org/?a=blobdiff_plain;ds=sidebyside;f=org.argeo.slc.agent%2Fsrc%2Fmain%2Fjava%2Forg%2Fargeo%2Fslc%2Fant%2Fstructure%2FSAwareTask.java;h=134b2c1506e47fbaf0ae7d569e0e9c3b5ccb6b33;hb=7a8f034133c1112e187e2a2bfd2c56a8d2452345;hp=84a199b757d7569ba258179f867274380523efaf;hpb=847af36ba908ea3285a16e17d809a2b29f207b0a;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 84a199b75..134b2c150 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
@@ -5,11 +5,10 @@ import java.util.Vector;
 
 import org.apache.tools.ant.BuildException;
 import org.apache.tools.ant.Target;
-
-import org.argeo.slc.ant.SlcAntException;
-import org.argeo.slc.ant.SlcProjectHelper;
-import org.argeo.slc.ant.spring.SpringArg;
+import org.argeo.slc.ant.AntConstants;
 import org.argeo.slc.ant.spring.AbstractSpringTask;
+import org.argeo.slc.ant.spring.SpringArg;
+import org.argeo.slc.core.SlcException;
 import org.argeo.slc.core.structure.SimpleSElement;
 import org.argeo.slc.core.structure.StructureAware;
 import org.argeo.slc.core.structure.StructureElement;
@@ -83,7 +82,7 @@ public abstract class SAwareTask extends AbstractSpringTask {
 
 		// notify registered args
 		for (SpringArg arg : sAwareArgs) {
-			Object obj = arg.getBeanInstance();
+			Object obj = arg.getInstance();
 
 			if (obj instanceof StructureAware) {
 				StructureAware<TreeSPath> sAwareT = (StructureAware<TreeSPath>) obj;
@@ -110,10 +109,14 @@ 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)
-			throw new SlcAntException("Arg already set.");
+			throw new SlcException("Arg already set.");
 		structureElementArg = new StructureElementArg();
 		return structureElementArg;
 	}
@@ -121,13 +124,13 @@ public abstract class SAwareTask extends AbstractSpringTask {
 	/** Gets the underlying structure registry. */
 	protected StructureRegistry<TreeSPath> getRegistry() {
 		return (StructureRegistry<TreeSPath>) getProject().getReference(
-				SlcProjectHelper.REF_STRUCTURE_REGISTRY);
+				AntConstants.REF_STRUCTURE_REGISTRY);
 	}
 
 	/** Creates the treeSPath for a given Ant target. */
 	protected static TreeSPath createTargetPath(Target target) {
 		TreeSPath projectPath = (TreeSPath) target.getProject().getReference(
-				SlcProjectHelper.REF_PROJECT_PATH);
+				AntConstants.REF_PROJECT_PATH);
 		return projectPath.createChild(target.getName());
 	}
 
@@ -152,6 +155,6 @@ public abstract class SAwareTask extends AbstractSpringTask {
 
 class StructureElementArg extends SpringArg {
 	public StructureElement getStructureElement() {
-		return (StructureElement) getBeanInstance();
+		return (StructureElement) getInstance();
 	}
 }
\ No newline at end of file