Finished move to generics. Enforced 1.6 compliance for now. No errors or

warnings :)

1 files changed, 3 insertions, 3 deletions

diff --git a/source/com/c2kernel/graph/view/EditorToolBar.java b/source/com/c2kernel/graph/view/EditorToolBar.java
index 2730ab7..e01056f 100755..100644
--- a/source/com/c2kernel/graph/view/EditorToolBar.java
+++ b/source/com/c2kernel/graph/view/EditorToolBar.java
@@ -56,9 +56,9 @@ public class EditorToolBar extends Box implements Printable
 		}

 	}

 	// Vertex types and ids

-	protected JComboBox mVertexTypeBox = new JComboBox();

+	protected JComboBox<TypeNameAndConstructionInfo> mVertexTypeBox = new JComboBox<TypeNameAndConstructionInfo>();

 	// Edge types and ids

-	protected JComboBox mEdgeTypeBox = new JComboBox();

+	protected JComboBox<TypeNameAndConstructionInfo> mEdgeTypeBox = new JComboBox<TypeNameAndConstructionInfo>();

 	// Mode buttons

 	protected ButtonGroup mModeButtonGroup = new ButtonGroup();

 	protected JToggleButton mVertexModeButton = new JToggleButton(Resource.getImageResource("graph/newvertex.png"));

@@ -74,7 +74,7 @@ public class EditorToolBar extends Box implements Printable
 	protected StartVertexController mStartVertexController = new StartVertexController();

 	protected DeletionController mDeletionController = new DeletionController();

 	// Editor mode listeners

-	protected Vector mListenerVector = new Vector(10, 10);

+	protected Vector<EditorModeListener> mListenerVector = new Vector<EditorModeListener>(10, 10);

 	public EditorToolBar(boolean edgeCreationMode, // True if edges can be created

 	JButton[] otherButtons, GraphPanel graphP)

 	{