From 0ec8481c10cd8277d84c7c1a785483a0a739e5a0 Mon Sep 17 00:00:00 2001 From: abranson Date: Thu, 4 Aug 2011 00:42:34 +0200 Subject: More code cleanup: Refactored Entity Proxy Subscription to handle generics better Rewrote RemoteMap to use TreeMap instead of the internal array for order. It now sorts its keys by number if they parse, else as strings. Removed a no-longer-in-progress outcome form class --- source/com/c2kernel/graph/model/GraphModel.java | 60 ++++++++++++++++--------- 1 file changed, 38 insertions(+), 22 deletions(-) (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 index e9ae02f..47f368d 100644 --- a/source/com/c2kernel/graph/model/GraphModel.java +++ b/source/com/c2kernel/graph/model/GraphModel.java @@ -6,7 +6,23 @@ import java.io.Serializable; import java.util.Hashtable; import java.util.Vector; -import com.c2kernel.graph.event.*; +import com.c2kernel.graph.event.ClearedEvent; +import com.c2kernel.graph.event.EdgeRemovedEvent; +import com.c2kernel.graph.event.EdgesChangedEvent; +import com.c2kernel.graph.event.ElasticBandResizedEvent; +import com.c2kernel.graph.event.ElasticBandSetEvent; +import com.c2kernel.graph.event.ForcedNotifyEvent; +import com.c2kernel.graph.event.GraphModelEvent; +import com.c2kernel.graph.event.GraphModelResizedEvent; +import com.c2kernel.graph.event.NewEdgeEndPointChangedEvent; +import com.c2kernel.graph.event.SelectionChangedEvent; +import com.c2kernel.graph.event.SelectionMovedEvent; +import com.c2kernel.graph.event.StartVertexIdChangedEvent; +import com.c2kernel.graph.event.VertexAddedEvent; +import com.c2kernel.graph.event.VertexCreatedEvent; +import com.c2kernel.graph.event.VertexMovedEvent; +import com.c2kernel.graph.event.VertexRemovedEvent; +import com.c2kernel.graph.event.VerticesChangedEvent; import com.c2kernel.utils.Logger; public class GraphModel implements Serializable{ @@ -153,7 +169,7 @@ public class GraphModel implements Serializable{ public Vertex getStartVertex() { return resolveVertex(getStartVertexId()); } - + /** * @return Returns the mParentVertex. */ @@ -165,13 +181,13 @@ public class GraphModel implements Serializable{ */ public void setContainingVertex(GraphableVertex vertex) { mContainingVertex = vertex; - } + } public void setVertices(Vertex[] vertices) { mVertexHashtable = new Hashtable(); - for (int i = 0; i < vertices.length; i++) { - mVertexHashtable.put(String.valueOf(vertices[i].getID()), vertices[i]); - checkSize(vertices[i]); + for (Vertex vertice : vertices) { + mVertexHashtable.put(String.valueOf(vertice.getID()), vertice); + checkSize(vertice); } setChanged(); @@ -190,8 +206,8 @@ public class GraphModel implements Serializable{ public void setEdges(DirectedEdge[] edges) { mEdgeHashtable = new Hashtable(); - for (int i = 0; i < edges.length; i++) { - mEdgeHashtable.put(String.valueOf(edges[i].getID()), edges[i]); + for (DirectedEdge edge : edges) { + mEdgeHashtable.put(String.valueOf(edge.getID()), edge); } setChanged(); notifyObservers(mEdgesChangedEvent); @@ -229,11 +245,11 @@ public class GraphModel implements Serializable{ return null; } else { - smallestVertex = (Vertex)vertexVector.elementAt(0); + smallestVertex = vertexVector.elementAt(0); sizeOfSmallestVertex = smallestVertex.getHeight() * smallestVertex.getWidth(); // Determine the smallest vertex for (i = 1; i < numVerticesFound; i++) { - vertex = (Vertex)vertexVector.elementAt(i); + vertex = vertexVector.elementAt(i); sizeOfVertex = vertex.getHeight() * vertex.getWidth(); if (sizeOfVertex < sizeOfSmallestVertex) { smallestVertex = vertex; @@ -245,7 +261,7 @@ public class GraphModel implements Serializable{ } public Vertex getVertexById(int id) { - return (Vertex)mVertexHashtable.get(String.valueOf(id)); + return mVertexHashtable.get(String.valueOf(id)); } public DirectedEdge getEdge(GraphPoint p) { @@ -302,7 +318,7 @@ public class GraphModel implements Serializable{ if (mVertexOutlineCreator == null) { Logger.msg(1,"You cannot add a vertex with no outline creator"); return -1; - + } mVertexHashtable.put(String.valueOf(mNextId), v); placeVertex(v, location); @@ -316,7 +332,7 @@ public class GraphModel implements Serializable{ if (mVertexOutlineCreator != null) { mVertexOutlineCreator.setOutline(v); } - setChanged(); + setChanged(); notifyObservers(mVertexAddedEvent); checkSize(v); } @@ -420,11 +436,11 @@ public class GraphModel implements Serializable{ } public Vertex resolveVertex(int id) { - return (Vertex)mVertexHashtable.get(String.valueOf(id)); + return mVertexHashtable.get(String.valueOf(id)); } public DirectedEdge resolveEdge(int id) { - return (DirectedEdge)mEdgeHashtable.get(String.valueOf(id)); + return mEdgeHashtable.get(String.valueOf(id)); } public DirectedEdge[] getInEdges(Vertex v) { @@ -641,7 +657,7 @@ public class GraphModel implements Serializable{ verticesInside.add(allVertices[i]); } } - + // Select the vertices found within the elastic band polygon if (verticesInside.size() == 0) { mSelection.mTopLeftX = 0; @@ -651,15 +667,15 @@ public class GraphModel implements Serializable{ mSelection.mEdge = null; if (mContainingVertex != null) verticesInside.add(mContainingVertex); - else + else mSelection.mVertices = null; } - + if (verticesInside.size() > 0) { mSelection.mEdge = null; mSelection.mVertices = new Vertex[verticesInside.size()]; for (i = 0; i < verticesInside.size(); i++) { - mSelection.mVertices[i] = (Vertex)verticesInside.elementAt(i); + mSelection.mVertices[i] = verticesInside.elementAt(i); } updateSelectionCorners(); } @@ -679,8 +695,8 @@ public class GraphModel implements Serializable{ mSelection.mTopLeftY = centrePoint.y; mSelection.mBottomRightX = centrePoint.x; mSelection.mBottomRightY = centrePoint.y; - for (int i = 0; i < mSelection.mVertices.length; i++) { - vertex = mSelection.mVertices[i]; + for (Vertex mVertice : mSelection.mVertices) { + vertex = mVertice; centrePoint = vertex.getCentrePoint(); if (centrePoint.x < mSelection.mTopLeftX) { mSelection.mTopLeftX = centrePoint.x; @@ -825,7 +841,7 @@ public class GraphModel implements Serializable{ } public void setGraphModelCastorData(GraphModelCastorData data) { - Class vertexOutlineCreatorClass = null; + Class vertexOutlineCreatorClass = null; int i = 0; // Create the vertex outline creator if (data.mClassNameOfVertexOutlineCreator.equals("")) { -- cgit v1.2.3