20a30,31
> import java.awt.dnd.DragGestureListener;
> import java.awt.dnd.DragSourceListener;
25,25c14,14
< import CH.ifa.draw.contrib.AutoscrollHelper;
---
> import CH.ifa.draw.contrib.AutoscrollHelper;
26,26c15,15
< import CH.ifa.draw.contrib.dnd.DNDHelper;
---
> import CH.ifa.draw.contrib.dnd.DNDHelper;
27,27c16,16
< import CH.ifa.draw.contrib.dnd.DNDInterface;
---
> import CH.ifa.draw.contrib.dnd.DNDInterface;
28,28c17,17
< import CH.ifa.draw.framework.*;
---
> import CH.ifa.draw.framework.*;
29,29c18,18
< import CH.ifa.draw.util.CollectionsFactory;
---
> import CH.ifa.draw.util.CollectionsFactory;
30,30c19,19
< import CH.ifa.draw.util.Command;
---
> import CH.ifa.draw.util.Command;
31,31c20,20
< import CH.ifa.draw.util.Geom;
---
> import CH.ifa.draw.util.Geom;
32,32c21,21
< import CH.ifa.draw.util.UndoableCommand;
---
> import CH.ifa.draw.util.UndoableCommand;
33,33c22,22
< 
---
> 
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,284c280,280
< 	public FigureEnumeration insertFigures(
---
> 	public FigureEnumeration insertFigures(FigureEnumeration fe, int dx, int dy, boolean bCheck) {
285,288d280
< 		FigureEnumeration fe,
< 		int dx,
< 		int dy,
< 		boolean bCheck) {
299a292,292
> 			}
300,300c293,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);
< 			}
< 		}*/
< 
480a464,464
> 		}
481,481c465,465
< 		} else {
---
> 		else {
644a629,629
> 		}
645,645c630,630
< 		} else {
---
> 		else {
815,815c800,800
< 		fSelection = CollectionsFactory.current().createList();
---
> 		fSelection = CollectionsFactory.current().createList(); // could use lazy initialization instead
864a850,850
> 	public void keyTyped(KeyEvent e) {}
865,866d849
< 	public void keyTyped(KeyEvent e) {
< 	}
867,867c851,851
< 	public void keyReleased(KeyEvent e) {
---
> 	public void keyReleased(KeyEvent e) {}
868,868d851
< 	}
943a927,927
> 			}
944,944c928,928
< 			} catch (Throwable t) {
---
> 			catch (Throwable t) {
957a942,942
> 			}
958,958c943,943
< 			} catch (Throwable t) {
---
> 			catch (Throwable t) {
973a959,959
> 			}
974,974c960,960
< 			} catch (Throwable t) {
---
> 			catch (Throwable t) {
985a972,972
> 			}
986,986c973,973
< 			} catch (Throwable t) {
---
> 			catch (Throwable t) {
1010a998,998
> 			}
1011,1011d997
< 			} else if (
1012,1012c999,999
< 				(code == KeyEvent.VK_DOWN)
---
> 			else if ((code == KeyEvent.VK_DOWN)
1016a1004,1004
> 			}
1017,1017c1005,1005
< 			} else {
---
> 			else {
1067,1067c1055,1055
< 		DNDHelper dndh = new DNDHelper (true,true) {
---
> 		return new DNDHelper(true, true) {
1075,1075d1062
< 		return dndh;
1083a1071,1071
> 
1084,1084c1072,1072
< 	public java.awt.dnd.DragSourceListener getDragSourceListener(){
---
> 	public DragSourceListener getDragSourceListener(){
1086a1075,1075
> 
1087,1087c1076,1076
< 	public void DNDInitialize(java.awt.dnd.DragGestureListener dgl){
---
> 	public void DNDInitialize(DragGestureListener dgl){
1089a1079,1079
>