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, 3 insertions, 3 deletions

diff --git a/source/com/c2kernel/graph/layout/DefaultGraphLayoutGenerator.java b/source/com/c2kernel/graph/layout/DefaultGraphLayoutGenerator.java
index 4b429fa..8ab91ef 100644
--- a/source/com/c2kernel/graph/layout/DefaultGraphLayoutGenerator.java
+++ b/source/com/c2kernel/graph/layout/DefaultGraphLayoutGenerator.java
@@ -60,7 +60,7 @@ public class DefaultGraphLayoutGenerator {
     }

 

     private static void calculateRowMidPoints(Vector<Vector<Vertex>> rowVector, int[] midPoints, IntegerWrapper valueOfLargestMidPoint) {

-        Vector rowsVertices = null;

+        Vector<Vertex> rowsVertices = null;

         int rowsWidth = 0;

         int i = 0;

         for (i = 0; i < midPoints.length; i++) {

@@ -75,7 +75,7 @@ public class DefaultGraphLayoutGenerator {
 

     private static void fillInVertexLocations(GraphModel graphModel, Vector<Vector<Vertex>> rowVector,

         IntegerWrapper valueOfLargestMidPoint, int[] midPoints) {

-            Vector rowsVertices = null;

+            Vector<Vertex> rowsVertices = null;

             Vertex vertex = null;

             int rowIndex = 0;

             int column = 0;

@@ -85,7 +85,7 @@ public class DefaultGraphLayoutGenerator {
                 rowsVertices = rowVector.elementAt(rowIndex);

                 rowsLeftMargin = mLeftMargin + valueOfLargestMidPoint.mValue - midPoints[rowIndex];

                 for (column = 0; column < rowsVertices.size(); column++) {

-                    vertex = (Vertex)rowsVertices.elementAt(column);

+                    vertex = rowsVertices.elementAt(column);

                     point.x = rowsLeftMargin + column * mHorzGap;

                     point.y = mTopMargin + rowIndex * mVertGap;

                     vertex.moveAbsolute(point);