15a16,17
> import CH.ifa.draw.util.*;
> 
16,17d15
< import CH.ifa.draw.util.UndoableAdapter;
< import CH.ifa.draw.util.Undoable;
18,18c18,18
< import java.util.*;
---
> import java.util.List;
41,41c41,41
< 		getUndoActivity().setAffectedFigures(view().selectionElements());
---
> 		getUndoActivity().setAffectedFigures(view().selection());
74,74c74,74
< 			// create a new vector with the grouped figures as elements
---
> 			// create a new collection with the grouped figures as elements
75,75c75,75
< 			Vector affectedFigures = new Vector();
---
> 			List affectedFigures = CollectionsFactory.current().createList();
78,78c78,78
< 			while (fe.hasMoreElements()) {
---
> 			while (fe.hasNextFigure()) {
84a85,85
> 				while (groupedFigures.hasNextFigure()) {
85,85d84
< 				while (groupedFigures.hasMoreElements()) {
86,86c86,86
< 					affectedFigures.addElement(groupedFigures.nextFigure());
---
> 					affectedFigures.add(groupedFigures.nextFigure());
116,116c116,116
< 			// create a new vector with the new group figure as element
---
> 			// create a new collection with the new group figure as element
116a117,117
> 			List affectedFigures = CollectionsFactory.current().createList();
117,117d116
< 			Vector affectedFigures = new Vector();
118,118c118,118
< 			affectedFigures.addElement(figure);
---
> 			affectedFigures.add(figure);