15,15c15,15 < import CH.ifa.draw.util.ReverseVectorEnumerator; --- > import CH.ifa.draw.util.ReverseListEnumerator; 19,19c19,19 < * An Enumeration that enumerates a vector of figures back (size-1) to front (0). --- > * An Enumeration that enumerates a Collection of figures back (size-1) to front (0). 23a24,24 > private Iterator myIterator; 24,24d23 < ReverseVectorEnumerator fEnumeration; 25a26,27 > public ReverseFigureEnumerator(List l) { > myIterator = new ReverseListEnumerator(l); 26,27d25 < public ReverseFigureEnumerator(Vector v) { < fEnumeration = new ReverseVectorEnumerator(v); 33a34,35 > public boolean hasNextFigure() { > return myIterator.hasNext(); 34,44d33 < public boolean hasMoreElements() { < return fEnumeration.hasMoreElements(); < } < < /** < * Returns the next element of the enumeration. Calls to this < * method will enumerate successive elements. < * @exception NoSuchElementException If no more elements exist. < */ < public Object nextElement() { < return fEnumeration.nextElement(); 53,53c44,44 < return (Figure)fEnumeration.nextElement(); --- > return (Figure)myIterator.next();