14a15,16
> import CH.ifa.draw.util.CollectionsFactory;
> 
18,18c20,20
<  * An Enumeration for a Vector of Figures.
---
>  * An Enumeration for a Collection of Figures.
22a25,25
> 	private Iterator myIterator;
23,23d24
< 	private Enumeration fEnumeration;
26,26c28,28
< 		new FigureEnumerator(new Vector());
---
> 		new FigureEnumerator(CollectionsFactory.current().createList());
27a30,31
> 	public FigureEnumerator(Collection c) {
> 		myIterator = c.iterator();
28,29d29
< 	public FigureEnumerator(Vector v) {
< 		fEnumeration = v.elements();
35a38,39
> 	public boolean hasNextFigure() {
> 		return myIterator.hasNext();
36,46d37
< 	public boolean hasMoreElements() {
< 		return fEnumeration.hasMoreElements();
< 	}
< 
< 	/**
< 	 * Returns the next element of the enumeration. Calls to this
< 	 * method will enumerate successive elements.
< 	 * @exception NoSuchElementException If no more elements exist.
< 	 */
< 	public Object nextElement() {
< 		return fEnumeration.nextElement();
55,55c48,48
< 		return (Figure)fEnumeration.nextElement();
---
> 		return (Figure)myIterator.next();
62a56,56
> 		List v = CollectionsFactory.current().createList();
63,63d55
< 		Vector v = new Vector();