23,25c23,24
< import java.util.Enumeration;
< import java.util.Hashtable;
< import java.util.Vector;
---
> import java.util.*;
> import java.util.List;
30a30
> import CH.ifa.draw.framework.HandleEnumeration;
32,34c32
< import CH.ifa.draw.util.ColorMap;
< import CH.ifa.draw.util.StorableInput;
< import CH.ifa.draw.util.StorableOutput;
---
> import CH.ifa.draw.util.*;
70c68
< 	protected Vector fParagraphs = new Vector();
---
> 	protected List fParagraphs;
109a108
> 		fParagraphs = CollectionsFactory.current().createList();
292c291
< 	 * Returns a Vector of standard sizing handles to manipulate the figure
---
> 	 * Returns an iterator of standard sizing handles to manipulate the figure
296,297c295,296
< 	public Vector handles() {
< 		Vector handles = new Vector();
---
> 	public HandleEnumeration handles() {
> 		List handles = CollectionsFactory.current().createList();
299c298
< 		return handles;
---
> 		return new HandleEnumerator(handles);
387d385
< 		Font savedFont = null;
399c397
< 			savedFont = g2.getFont();
---
> 			Font savedFont = g2.getFont();
433,435c431,433
< 		Enumeration paragraphs = fParagraphs.elements();
< 		while (paragraphs.hasMoreElements()) {
< 			String paragraphText = (String)paragraphs.nextElement();
---
> 		Iterator paragraphs = fParagraphs.iterator();
> 		while (paragraphs.hasNext()) {
> 			String paragraphText = (String)paragraphs.next();
469c467
< 				// TextLayouts are computed and stored in a Vector;
---
> 				// TextLayouts are computed and stored in a collection;
471c469
< 				// Vector.
---
> 				// collection.
479,480c477,478
< 				Vector layouts = new Vector(1);
< 				Vector penPositions = new Vector(1);
---
> 				List layouts = CollectionsFactory.current().createList(1);
> 				List penPositions = CollectionsFactory.current().createList(1);
493,494c491,492
< 						layouts.addElement(layout);
< 						penPositions.addElement(new Float(horizontalPos));
---
> 						layouts.add(layout);
> 						penPositions.add(new Float(horizontalPos));
530,534c528,532
< 				Enumeration layoutEnum = layouts.elements();
< 				Enumeration positionEnum = penPositions.elements();
< 				while (layoutEnum.hasMoreElements()) {
< 					TextLayout nextLayout = (TextLayout)layoutEnum.nextElement();
< 					Float nextPosition = (Float)positionEnum.nextElement();
---
> 				Iterator layoutEnum = layouts.iterator();
> 				Iterator positionEnum = penPositions.iterator();
> 				while (layoutEnum.hasNext()) {
> 					TextLayout nextLayout = (TextLayout)layoutEnum.next();
> 					Float nextPosition = (Float)positionEnum.next();
583c581
< 		fParagraphs = new Vector();
---
> 		fParagraphs = CollectionsFactory.current().createList();
777a776
> 	 * @todo   Implement this CH.ifa.draw.framework.FigureChangeListener method
782,784d780
< 		/**
< 		 * @todo:   Implement this CH.ifa.draw.framework.FigureChangeListener method
< 		 */