Improve Spring/Ant bridge

[gpl/argeo-slc.git] / org.argeo.slc.agent / src / main / java / org / argeo / slc / ant / spring / OverrideArg.java

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 3dd26c844f7e2f5aa3189b8812ad7622dc6a8c00..4a2db0b0c4077aaa500ed4ccb8333486d13c8abc 100644 (file)
--- 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
@@ -13,7 +13,6 @@ public class OverrideArg extends SpringArg<Object> {
        private Object value;\r
        private OverrideList overrideList;\r
        private MapArg overrideMap;\r
-       private String antref;\r
 \r
        /** The name of the property to override. */\r
        public String getName() {\r
@@ -25,12 +24,6 @@ public class OverrideArg extends SpringArg<Object> {
                this.name = name;\r
        }\r
 \r
-       /** Sets a reference to an ant data type. */\r
-       public void setAntref(String antref) {\r
-               checkValueAlreadySet();\r
-               this.antref = antref;\r
-       }\r
-\r
        /** Both value and bean cannot be set. */\r
        public void setValue(String value) {\r
                checkValueAlreadySet();\r
@@ -63,28 +56,20 @@ public class OverrideArg extends SpringArg<Object> {
        public Object getObject() {\r
                if (value != null) {\r
                        return value;\r
-               } else if (getBean() != null) {\r
+               } else if (getBean() != null || getAntref() != null) {\r
                        return getBeanInstance();\r
                } else if (overrideList != null) {\r
                        return overrideList.getAsObjectList();\r
                } else if (overrideMap != null) {\r
                        return overrideMap.getMap();\r
-               } else if (antref != null) {\r
-                       Object obj = getProject().getReference(antref);\r
-                       if (obj == null) {\r
-                               throw new SlcException("No object found for reference "\r
-                                               + antref);\r
-                       }\r
-                       setOverridenProperties(obj);\r
-                       return obj;\r
                } else {\r
                        throw new BuildException("Value or bean not set.");\r
                }\r
        }\r
 \r
-       private void checkValueAlreadySet() {\r
-               if (value != null || overrideList != null || antref != null\r
-                               || getBean() != null || overrideMap != null) {\r
+       protected void checkValueAlreadySet() {\r
+               super.checkValueAlreadySet();\r
+               if (value != null || overrideList != null || overrideMap != null) {\r
                        throw new BuildException("Value already set.");\r
                }\r
        }\r