X-Git-Url: http://git.argeo.org/?a=blobdiff_plain;f=org.argeo.slc.agent%2Fsrc%2Fmain%2Fjava%2Forg%2Fargeo%2Fslc%2Fant%2Fspring%2FOverrideArg.java;h=6bd66ef7c512df24b984d697a08e5363639f5eda;hb=63f4fb48885fdbccd9baa9650aa2675427c68dd9;hp=3dd26c844f7e2f5aa3189b8812ad7622dc6a8c00;hpb=847af36ba908ea3285a16e17d809a2b29f207b0a;p=gpl%2Fargeo-slc.git

diff --git a/org.argeo.slc.agent/src/main/java/org/argeo/slc/ant/spring/OverrideArg.java b/org.argeo.slc.agent/src/main/java/org/argeo/slc/ant/spring/OverrideArg.java
index 3dd26c844..6bd66ef7c 100644
--- a/org.argeo.slc.agent/src/main/java/org/argeo/slc/ant/spring/OverrideArg.java
+++ b/org.argeo.slc.agent/src/main/java/org/argeo/slc/ant/spring/OverrideArg.java
@@ -5,15 +5,12 @@ import java.util.Vector;
 
 import org.apache.tools.ant.BuildException;
 
-import org.argeo.slc.core.SlcException;
-
 /** Ant type allowing to override bean properties. */
 public class OverrideArg extends SpringArg<Object> {
 	private String name;
 	private Object value;
 	private OverrideList overrideList;
 	private MapArg overrideMap;
-	private String antref;
 
 	/** The name of the property to override. */
 	public String getName() {
@@ -25,12 +22,6 @@ public class OverrideArg extends SpringArg<Object> {
 		this.name = name;
 	}
 
-	/** Sets a reference to an ant data type. */
-	public void setAntref(String antref) {
-		checkValueAlreadySet();
-		this.antref = antref;
-	}
-
 	/** Both value and bean cannot be set. */
 	public void setValue(String value) {
 		checkValueAlreadySet();
@@ -63,28 +54,20 @@ public class OverrideArg extends SpringArg<Object> {
 	public Object getObject() {
 		if (value != null) {
 			return value;
-		} else if (getBean() != null) {
+		} else if (getBean() != null || getAntref() != null) {
 			return getBeanInstance();
 		} else if (overrideList != null) {
 			return overrideList.getAsObjectList();
 		} else if (overrideMap != null) {
 			return overrideMap.getMap();
-		} else if (antref != null) {
-			Object obj = getProject().getReference(antref);
-			if (obj == null) {
-				throw new SlcException("No object found for reference "
-						+ antref);
-			}
-			setOverridenProperties(obj);
-			return obj;
 		} else {
 			throw new BuildException("Value or bean not set.");
 		}
 	}
 
-	private void checkValueAlreadySet() {
-		if (value != null || overrideList != null || antref != null
-				|| getBean() != null || overrideMap != null) {
+	protected void checkValueAlreadySet() {
+		super.checkValueAlreadySet();
+		if (value != null || overrideList != null || overrideMap != null) {
 			throw new BuildException("Value already set.");
 		}
 	}