14,16d13
< import CH.ifa.draw.framework.*;
< import CH.ifa.draw.standard.*;
< import CH.ifa.draw.figures.*;
17,17c14,14
< import CH.ifa.draw.util.*;
---
> import CH.ifa.draw.util.CollectionsFactory;
17a15,15
> 
20,21d17
< import java.awt.*;
< import java.awt.event.*;
22a19,20
> import java.util.Iterator;
> import java.awt.Component;
22,22c18,18
< import java.util.*;
---
> import java.util.List;
30,30c28,28
<  * @author  Wolfram Kaiser
---
>  * @author  Wolfram Kaiser <mrfloppy@sourceforge.net>
36,36c34,34
< 	 * Vector containing all tools for the standard ToolBar
---
> 	 * List containing all tools for the standard ToolBar
38,38c36,36
< 	private Vector standardTools;
---
> 	private List standardTools;
41,41c39,39
< 	 * Vector containing all tools for the edit ToolBar
---
> 	 * List containing all tools for the edit ToolBar
43,43c41,41
< 	private Vector editTools;
---
> 	private List editTools;
46,46c44,44
< 	 * Vector containing all tools, which are currently activated
---
> 	 * List containing all tools, which are currently activated
48,48c46,46
< 	private Vector currentTools;
---
> 	private List currentTools;
59a58,59
> 		standardTools = CollectionsFactory.current().createList();
> 		editTools = CollectionsFactory.current().createList();
60,61d57
< 		standardTools = new Vector();
< 		editTools = new Vector();
108a107,109
> 			Iterator iter = currentTools.iterator();
> 			while (iter.hasNext()) {
> 				currentTool = (JComponent)iter.next();
109,111d106
< 			Enumeration enum = currentTools.elements();
< 			while (enum.hasMoreElements()) {
< 				currentTool = (JComponent)enum.nextElement();
124,124c122,122
< 			editTools.addElement(newTool);
---
> 			editTools.add(newTool);
127,127c125,125
< 			standardTools.addElement(newTool);
---
> 			standardTools.add(newTool);