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