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/model/GraphModel.java | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)
 mode change 100755 => 100644 source/com/c2kernel/graph/model/GraphModel.java

(limited to 'source/com/c2kernel/graph/model/GraphModel.java')

diff --git a/source/com/c2kernel/graph/model/GraphModel.java b/source/com/c2kernel/graph/model/GraphModel.java
old mode 100755
new mode 100644
index 7a546eb..e9ae02f
--- a/source/com/c2kernel/graph/model/GraphModel.java
+++ b/source/com/c2kernel/graph/model/GraphModel.java
@@ -16,8 +16,8 @@ public class GraphModel implements Serializable{
     private int mHeight = 0;
     private int mNextId = 0;
     protected int mStartVertexId = -1;
-    protected Hashtable mVertexHashtable = new Hashtable();
-    protected Hashtable mEdgeHashtable = new Hashtable();
+    protected Hashtable<String, Vertex> mVertexHashtable = new Hashtable<String, Vertex>();
+    protected Hashtable<String, DirectedEdge> mEdgeHashtable = new Hashtable<String, DirectedEdge>();
     private GraphableVertex mContainingVertex;
 
     /* Transient data */
@@ -168,7 +168,7 @@ public class GraphModel implements Serializable{
     }    
 
     public void setVertices(Vertex[] vertices) {
-        mVertexHashtable = new Hashtable();
+        mVertexHashtable = new Hashtable<String, Vertex>();
         for (int i = 0; i < vertices.length; i++) {
             mVertexHashtable.put(String.valueOf(vertices[i].getID()), vertices[i]);
             checkSize(vertices[i]);
@@ -189,7 +189,7 @@ public class GraphModel implements Serializable{
     }
 
     public void setEdges(DirectedEdge[] edges) {
-        mEdgeHashtable = new Hashtable();
+        mEdgeHashtable = new Hashtable<String, DirectedEdge>();
         for (int i = 0; i < edges.length; i++) {
             mEdgeHashtable.put(String.valueOf(edges[i].getID()), edges[i]);
         }
@@ -212,7 +212,7 @@ public class GraphModel implements Serializable{
     public Vertex getVertex(GraphPoint p) {
         Object[] vertexObjs = mVertexHashtable.values().toArray();
         Vertex vertex = null;
-        Vector vertexVector = new Vector(10, 10);
+        Vector<Vertex> vertexVector = new Vector<Vertex>(10, 10);
         int numVerticesFound = 0;
         Vertex smallestVertex = null;
         int sizeOfSmallestVertex = 0;
@@ -514,8 +514,8 @@ public class GraphModel implements Serializable{
     }
 
     public void clear() {
-        mVertexHashtable = new Hashtable();
-        mEdgeHashtable = new Hashtable();
+        mVertexHashtable = new Hashtable<String, Vertex>();
+        mEdgeHashtable = new Hashtable<String, DirectedEdge>();
         mStartVertexId = -1;
         setChanged();
         notifyObservers(mClearedEvent);
@@ -627,7 +627,7 @@ public class GraphModel implements Serializable{
         Polygon bandPolygon = new Polygon();
         Vertex[] allVertices = getVertices();
         GraphPoint centrePoint = null;
-        Vector verticesInside = new Vector(10, 10);
+        Vector<Vertex> verticesInside = new Vector<Vertex>(10, 10);
         int i = 0;
         // Create a polygon representing the elastic band
         bandPolygon.addPoint(mElasticBand.mFixedCorner.x, mElasticBand.mFixedCorner.y);
@@ -842,13 +842,13 @@ public class GraphModel implements Serializable{
             }
         }
         // Create and populate the vertex hashtable
-        mVertexHashtable = new Hashtable();
+        mVertexHashtable = new Hashtable<String, Vertex>();
         for (i = 0; i < data.mVertexImpls.length; i++) {
             mVertexHashtable.put(String.valueOf(data.mVertexImpls[i].getID()), data.mVertexImpls[i]);
             checkSize(data.mVertexImpls[i]);
         }
         // Create and populate the edge hastable
-        mEdgeHashtable = new Hashtable();
+        mEdgeHashtable = new Hashtable<String, DirectedEdge>();
         for (i = 0; i < data.mEdgeImpls.length; i++) {
             mEdgeHashtable.put(String.valueOf(data.mEdgeImpls[i].getID()), data.mEdgeImpls[i]);
         }
-- 
cgit v1.2.3