From 5664fd4644c78f4571a1a72e6b9f0511fb10720a Mon Sep 17 00:00:00 2001 From: abranson 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 ++++++++++---------- .../com/c2kernel/graph/model/GraphModelManager.java | 4 ++-- source/com/c2kernel/graph/model/GraphableVertex.java | 0 source/com/c2kernel/graph/model/Vertex.java | 10 +++++----- 4 files changed, 17 insertions(+), 17 deletions(-) mode change 100755 => 100644 source/com/c2kernel/graph/model/GraphModel.java mode change 100755 => 100644 source/com/c2kernel/graph/model/GraphModelManager.java mode change 100755 => 100644 source/com/c2kernel/graph/model/GraphableVertex.java mode change 100755 => 100644 source/com/c2kernel/graph/model/Vertex.java (limited to 'source/com/c2kernel/graph/model') 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 mVertexHashtable = new Hashtable(); + protected Hashtable mEdgeHashtable = new Hashtable(); 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(); 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(); 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 vertexVector = new Vector(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(); + mEdgeHashtable = new Hashtable(); 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 verticesInside = new Vector(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(); 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(); 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 old mode 100755 new mode 100644 index 19f2dc3..3146c24 --- 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 mParentModels = new Stack(); + private ArrayList mParentIds = new ArrayList(); 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 old mode 100755 new mode 100644 diff --git a/source/com/c2kernel/graph/model/Vertex.java b/source/com/c2kernel/graph/model/Vertex.java old mode 100755 new mode 100644 index 1e8399b..a9a5238 --- 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 mInEdgeIdVector = new Vector(); + private Vector mOutEdgeIdVector = new Vector(); + private Vector mTags = new Vector(); // 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(10, 10); for(i=0; i(10, 10); for(i=0; i