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, 5 insertions, 4 deletions

diff --git a/source/com/c2kernel/lifecycle/instance/gui/view/ActivityRenderer.java b/source/com/c2kernel/lifecycle/instance/gui/view/ActivityRenderer.java
index a67b4fd..046ed7c 100755..100644
--- a/source/com/c2kernel/lifecycle/instance/gui/view/ActivityRenderer.java
+++ b/source/com/c2kernel/lifecycle/instance/gui/view/ActivityRenderer.java
@@ -21,6 +21,7 @@ public class ActivityRenderer implements VertexRenderer
 	private Paint mInactiveCompPaint = new Color(200, 200, 255);

 	private Paint mErrorPaint = new Color(255, 50, 0);

 	private Paint mTextPaint = Color.black;

+	@Override

 	public void draw(Graphics2D g2d, Vertex vertex)

 	{

 		Activity activity = (Activity) vertex;

@@ -28,7 +29,7 @@ public class ActivityRenderer implements VertexRenderer
 		boolean hasError = !activity.verify();

 		boolean isComposite = activity.getIsComposite();

 		GraphPoint centrePoint = activity.getCentrePoint();

-		String description = activity.getDescription();

+		//String description = activity.getDescription();

 		String[] linesOfText = new String[3];

 		linesOfText[0] = "(" + activity.getType() + ")";

 		linesOfText[1] = activity.getName();

@@ -52,7 +53,7 @@ public class ActivityRenderer implements VertexRenderer
 			else

 				linesOfText[2] = Language.translate(States.getStateName(cs));

 		}

-		

+

 		FontMetrics metrics = g2d.getFontMetrics();

 		int lineWidth = 0;

 		int lineHeight = metrics.getHeight();

@@ -86,7 +87,7 @@ public class ActivityRenderer implements VertexRenderer
 			g2d.drawString(linesOfText[i], x, y);

 		}

 	}

-	private Polygon graphPointsToPolygon(GraphPoint[] points)

+	private static Polygon graphPointsToPolygon(GraphPoint[] points)

 	{

 		Polygon polygon = new Polygon();

 		int i = 0;

@@ -96,7 +97,7 @@ public class ActivityRenderer implements VertexRenderer
 		}

 		return polygon;

 	}

-	private String getWaitTime(GTimeStamp date)

+	private static String getWaitTime(GTimeStamp date)

 	{

 		GTimeStamp now = new GTimeStamp();

 		DateUtility.setToNow(now);