14a15,16
> import CH.ifa.draw.util.CollectionsFactory;
> 
18c20
<  * An Enumeration for a Vector of Figures.
---
>  * An Enumeration for a Collection of Figures.
23c25
< 	private Enumeration fEnumeration;
---
> 	private Iterator myIterator;
26c28
< 		new FigureEnumerator(new Vector());
---
> 		new FigureEnumerator(CollectionsFactory.current().createList());
28,29c30,31
< 	public FigureEnumerator(Vector v) {
< 		fEnumeration = v.elements();
---
> 	public FigureEnumerator(Collection c) {
> 		myIterator = c.iterator();
36,46c38,39
< 	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();
---
> 	public boolean hasNextFigure() {
> 		return myIterator.hasNext();
55c48
< 		return (Figure)fEnumeration.nextElement();
---
> 		return (Figure)myIterator.next();
63c56
< 		Vector v = new Vector();
---
> 		List v = CollectionsFactory.current().createList();