Simplify new runtime

[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 9c4dd89a355ec382cc53e3d1f8a3788ff46be033..8402efd0dc709c3f96c98db5b3f5b4f640e480e3 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
@@ -6,8 +6,8 @@ import java.util.Vector;
 import org.apache.tools.ant.BuildException;\r
 import org.apache.tools.ant.Target;\r
 \r
+import org.argeo.slc.ant.SlcAntConstants;\r
 import org.argeo.slc.ant.SlcAntException;\r
-import org.argeo.slc.ant.SlcProjectHelper;\r
 import org.argeo.slc.ant.spring.SpringArg;\r
 import org.argeo.slc.ant.spring.AbstractSpringTask;\r
 import org.argeo.slc.core.structure.SimpleSElement;\r
@@ -110,11 +110,10 @@ public abstract class SAwareTask extends AbstractSpringTask {
        /** Actions to be executed by the implementor. */\r
        protected abstract void executeActions(String mode);\r
 \r
-       \r
-       public <T> T getBean(String beanName){\r
-               return (T)getContext().getBean(beanName);\r
+       public <T> T getBean(String beanName) {\r
+               return (T) getContext().getBean(beanName);\r
        }\r
-       \r
+\r
        /** Create a reference to an external structure element. */\r
        public StructureElementArg createStructureElement() {\r
                if (structureElementArg != null)\r
@@ -126,13 +125,13 @@ public abstract class SAwareTask extends AbstractSpringTask {
        /** Gets the underlying structure registry. */\r
        protected StructureRegistry<TreeSPath> getRegistry() {\r
                return (StructureRegistry<TreeSPath>) getProject().getReference(\r
-                               SlcProjectHelper.REF_STRUCTURE_REGISTRY);\r
+                               SlcAntConstants.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
-                               SlcProjectHelper.REF_PROJECT_PATH);\r
+                               SlcAntConstants.REF_PROJECT_PATH);\r
                return projectPath.createChild(target.getName());\r
        }\r
 \r