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

10 files changed, 95 insertions, 68 deletions

diff --git a/source/com/c2kernel/graph/model/DirectedEdge.java b/source/com/c2kernel/graph/model/DirectedEdge.java
index 3848373..830d70d 100755..100644
--- a/source/com/c2kernel/graph/model/DirectedEdge.java
+++ b/source/com/c2kernel/graph/model/DirectedEdge.java
@@ -51,7 +51,7 @@ public abstract class DirectedEdge implements Serializable
 

 

     public boolean containsPoint(GraphPoint p)

-    {        

+    {

         int midX = mOriginPoint.x + (mTerminusPoint.x - mOriginPoint.x)/2;

         int midY = mOriginPoint.y + (mTerminusPoint.y - mOriginPoint.y)/2;

         int minX = midX - 10;

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<String, Vertex>();

-        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<String, DirectedEdge>();

-        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("")) {

diff --git a/source/com/c2kernel/graph/model/GraphModelManager.java b/source/com/c2kernel/graph/model/GraphModelManager.java
index 3146c24..68d47e0 100644
--- a/source/com/c2kernel/graph/model/GraphModelManager.java
+++ b/source/com/c2kernel/graph/model/GraphModelManager.java
@@ -23,7 +23,7 @@ public class GraphModelManager extends Observable
     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

     // which is required by the method addVertexAndCreateId()

     public GraphModelManager()

@@ -31,7 +31,7 @@ public class GraphModelManager extends Observable
         mGraphModel = new GraphModel();

         mGraphModel.setManager(this);

     }

-    

+

     public GraphModelManager(GraphModel newModel) {

         newModel.setManager(this);

         mGraphModel = newModel;

@@ -41,8 +41,8 @@ public class GraphModelManager extends Observable
         mParentModels.clear();

 

         //zoom back to where we were

-        for (Iterator iter = mParentIds.iterator(); iter.hasNext();) {

-            Integer parentId = (Integer) iter.next();

+        for (Iterator<Integer> iter = mParentIds.iterator(); iter.hasNext();) {

+            Integer parentId = iter.next();

             GraphableVertex childModelVertex = (GraphableVertex)newModel.getVertexById(parentId.intValue());

             if (childModelVertex == null) { // we've been deleted, stay here

                 Logger.msg(7, "Didn't find "+parentId+" in new model tree. Stopping here.");

@@ -54,17 +54,17 @@ public class GraphModelManager extends Observable
                 Logger.msg(7, "Pushing model and switching to "+parentId);

                 newModel = childModelVertex.getChildGraphModel();

             }

-        }        

+        }

         setModel(newModel);

     }

-    

+

     public void setModel(GraphModel newModel) {

         // reset transient data

         newModel.mSelection           = new Selection(null, null, 0, 0, 0, 0);

         newModel.mNewEdgeOriginVertex = null;

         newModel.mNewEdgeEndPoint     = null;

 

-        // copy factories over 

+        // copy factories over

         newModel.setExternalEdgeFactory(mEdgeFactory);

         newModel.setExternalVertexFactory(mVertexFactory);

         newModel.setVertexOutlineCreator(mVertexOutlineCreator);

@@ -72,12 +72,12 @@ public class GraphModelManager extends Observable
         newModel.setManager(this);

         mGraphModel.setManager(null);

         mGraphModel = newModel;

-        

+

         // notify

         setChanged();

         notifyObservers(mEntireModelChangedEvent);

     }

-    

+

     public void zoomIn(Vertex child) {

         GraphModel childModel = child.getChildGraphModel();

         if (childModel != null) {

@@ -87,53 +87,54 @@ public class GraphModelManager extends Observable
             Logger.msg(7, "ZoomIn - Stack size: "+mParentModels.size()+" ids:"+mParentIds.size());

         }

     }

-    

+

     public void zoomOut() {

         if (!mParentModels.empty()) {

-            setModel((GraphModel)mParentModels.pop());

+            setModel(mParentModels.pop());

             mParentIds.remove(mParentIds.size()-1);

         }

         Logger.msg(7, "ZoomOut - Stack size: "+mParentModels.size()+" ids:"+mParentIds.size());

-        

+

     }

-    

+

     public void forceNotify()

     {

         setChanged();

         notifyObservers(mForcedNotifyEvent);

     }

-    

+

     public GraphModel getModel() {

         return mGraphModel;

     }

-    

+

     public void setExternalEdgeFactory(EdgeFactory newEdgeFactory) {

         mEdgeFactory = newEdgeFactory;

         mGraphModel.setExternalEdgeFactory(newEdgeFactory);

-    }   

+    }

 

     public void setExternalVertexFactory(VertexFactory newVertexFactory) {

         mVertexFactory = newVertexFactory;

         mGraphModel.setExternalVertexFactory(newVertexFactory);

-    }   

+    }

 

     public void setVertexOutlineCreator(VertexOutlineCreator newVertexOutlineCreator) {

         mVertexOutlineCreator = newVertexOutlineCreator;

         mGraphModel.setVertexOutlineCreator(newVertexOutlineCreator);

-    }   

-    

-    protected void setChanged() {

+    }

+

+    @Override

+	protected void setChanged() {

         super.setChanged();

     }

-    

+

     protected void notifyObservers(GraphModelEvent ev) {

         super.notifyObservers(ev);

     }

-    

+

     public void setEditable(boolean editable) {

         mEditable = editable;

     }

-    

+

     public boolean isEditable() {

         return mEditable;

     }

diff --git a/source/com/c2kernel/graph/model/GraphPoint.java b/source/com/c2kernel/graph/model/GraphPoint.java
index c1c6ccc..f2aa165 100755..100644
--- a/source/com/c2kernel/graph/model/GraphPoint.java
+++ b/source/com/c2kernel/graph/model/GraphPoint.java
@@ -6,11 +6,11 @@ public class GraphPoint implements Serializable{
 

     public int x;

     public int y;

-    

+

     public GraphPoint() {

         x=0; y=0;

     }

-    

+

     public GraphPoint(int x, int y) {

         this.x = x;

         this.y = y;

diff --git a/source/com/c2kernel/graph/model/Graphable.java b/source/com/c2kernel/graph/model/Graphable.java
index 5dde105..ed55271 100755..100644
--- a/source/com/c2kernel/graph/model/Graphable.java
+++ b/source/com/c2kernel/graph/model/Graphable.java
@@ -42,10 +42,12 @@ abstract public class Graphable extends Vertex
 	{

 		this.parent = parent;

 	}

+	@Override

 	public GraphModel getChildGraphModel() {

 		return children;

 	}

 

+	@Override

 	public Object getCreationContext() {

 		return this;

 	}

diff --git a/source/com/c2kernel/graph/model/GraphableEdge.java b/source/com/c2kernel/graph/model/GraphableEdge.java
index a6d9a63..23499be 100755..100644
--- a/source/com/c2kernel/graph/model/GraphableEdge.java
+++ b/source/com/c2kernel/graph/model/GraphableEdge.java
@@ -64,7 +64,7 @@ public abstract class GraphableEdge extends DirectedEdge
     public KeyValuePair[] getKeyValuePairs() {

         return mProperties.getKeyValuePairs();

     }

-    

+

     public void setKeyValuePairs(KeyValuePair[] pairs) {

         mProperties.setKeyValuePairs(pairs);

     }

diff --git a/source/com/c2kernel/graph/model/GraphableVertex.java b/source/com/c2kernel/graph/model/GraphableVertex.java
index 6efd298..fc04743 100644
--- a/source/com/c2kernel/graph/model/GraphableVertex.java
+++ b/source/com/c2kernel/graph/model/GraphableVertex.java
@@ -4,6 +4,7 @@ package com.c2kernel.graph.model;
 * @author  $Author: abranson $

 */

 import java.awt.Point;

+

 import com.c2kernel.utils.CastorHashMap;

 import com.c2kernel.utils.KeyValuePair;

 public abstract class GraphableVertex extends Vertex

@@ -52,10 +53,12 @@ public abstract class GraphableVertex extends Vertex
 			throw new ExceptionInInitializerError();

 		this.parent = parent;

 	}

+	@Override

 	public GraphModel getChildGraphModel()

 	{

 		return mChildrenGraphModel;

 	}

+	@Override

 	public Object getCreationContext()

 	{

 		return this;

@@ -134,9 +137,9 @@ public abstract class GraphableVertex extends Vertex
 				ids = ids.substring(getPath().length() + 1);

 			else

                 return null;

-            

-            for (int i = 0; i < graphables.length; i++) {

-					GraphableVertex grap = graphables[i].search(ids);

+

+            for (GraphableVertex graphable : graphables) {

+					GraphableVertex grap = graphable.search(ids);

 					if (grap != null) return grap;

 			}

         }

@@ -201,17 +204,18 @@ public abstract class GraphableVertex extends Vertex
 		DirectedEdge[] edges = mChildrenGraphModel.getEdges();

 		GraphableVertex[] graphables = this.getLayoutableChildren();

 		if (graphables != null)

-			for (int i = 0; i < graphables.length; i++)

-				graphables[i].setParent(this);

+			for (GraphableVertex graphable : graphables)

+				graphable.setParent(this);

 		if (edges != null)

-			for (int i = 0; i < edges.length; i++)

-				 ((GraphableEdge) edges[i]).setParent(this);

+			for (DirectedEdge edge : edges)

+				((GraphableEdge) edge).setParent(this);

         childrenGraph.setContainingVertex(this);

 	}

 

 	/**

 	 * @see com.c2kernel.graph.model.Vertex#getCentrePoint()

 	 */

+	@Override

 	public GraphPoint getCentrePoint()

 	{

 		if (!getIsLayoutable())

@@ -221,6 +225,7 @@ public abstract class GraphableVertex extends Vertex
 	/**

 	 * @see com.c2kernel.graph.model.Vertex#getInEdgeIds()

 	 */

+	@Override

 	public int[] getInEdgeIds()

 	{

 		if (!getIsLayoutable())

@@ -230,6 +235,7 @@ public abstract class GraphableVertex extends Vertex
 	/**

 	 * @see com.c2kernel.graph.model.Vertex#getOutEdgeIds()

 	 */

+	@Override

 	public int[] getOutEdgeIds()

 	{

 		if (!getIsLayoutable())

@@ -239,6 +245,7 @@ public abstract class GraphableVertex extends Vertex
 	/**

 	 * @see com.c2kernel.graph.model.Vertex#getOutlinePoints()

 	 */

+	@Override

 	public GraphPoint[] getOutlinePoints()

 	{

 		if (!getIsLayoutable())

diff --git a/source/com/c2kernel/graph/model/TypeNameAndConstructionInfo.java b/source/com/c2kernel/graph/model/TypeNameAndConstructionInfo.java
index 6443064..e5b6c3d 100755..100644
--- a/source/com/c2kernel/graph/model/TypeNameAndConstructionInfo.java
+++ b/source/com/c2kernel/graph/model/TypeNameAndConstructionInfo.java
@@ -16,7 +16,8 @@ public class TypeNameAndConstructionInfo implements Serializable
     }

 

 

-    public String toString()

+    @Override

+	public String toString()

     {

         return mName;

     }

diff --git a/source/com/c2kernel/graph/model/Vertex.java b/source/com/c2kernel/graph/model/Vertex.java
index a9a5238..ccef437 100644
--- a/source/com/c2kernel/graph/model/Vertex.java
+++ b/source/com/c2kernel/graph/model/Vertex.java
@@ -198,7 +198,7 @@ public class Vertex implements Serializable
     }

 

 

-    private int[] integerVectorToIntArray(Vector vector)

+    private static int[] integerVectorToIntArray(Vector<Integer> vector)

     {

         int[]   array   = new int[vector.size()];

         Integer integer = null;

@@ -206,7 +206,7 @@ public class Vertex implements Serializable
 

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

         {

-            integer  = (Integer)vector.elementAt(i);

+            integer  = vector.elementAt(i);

             array[i] = integer.intValue();

         }

 

@@ -227,7 +227,7 @@ public class Vertex implements Serializable
 

         for(i=0; i<mInEdgeIdVector.size(); i++)

         {

-            integer = (Integer)mInEdgeIdVector.elementAt(i);

+            integer = mInEdgeIdVector.elementAt(i);

 

             if(integer.intValue() == id)

             {

@@ -251,7 +251,7 @@ public class Vertex implements Serializable
 

         for(i=0; i<mOutEdgeIdVector.size(); i++)

         {

-            integer = (Integer)mOutEdgeIdVector.elementAt(i);

+            integer = mOutEdgeIdVector.elementAt(i);

 

             if(integer.intValue() == id)

             {

@@ -272,22 +272,22 @@ public class Vertex implements Serializable
     {

         return mTags.contains(o);

     }

-    

+

     public void clearTag(Object o)

     {

         mTags.remove(o);

     }

 

-    

+

     public GraphModel getChildGraphModel() {

         return null;

     }

-    

+

     public Object getCreationContext() {

         return null;

     }

-    

-    

+

+

 	public GraphModel getGraphModel()

 	{

 		return graphModel;

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

 		this.graphModel = graphModel;

 	}

-    

+

     public boolean isJoin() {

         return false;

     }

diff --git a/source/com/c2kernel/graph/model/VertexFactory.java b/source/com/c2kernel/graph/model/VertexFactory.java
index f47d9a6..550367e 100755..100644
--- a/source/com/c2kernel/graph/model/VertexFactory.java
+++ b/source/com/c2kernel/graph/model/VertexFactory.java
@@ -11,6 +11,6 @@ public interface VertexFactory
         Point                       location,

         TypeNameAndConstructionInfo typeNameAndConstructionInfo

     );

-    

+

     public void setCreationContext(Object newContext);

 }