| /xservices/trunk/src/java/net/brutex/xservices/types/ant/AntProperty.java |
|---|
| 18,6 → 18,7 |
| import java.util.ArrayList; |
| import java.util.List; |
| import java.util.Map; |
| import javax.xml.bind.annotation.XmlElement; |
| import javax.xml.bind.annotation.XmlRootElement; |
| 44,13 → 45,13 |
| /** |
| * Converts a Map<String, String> into a list of |
| * AntProperties. |
| * @param map The map to convert |
| * @param newMap The map to convert |
| * @return A list of key/value pairs |
| */ |
| public static List<AntProperty> createAntPropertyList(Map<String, String> map) { |
| public static List<AntProperty> createAntPropertyList(Map<String, Object> newMap) { |
| List<AntProperty> list = new ArrayList<AntProperty>(); |
| for(Map.Entry<String, String> e : map.entrySet()) { |
| list.add(new AntProperty(e.getKey(), e.getValue())); |
| for(Map.Entry<String, Object> e : newMap.entrySet()) { |
| list.add(new AntProperty(e.getKey(), (String)e.getValue())); |
| } |
| return list; |
| } |
| /xservices/trunk/src/java/net/brutex/xservices/util/RunTask.java |
|---|
| 19,6 → 19,7 |
| import java.io.PrintStream; |
| import java.util.HashMap; |
| import java.util.Map; |
| import net.brutex.xservices.types.ReturnCode; |
| import net.brutex.xservices.types.ant.AntProperty; |
| 80,14 → 81,14 |
| */ |
| public ReturnCode postTask() throws BuildException { |
| int returnCode = 0; |
| Map<String, String> origMap = new HashMap<String, String>(); |
| Map<String, String> newMap = null; |
| Map<String, Object> origMap = new HashMap<String, Object>(); |
| Map<String, Object> newMap = null; |
| origMap.putAll(antproject.getProperties()); |
| antproject.executeTarget(anttarget.getName()); |
| newMap = antproject.getProperties(); |
| newMap.putAll(antproject.getUserProperties()); |
| for (Map.Entry<String, String> e : origMap.entrySet()) { |
| for (Map.Entry<String, Object> e : origMap.entrySet()) { |
| newMap.remove(e.getKey()); |
| } |