From 5664fd4644c78f4571a1a72e6b9f0511fb10720a Mon Sep 17 00:00:00 2001
From: abranson <andrew.branson@cern.ch>
Date: Tue, 2 Aug 2011 22:10:28 +0200
Subject: Finished move to generics. Enforced 1.6 compliance for now. No errors
 or warnings :)

---
 source/com/c2kernel/graph/view/EditorToolBar.java | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)
 mode change 100755 => 100644 source/com/c2kernel/graph/view/EditorToolBar.java

(limited to 'source/com/c2kernel/graph/view/EditorToolBar.java')

diff --git a/source/com/c2kernel/graph/view/EditorToolBar.java b/source/com/c2kernel/graph/view/EditorToolBar.java
old mode 100755
new mode 100644
index 2730ab7..e01056f
--- 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)
 	{
-- 
cgit v1.2.3