22a23,23
> import java.util.*;
23,24d22
< import java.util.Enumeration;
< import java.util.Hashtable;
25,25c24,24
< import java.util.Vector;
---
> import java.util.List;
30a30,30
> import CH.ifa.draw.framework.HandleEnumeration;
32,32c32,32
< import CH.ifa.draw.util.ColorMap;
---
> import CH.ifa.draw.util.*;
33,34d32
< import CH.ifa.draw.util.StorableInput;
< import CH.ifa.draw.util.StorableOutput;
69a68,68
> 	protected List fParagraphs;
70,70d67
< 	protected Vector fParagraphs = new Vector();
109a108,108
> 		fParagraphs = CollectionsFactory.current().createList();
292,292c291,291
< 	 * Returns a Vector of standard sizing handles to manipulate the figure
---
> 	 * Returns an iterator of standard sizing handles to manipulate the figure
295a295,296
> 	public HandleEnumeration handles() {
> 		List handles = CollectionsFactory.current().createList();
296,297d294
< 	public Vector handles() {
< 		Vector handles = new Vector();
299,299c298,298
< 		return handles;
---
> 		return new HandleEnumerator(handles);
387,387d385
< 		Font savedFont = null;
399,399c397,397
< 			savedFont = g2.getFont();
---
> 			Font savedFont = g2.getFont();
432a431,432
> 		Iterator paragraphs = fParagraphs.iterator();
> 		while (paragraphs.hasNext()) {
433,434d430
< 		Enumeration paragraphs = fParagraphs.elements();
< 		while (paragraphs.hasMoreElements()) {
435,435c433,433
< 			String paragraphText = (String)paragraphs.nextElement();
---
> 			String paragraphText = (String)paragraphs.next();
469,469c467,467
< 				// TextLayouts are computed and stored in a Vector;
---
> 				// TextLayouts are computed and stored in a collection;
470a469,469
> 				// collection.
471,471d468
< 				// Vector.
478a477,478
> 				List layouts = CollectionsFactory.current().createList(1);
> 				List penPositions = CollectionsFactory.current().createList(1);
479,480d476
< 				Vector layouts = new Vector(1);
< 				Vector penPositions = new Vector(1);
492a491,491
> 						layouts.add(layout);
493,493d490
< 						layouts.addElement(layout);
494,494c492,492
< 						penPositions.addElement(new Float(horizontalPos));
---
> 						penPositions.add(new Float(horizontalPos));
529a528,530
> 				Iterator layoutEnum = layouts.iterator();
> 				Iterator positionEnum = penPositions.iterator();
> 				while (layoutEnum.hasNext()) {
530,532d527
< 				Enumeration layoutEnum = layouts.elements();
< 				Enumeration positionEnum = penPositions.elements();
< 				while (layoutEnum.hasMoreElements()) {
533,533c531,531
< 					TextLayout nextLayout = (TextLayout)layoutEnum.nextElement();
---
> 					TextLayout nextLayout = (TextLayout)layoutEnum.next();
534,534c532,532
< 					Float nextPosition = (Float)positionEnum.nextElement();
---
> 					Float nextPosition = (Float)positionEnum.next();
582a581,581
> 		fParagraphs = CollectionsFactory.current().createList();
583,583d580
< 		fParagraphs = new Vector();
782,782d775
< 		/**
783,783c776,776
< 		 * @todo:   Implement this CH.ifa.draw.framework.FigureChangeListener method
---
> 	 * @todo   Implement this CH.ifa.draw.framework.FigureChangeListener method
784,784d776
< 		 */