git-svn-id: https://svn.apache.org/repos/asf/ant/core/trunk@412489 13f79535-47bb-0310-9956-ffa450edef68master
| @@ -96,7 +96,7 @@ public final class IntrospectionHelper implements BuildListener { | |||||
| * and boolean are in here even though they get special treatment | * and boolean are in here even though they get special treatment | ||||
| * - this way we only need to test for the wrapper class. | * - this way we only need to test for the wrapper class. | ||||
| */ | */ | ||||
| private static final Hashtable PRIMITIVE_TYPE_MAP = new Hashtable(8); | |||||
| private static final Map PRIMITIVE_TYPE_MAP = new HashMap(8); | |||||
| // Set up PRIMITIVE_TYPE_MAP | // Set up PRIMITIVE_TYPE_MAP | ||||
| static { | static { | ||||
| @@ -21,8 +21,9 @@ import java.text.SimpleDateFormat; | |||||
| import java.util.Calendar; | import java.util.Calendar; | ||||
| import java.util.Date; | import java.util.Date; | ||||
| import java.util.Enumeration; | import java.util.Enumeration; | ||||
| import java.util.Hashtable; | |||||
| import java.util.HashMap; | |||||
| import java.util.Locale; | import java.util.Locale; | ||||
| import java.util.Map; | |||||
| import java.util.NoSuchElementException; | import java.util.NoSuchElementException; | ||||
| import java.util.StringTokenizer; | import java.util.StringTokenizer; | ||||
| import java.util.TimeZone; | import java.util.TimeZone; | ||||
| @@ -302,7 +303,7 @@ public class Tstamp extends Task { | |||||
| YEAR | YEAR | ||||
| }; | }; | ||||
| private Hashtable calendarFields = new Hashtable(); | |||||
| private Map calendarFields = new HashMap(); | |||||
| /** Constructor for Unit enumerated type. */ | /** Constructor for Unit enumerated type. */ | ||||
| public Unit() { | public Unit() { | ||||
| @@ -17,7 +17,8 @@ | |||||
| package org.apache.tools.ant.taskdefs; | package org.apache.tools.ant.taskdefs; | ||||
| import java.util.Hashtable; | |||||
| import java.util.HashMap; | |||||
| import java.util.Map; | |||||
| import org.apache.tools.ant.BuildException; | import org.apache.tools.ant.BuildException; | ||||
| import org.apache.tools.ant.Project; | import org.apache.tools.ant.Project; | ||||
| import org.apache.tools.ant.taskdefs.condition.Condition; | import org.apache.tools.ant.taskdefs.condition.Condition; | ||||
| @@ -187,7 +188,7 @@ public class WaitFor extends ConditionBase { | |||||
| MILLISECOND, SECOND, MINUTE, HOUR, DAY, WEEK | MILLISECOND, SECOND, MINUTE, HOUR, DAY, WEEK | ||||
| }; | }; | ||||
| private Hashtable timeTable = new Hashtable(); | |||||
| private Map timeTable = new HashMap(); | |||||
| /** Constructor the Unit enumerated type. */ | /** Constructor the Unit enumerated type. */ | ||||
| public Unit() { | public Unit() { | ||||
| @@ -30,7 +30,8 @@ import java.text.SimpleDateFormat; | |||||
| import java.util.Calendar; | import java.util.Calendar; | ||||
| import java.util.Date; | import java.util.Date; | ||||
| import java.util.Enumeration; | import java.util.Enumeration; | ||||
| import java.util.Hashtable; | |||||
| import java.util.HashMap; | |||||
| import java.util.Map; | |||||
| import java.util.Properties; | import java.util.Properties; | ||||
| import java.util.Vector; | import java.util.Vector; | ||||
| import org.apache.tools.ant.BuildException; | import org.apache.tools.ant.BuildException; | ||||
| @@ -597,7 +598,7 @@ public class PropertyFile extends Task { | |||||
| = {MILLISECOND, SECOND, MINUTE, HOUR, | = {MILLISECOND, SECOND, MINUTE, HOUR, | ||||
| DAY, WEEK, MONTH, YEAR }; | DAY, WEEK, MONTH, YEAR }; | ||||
| private Hashtable calendarFields = new Hashtable(); | |||||
| private Map calendarFields = new HashMap(); | |||||
| public Unit() { | public Unit() { | ||||
| calendarFields.put(MILLISECOND, | calendarFields.put(MILLISECOND, | ||||