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

warnings :)

4 files changed, 17 insertions, 17 deletions

diff --git a/source/com/c2kernel/graph/model/GraphModel.java b/source/com/c2kernel/graph/model/GraphModel.java
index 7a546eb..e9ae02f 100755..100644
--- 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]);

         }

diff --git a/source/com/c2kernel/graph/model/GraphModelManager.java b/source/com/c2kernel/graph/model/GraphModelManager.java
index 19f2dc3..3146c24 100755..100644
--- a/source/com/c2kernel/graph/model/GraphModelManager.java
+++ b/source/com/c2kernel/graph/model/GraphModelManager.java
@@ -20,8 +20,8 @@ public class GraphModelManager extends Observable
     private VertexOutlineCreator mVertexOutlineCreator;

     private EntireModelChangedEvent     mEntireModelChangedEvent     = new EntireModelChangedEvent();

     private ForcedNotifyEvent           mForcedNotifyEvent           = new ForcedNotifyEvent();

-    private Stack                       mParentModels                 = new Stack();

-    private ArrayList                   mParentIds                    = new ArrayList();

+    private Stack<GraphModel>                       mParentModels                 = new Stack<GraphModel>();

+    private ArrayList<Integer>                   mParentIds                    = new ArrayList<Integer>();

     private boolean                    mEditable                     = true;

     

     // Calling this constructor does not create a vertex outline creator

diff --git a/source/com/c2kernel/graph/model/GraphableVertex.java b/source/com/c2kernel/graph/model/GraphableVertex.java
index 6efd298..6efd298 100755..100644
--- a/source/com/c2kernel/graph/model/GraphableVertex.java
+++ b/source/com/c2kernel/graph/model/GraphableVertex.java
diff --git a/source/com/c2kernel/graph/model/Vertex.java b/source/com/c2kernel/graph/model/Vertex.java
index 1e8399b..a9a5238 100755..100644
--- a/source/com/c2kernel/graph/model/Vertex.java
+++ b/source/com/c2kernel/graph/model/Vertex.java
@@ -12,9 +12,9 @@ public class Vertex implements Serializable
     private GraphPoint   mCentrePoint     = new GraphPoint(0, 0);

     private int          mHeight          = 0;

     private int          mWidth           = 0;

-    private Vector       mInEdgeIdVector  = new Vector();

-    private Vector       mOutEdgeIdVector = new Vector();

-    private Vector       mTags             = new Vector();

+    private Vector<Integer>       mInEdgeIdVector  = new Vector<Integer>();

+    private Vector<Integer>       mOutEdgeIdVector = new Vector<Integer>();

+    private Vector<Object>       mTags             = new Vector<Object>();

 

     // The Java Polygon class is used to determine if a point

     // lies within the outline of a vertex.  Unfortunately

@@ -170,7 +170,7 @@ public class Vertex implements Serializable
     {

         int i = 0;

 

-        mInEdgeIdVector = new Vector(10, 10);

+        mInEdgeIdVector = new Vector<Integer>(10, 10);

        	for(i=0; i<ids.length; i++)

        		mInEdgeIdVector.add(new Integer(ids[i]));

     }

@@ -186,7 +186,7 @@ public class Vertex implements Serializable
     {

         int i = 0;

 

-        mOutEdgeIdVector = new Vector(10, 10);

+        mOutEdgeIdVector = new Vector<Integer>(10, 10);

        	for(i=0; i<ids.length; i++)

        		mOutEdgeIdVector.add(new Integer(ids[i]));

     }