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=343db96444868e3f4743de3dddb3d519b9f60105;hb=fa38c56c899d3f7347d960c4684fa293b1502c6c;hp=8402efd0dc709c3f96c98db5b3f5b4f640e480e3;hpb=5ecb072f6474a13dec2a40b2470add8b45d4db18;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 8402efd0d..343db9644 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.SlcAntConstants; -import org.argeo.slc.ant.SlcAntException; -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; @@ -117,7 +116,7 @@ public abstract class SAwareTask extends AbstractSpringTask { /** 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; } @@ -125,13 +124,13 @@ public abstract class SAwareTask extends AbstractSpringTask { /** Gets the underlying structure registry. */ protected StructureRegistry getRegistry() { return (StructureRegistry) getProject().getReference( - SlcAntConstants.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( - SlcAntConstants.REF_PROJECT_PATH); + AntConstants.REF_PROJECT_PATH); return projectPath.createChild(target.getName()); }