14c14,16
< import java.util.*;
---
> import CH.ifa.draw.util.*;
> import CH.ifa.draw.framework.*;
> 
18,20c20,21
< 
< import CH.ifa.draw.util.*;
< import CH.ifa.draw.framework.*;
---
> import java.util.Map;
> import java.util.Iterator;
34c35
< 	private Hashtable fMap;
---
> 	private Map fMap;
46c47
< 		fMap = new Hashtable();
---
> 		fMap = CollectionsFactory.current().createMap();
51c52
< 	 * @returns attribute or null if the key is not defined
---
> 	 * @return attribute or null if the key is not defined
83c84
< 			a.fMap = (Hashtable) fMap.clone();
---
> 			a.fMap = CollectionsFactory.current().createMap(fMap);
106c107
< 		fMap = new Hashtable();
---
> 		fMap = CollectionsFactory.current().createMap();
153,155c154,156
< 		Enumeration k = fMap.keys();
< 		while (k.hasMoreElements()) {
< 			String s = (String) k.nextElement();
---
> 		Iterator iter = fMap.keySet().iterator();
> 		while (iter.hasNext()) {
> 			String s = (String)iter.next();