18c18
< import java.util.Vector;
---
> import java.util.List;
34c34
< 	 * Fills the given Vector with handles at each corner of a
---
> 	 * Fills the given collection with handles at each corner of a
37,41c37,41
< 	static public void addCornerHandles(Figure f, Vector handles) {
< 		handles.addElement(southEast(f));
< 		handles.addElement(southWest(f));
< 		handles.addElement(northEast(f));
< 		handles.addElement(northWest(f));
---
> 	static public void addCornerHandles(Figure f, List handles) {
> 		handles.add(southEast(f));
> 		handles.add(southWest(f));
> 		handles.add(northEast(f));
> 		handles.add(northWest(f));
45c45
< 	 * Fills the given Vector with handles at each corner
---
> 	 * Fills the given collection with handles at each corner
48c48
< 	static public void addHandles(Figure f, Vector handles) {
---
> 	static public void addHandles(Figure f, List handles) {
50,53c50,53
< 		handles.addElement(south(f));
< 		handles.addElement(north(f));
< 		handles.addElement(east(f));
< 		handles.addElement(west(f));
---
> 		handles.add(south(f));
> 		handles.add(north(f));
> 		handles.add(east(f));
> 		handles.add(west(f));
143c143
< 			if (!fe.hasMoreElements()) {
---
> 			if (!fe.hasNextFigure()) {