14a15,17 > import CH.ifa.draw.framework.FigureEnumeration; > import CH.ifa.draw.util.CollectionsFactory; > 18,18c21,21 < import java.util.Vector; --- > import java.util.List; 22,22c25,25 < * @author: WMG (INIT Copyright (C) 2000 All rights reserved) --- > * @author WMG (INIT Copyright (C) 2000 All rights reserved) 49,51d51 < private QuadTree() { < } < 165a166,170 > /* > public FigureEnumeration getAll() { > List l = CollectionsFactory.current().createList(); > l.add(_theHashtable.keySet()); > l.add(_outsideHashtable.keySet()); 166,170d165 < < public Vector getAll() { < Vector v = new Vector(); < v.addAll(_theHashtable.keySet()); < v.addAll(_outsideHashtable.keySet()); 172a173,176 > l.add(_nwQuadTree.getAll().toList()); > l.add(_neQuadTree.getAll().toList()); > l.add(_swQuadTree.getAll().toList()); > l.add(_seQuadTree.getAll().toList()); 173,176d172 < v.addAll(_nwQuadTree.getAll()); < v.addAll(_neQuadTree.getAll()); < v.addAll(_swQuadTree.getAll()); < v.addAll(_seQuadTree.getAll()); 178a179,179 > return new FigureEnumerator(l); 179,179d178 < return v; 180a181,183 > */ > public FigureEnumeration getAllWithin(Rectangle2D r) { > List l = CollectionsFactory.current().createList(); 181,183d180 < < public Vector getAllWithin(Rectangle2D r) { < Vector v = new Vector(); 189a190,190 > l.add(anObject); 190,190d189 < v.addElement(anObject); 200a201,201 > l.add(anObject); 201,201d200 < v.addElement(anObject); 206,206c206,206 < v.addAll(_nwQuadTree.getAllWithin(r)); --- > l.add(_nwQuadTree.getAllWithin(r)); 207,207c207,207 < v.addAll(_neQuadTree.getAllWithin(r)); --- > l.add(_neQuadTree.getAllWithin(r)); 208,208c208,208 < v.addAll(_swQuadTree.getAllWithin(r)); --- > l.add(_swQuadTree.getAllWithin(r)); 209,209c209,209 < v.addAll(_seQuadTree.getAllWithin(r)); --- > l.add(_seQuadTree.getAllWithin(r)); 212a213,213 > return new FigureEnumerator(l); 213,213d212 < return v;