14a15,17
> import CH.ifa.draw.framework.FigureEnumeration;
> import CH.ifa.draw.util.CollectionsFactory;
> 
18c21
< import java.util.Vector;
---
> import java.util.List;
22c25
<  * @author: WMG (INIT Copyright (C) 2000 All rights reserved)
---
>  * @author WMG (INIT Copyright (C) 2000 All rights reserved)
49,51d51
< 	private QuadTree() {
< 	}
< 
166,170c166,170
< 
< 	public Vector getAll() {
< 		Vector v = new Vector();
< 		v.addAll(_theHashtable.keySet());
< 		v.addAll(_outsideHashtable.keySet());
---
> /*
> 	public FigureEnumeration getAll() {
> 		List l = CollectionsFactory.current().createList();
> 		l.add(_theHashtable.keySet());
> 		l.add(_outsideHashtable.keySet());
173,176c173,176
< 			v.addAll(_nwQuadTree.getAll());
< 			v.addAll(_neQuadTree.getAll());
< 			v.addAll(_swQuadTree.getAll());
< 			v.addAll(_seQuadTree.getAll());
---
> 			l.add(_nwQuadTree.getAll().toList());
> 			l.add(_neQuadTree.getAll().toList());
> 			l.add(_swQuadTree.getAll().toList());
> 			l.add(_seQuadTree.getAll().toList());
179c179
< 		return v;
---
> 		return new FigureEnumerator(l);
181,183c181,183
< 
< 	public Vector getAllWithin(Rectangle2D r) {
< 		Vector v = new Vector();
---
> */
> 	public FigureEnumeration getAllWithin(Rectangle2D r) {
> 		List l = CollectionsFactory.current().createList();
190c190
< 				v.addElement(anObject);
---
> 				l.add(anObject);
201c201
< 					v.addElement(anObject);
---
> 					l.add(anObject);
206,209c206,209
< 				v.addAll(_nwQuadTree.getAllWithin(r));
< 				v.addAll(_neQuadTree.getAllWithin(r));
< 				v.addAll(_swQuadTree.getAllWithin(r));
< 				v.addAll(_seQuadTree.getAllWithin(r));
---
> 				l.add(_nwQuadTree.getAllWithin(r));
> 				l.add(_neQuadTree.getAllWithin(r));
> 				l.add(_swQuadTree.getAllWithin(r));
> 				l.add(_seQuadTree.getAllWithin(r));
213c213
< 		return v;
---
> 		return new FigureEnumerator(l);