From dbe899c014b4a5ce21155c56fad40c2dc4b96823 Mon Sep 17 00:00:00 2001
From: Brian Rosenberger <bru@brutex.de>
Date: Fri, 4 Sep 2015 08:40:50 +0000
Subject: [PATCH] Updated Ant with minor adjustments

git-svn-id: https://brutex.net/svn/xservices/trunk@181 e7e49efb-446e-492e-b9ec-fcafc1997a86
---
 src/java/net/brutex/xservices/types/ant/AntProperty.java | 9 +++++----
 src/java/net/brutex/xservices/util/RunTask.java          | 7 ++++---
 2 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/src/java/net/brutex/xservices/types/ant/AntProperty.java b/src/java/net/brutex/xservices/types/ant/AntProperty.java
index f60c9b6..b93d6c2 100644
--- a/src/java/net/brutex/xservices/types/ant/AntProperty.java
+++ b/src/java/net/brutex/xservices/types/ant/AntProperty.java
@@ -18,6 +18,7 @@ package net.brutex.xservices.types.ant;
 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 @@ public class AntProperty {
     /**
      * Converts a Map&lt;String, String&gt; 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;
     }
diff --git a/src/java/net/brutex/xservices/util/RunTask.java b/src/java/net/brutex/xservices/util/RunTask.java
index 9cc85ab..f901f71 100644
--- a/src/java/net/brutex/xservices/util/RunTask.java
+++ b/src/java/net/brutex/xservices/util/RunTask.java
@@ -19,6 +19,7 @@ import java.io.ByteArrayOutputStream;
 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 class RunTask {
      */
     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());
         }