14,17d13
< import org.jhotdraw.framework.DrawingView;
< import org.jhotdraw.framework.DrawingChangeEvent;
< import org.jhotdraw.framework.DrawingChangeListener;
< 
20,22c16,24
< import java.awt.geom.*;
< import javax.swing.*;
< import javax.swing.event.*;
---
> import java.awt.geom.AffineTransform;
> import java.awt.geom.NoninvertibleTransformException;
> 
> import javax.swing.JComponent;
> import javax.swing.JScrollPane;
> import javax.swing.event.ChangeEvent;
> import javax.swing.event.ChangeListener;
> 
> import org.jhotdraw.framework.*;
39a42
> 	private AffineTransform originalTransform;
98a102,106
> 		/*
> 		 * JP, 23-Jan-04: Save original transformation.
> 		 */
> 		originalTransform = g2d.getTransform();
> 
112,114c120,122
< 		AffineTransform at = new AffineTransform();
< 		at.setToIdentity();
< 		g2d.setTransform(at);
---
> 		//AffineTransform at = new AffineTransform();
> 		//at.setToIdentity();
> 		//g2d.setTransform(at);
115a124,131
> 		/*
> 		 * JP, 23-Jan-04: Restored original transformation instead of setting
> 		 * another one. Solves problems with rectangle being outside minimap
> 		 * initially. Seems also to conform to JDK specs which say that you must
> 		 * never use setTransform() for anything but restoring the original
> 		 * transformation.
> 		 */
> 		g2d.setTransform(originalTransform);
192a209,211
>          * 
>          * JP, 23-Jan-04: Some additional adjustments to ensure that rectangle
>          * is positioned properly.
194,195c213,214
<         if (upperLeft[0] + oldRectangle.width > getX() + getWidth()) {
<             upperLeft[0] = getX() + getWidth() - oldRectangle.width;
---
>         if (upperLeft[0] + oldRectangle.width >= getX() + getWidth()) {
>             upperLeft[0] = getX() + getWidth() - oldRectangle.width - 1;
198,199c217,218
<         if (upperLeft[1] + oldRectangle.height > getY() + getHeight()) {
<             upperLeft[1] = getY() + getHeight() - oldRectangle.height;
---
>         if (upperLeft[1] + oldRectangle.height >= getY() + getHeight()) {
>             upperLeft[1] = getY() + getHeight() - oldRectangle.height - 1;