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, 17 insertions, 16 deletions

diff --git a/source/com/c2kernel/collection/gui/view/AggregationMemberRenderer.java b/source/com/c2kernel/collection/gui/view/AggregationMemberRenderer.java
index 0d3cb03..6d41d20 100755..100644
--- a/source/com/c2kernel/collection/gui/view/AggregationMemberRenderer.java
+++ b/source/com/c2kernel/collection/gui/view/AggregationMemberRenderer.java
@@ -19,31 +19,32 @@ public class AggregationMemberRenderer implements VertexRenderer
 {

 

     private Aggregation mAggregation = null;

-    

+

     public AggregationMemberRenderer()

     {

     }

-    

+

 	public void setAggregation(Aggregation agg)

 	{

 		mAggregation = agg;

-	}    

-    

-    

-    public void draw(Graphics2D g2d, Vertex vertex)

+	}

+

+

+    @Override

+	public void draw(Graphics2D g2d, Vertex vertex)

     {

         GraphPoint   centre    = vertex.getCentrePoint();

         GraphPoint[] outline   = vertex.getOutlinePoints();

         FontMetrics  metrics   = g2d.getFontMetrics();

-						

+

 		AggregationMember memberPair = mAggregation.getMemberPair(vertex.getID());

 

 		try

-		{			

-			String name = memberPair.getEntityName();	

+		{

+			String name = memberPair.getEntityName();

 

-			g2d.drawString( name, 

-				centre.x-metrics.stringWidth(name)/2, 

+			g2d.drawString( name,

+				centre.x-metrics.stringWidth(name)/2,

 				topYOfOutline(outline) );

 

 	        g2d.drawImage

@@ -54,8 +55,8 @@ public class AggregationMemberRenderer implements VertexRenderer
 	            null

 	        );

 

-	

-	

+

+

 	        // Draw the outline of the vertex

 	        if(outline.length > 1)

 	        {

@@ -69,7 +70,7 @@ public class AggregationMemberRenderer implements VertexRenderer
 	                    outline[i+1].y

 	                );

 	            }

-	

+

 	            g2d.drawLine

 	            (

 	                outline[outline.length-1].x,

@@ -84,7 +85,7 @@ public class AggregationMemberRenderer implements VertexRenderer
 		catch (Exception ex)

 		{

 			Logger.error("AggregationMemberRenderer::draw() " + ex);

-		}									                

+		}

     }

 

 

@@ -104,7 +105,7 @@ public class AggregationMemberRenderer implements VertexRenderer
 

         return topY;

     }

-    

+

 	int bottomYOfOutline(GraphPoint[] outline)

 	{

 		int bottomY = outline[0].y;