40c40
< 	 * Constructes the Figure selection for the vector of figures.
---
> 	 * Constructes the Figure selection for the FigureEnumeration.
42c42
< 	public StandardFigureSelection(FigureEnumeration figures, int figureCount) {
---
> 	public StandardFigureSelection(FigureEnumeration fe, int figureCount) {
48,49c48,49
< 		while (figures.hasMoreElements()) {
< 			writer.writeStorable(figures.nextFigure());
---
> 		while (fe.hasNextFigure()) {
> 			writer.writeStorable(fe.nextFigure());
64c64
< 	 * as a Vector of Figures.
---
> 	 * as a FigureEnumeration of Figures.
71c71
< 			Vector result = new Vector(10);
---
> 			List result = CollectionsFactory.current().createList(10);
78c78
< 					result.addElement(newFigure);
---
> 					result.add(newFigure);