2,2c2,2
<  * @(#)BorderTool.java 5.2
---
>  * @(#)BorderTool.java
3a4,9
>  * Project:		JHotdraw - a GUI framework for technical drawings
>  *				http://www.jhotdraw.org
>  *				http://jhotdraw.sourceforge.net
>  * Copyright:	© by the original author(s) and all contributors
>  * License:		Lesser GNU Public License (LGPL)
>  *				http://www.opensource.org/licenses/lgpl-license.html
8a16,18
> import CH.ifa.draw.util.UndoableAdapter;
> import CH.ifa.draw.util.Undoable;
> import java.util.Vector;
8,8c15,15
< import CH.ifa.draw.standard.*;
---
> import CH.ifa.draw.standard.*;
14a24,25
>  *
>  * @version <$CURRENT_VERSION$>
25a37,96
> //    	Figure replaceFigure = drawing().replace(figure, new BorderDecorator(figure));
> 		
> 		setUndoActivity(createUndoActivity());
> 		Vector v = new Vector();
> 		v.addElement(figure);
> 		v.addElement(new BorderDecorator(figure));
> 		getUndoActivity().setAffectedFigures(new FigureEnumerator(v));
> 		((BorderTool.UndoActivity)getUndoActivity()).replaceAffectedFigures();
> 	}
> 
> 	/**
> 	 * Factory method for undo activity
> 	 */
> 	protected Undoable createUndoActivity() {
> 		return new BorderTool.UndoActivity(view());
> 	}
> 
> 	public static class UndoActivity extends UndoableAdapter {
> 		public UndoActivity(DrawingView newDrawingView) {
> 			super(newDrawingView);
> 			setUndoable(true);
> 			setRedoable(true);
> 		}
> 
> 		public boolean undo() {
> 			if (!super.undo()) {
> 				return false;
> 			}
> 			getDrawingView().clearSelection();
> 			return replaceAffectedFigures();
> 		}
> 
> 		public boolean redo() {
> 			if (!isRedoable()) {
> 				return false;
> 			}
> 			getDrawingView().clearSelection();
> 			return replaceAffectedFigures();
> 		}
> 		
> 		public boolean replaceAffectedFigures() {
> 			FigureEnumeration fe = getAffectedFigures();
> 			if (!fe.hasMoreElements()) {
> 				return false;
> 			}
> 			Figure oldFigure = fe.nextFigure();
> 
> 			if (!fe.hasMoreElements()) {
> 				return false;
> 			}
> 			Figure replaceFigure = fe.nextFigure();
> 			
> 			replaceFigure = getDrawingView().drawing().replace(oldFigure, replaceFigure);
> 			Vector v = new Vector();
> 			v.addElement(replaceFigure);
> 			v.addElement(oldFigure);
> 			setAffectedFigures(new FigureEnumerator(v));			
> 			
> 			return true;
> 		}
26,26d36
<         drawing().replace(figure, new BorderDecorator(figure));