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