14a21,21
> import java.util.Iterator;
14,14c20,20
< import java.util.*;
---
> import java.util.Map;
18,18d13
< 
19,19c14,14
< import CH.ifa.draw.util.*;
---
> import CH.ifa.draw.util.*;
20,20c15,15
< import CH.ifa.draw.framework.*;
---
> import CH.ifa.draw.framework.*;
20a16,16
> 
34,34c35,35
< 	private Hashtable fMap;
---
> 	private Map fMap;
45a47,47
> 		fMap = CollectionsFactory.current().createMap();
46,46d46
< 		fMap = new Hashtable();
51,51c52,52
< 	 * @returns attribute or null if the key is not defined
---
> 	 * @return attribute or null if the key is not defined
82a84,84
> 			a.fMap = CollectionsFactory.current().createMap(fMap);
83,83d83
< 			a.fMap = (Hashtable) fMap.clone();
105a107,107
> 		fMap = CollectionsFactory.current().createMap();
106,106d106
< 		fMap = new Hashtable();
152a154,156
> 		Iterator iter = fMap.keySet().iterator();
> 		while (iter.hasNext()) {
> 			String s = (String)iter.next();
153,155d153
< 		Enumeration k = fMap.keys();
< 		while (k.hasMoreElements()) {
< 			String s = (String) k.nextElement();