13a14,22
> import CH.ifa.draw.contrib.AutoscrollHelper;
> import CH.ifa.draw.contrib.dnd.DNDHelper;
> import CH.ifa.draw.contrib.dnd.DNDInterface;
> import CH.ifa.draw.framework.*;
> import CH.ifa.draw.util.CollectionsFactory;
> import CH.ifa.draw.util.Command;
> import CH.ifa.draw.util.Geom;
> import CH.ifa.draw.util.UndoableCommand;
> 
20a30,31
> import java.awt.dnd.DragGestureListener;
> import java.awt.dnd.DragSourceListener;
25,33d35
< import CH.ifa.draw.contrib.AutoscrollHelper;
< import CH.ifa.draw.contrib.dnd.DNDHelper;
< import CH.ifa.draw.contrib.dnd.DNDInterface;
< import CH.ifa.draw.framework.*;
< import CH.ifa.draw.util.CollectionsFactory;
< import CH.ifa.draw.util.Command;
< import CH.ifa.draw.util.Geom;
< import CH.ifa.draw.util.UndoableCommand;
< 
81,86d82
< 	/*
< 	 * ricardo_padilha: this was removed because it interferes with proper
< 	 * handling of sizes in Swing. For example, it prevents JScrollPane to receive
< 	 * events about the changes of preferred and minimum sizes.
< 	 */
< 	//private Dimension fViewSize;
284,288c280
< 	public FigureEnumeration insertFigures(
< 		FigureEnumeration fe,
< 		int dx,
< 		int dy,
< 		boolean bCheck) {
---
> 	public FigureEnumeration insertFigures(FigureEnumeration fe, int dx, int dy, boolean bCheck) {
300c292,293
< 			} else if (figure != null) {
---
> 			}
> 			else if (figure != null) {
405,414d397
< 		// why do this? why not just take the vector fSelection?
< 		/*FigureEnumeration figures = drawing().figures();
< 		
< 		while (figures.hasNextFigure()) {
< 			Figure f= figures.nextFigure();
< 			if (isFigureSelected(f)) {
< 				result.add(f);
< 			}
< 		}*/
< 
481c464,465
< 		} else {
---
> 		}
> 		else {
645c629,630
< 		} else {
---
> 		}
> 		else {
815c800
< 		fSelection = CollectionsFactory.current().createList();
---
> 		fSelection = CollectionsFactory.current().createList(); // could use lazy initialization instead
865,868c850,851
< 	public void keyTyped(KeyEvent e) {
< 	}
< 	public void keyReleased(KeyEvent e) {
< 	}
---
> 	public void keyTyped(KeyEvent e) {}
> 	public void keyReleased(KeyEvent e) {}
944c927,928
< 			} catch (Throwable t) {
---
> 			}
> 			catch (Throwable t) {
958c942,943
< 			} catch (Throwable t) {
---
> 			}
> 			catch (Throwable t) {
974c959,960
< 			} catch (Throwable t) {
---
> 			}
> 			catch (Throwable t) {
986c972,973
< 			} catch (Throwable t) {
---
> 			}
> 			catch (Throwable t) {
1011,1012c998,999
< 			} else if (
< 				(code == KeyEvent.VK_DOWN)
---
> 			}
> 			else if ((code == KeyEvent.VK_DOWN)
1017c1004,1005
< 			} else {
---
> 			}
> 			else {
1067c1055
< 		DNDHelper dndh = new DNDHelper (true,true) {
---
> 		return new DNDHelper(true, true) {
1075d1062
< 		return dndh;
1084c1071,1072
< 	public java.awt.dnd.DragSourceListener getDragSourceListener(){
---
> 
> 	public DragSourceListener getDragSourceListener(){
1087c1075,1076
< 	public void DNDInitialize(java.awt.dnd.DragGestureListener dgl){
---
> 
> 	public void DNDInitialize(DragGestureListener dgl){
1089a1079
>