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

1 files changed, 10 insertions, 10 deletions

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;

     }