13a14,19
> import java.util.List;
> 
> import CH.ifa.draw.framework.DrawingEditor;
> import CH.ifa.draw.framework.Figure;
> import CH.ifa.draw.framework.FigureEnumeration;
> import CH.ifa.draw.util.CollectionsFactory;
14,14d13
< import CH.ifa.draw.framework.*;
36a42,62
> 		/* ricardo_padilha: bugfix for correct delete/undelete behavior
> 		 * When enumerating the affected figures we must not forget the dependent
> 		 * figures, since they are deleted as well! 
> 		 */
> 		FigureEnumeration fe = view().selection();
> 		List affected = CollectionsFactory.current().createList();
> 		Figure f;
> 		FigureEnumeration dfe;
> 		while (fe.hasNextFigure()) {
> 			f = fe.nextFigure();
> 			affected.add(f);
> 			dfe = f.getDependendFigures();
> 			if (dfe != null) {
> 				while (dfe.hasNextFigure()) {
> 					affected.add(dfe.nextFigure());
> 				}
> 			}
> 		}
> 		fe = new FigureEnumerator(affected);
> 		getUndoActivity().setAffectedFigures(fe);
> 		/* ricardo_padilha: end of bugfix */
37,37d41
< 		getUndoActivity().setAffectedFigures(view().selection());