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/SplitJoinRenderer.java b/source/com/c2kernel/lifecycle/instance/gui/view/SplitJoinRenderer.java
index 4c3f8bf..036f79a 100755..100644
--- a/source/com/c2kernel/lifecycle/instance/gui/view/SplitJoinRenderer.java
+++ b/source/com/c2kernel/lifecycle/instance/gui/view/SplitJoinRenderer.java
@@ -39,7 +39,8 @@ public class SplitJoinRenderer implements VertexRenderer
     private int     mXXXTextXOffset            = 0;

 

 

-    public void draw( Graphics2D g2d, Vertex vertex)

+    @Override

+	public void draw( Graphics2D g2d, Vertex vertex)

     {

         GraphPoint centrePoint  = vertex.getCentrePoint();

         String     text         = null;

@@ -79,9 +80,9 @@ public class SplitJoinRenderer implements VertexRenderer
             textXOffset = mJoinTextXOffset;

         }

         else if ( vertex instanceof Join)

-        {    

+        {

             String type= (String)((Join)vertex).getProperties().get("Type");

-            if (type!=null && type.equals("Route")) 

+            if (type!=null && type.equals("Route"))

             {

                 text        = mRouteText;

                 textXOffset = mRouteTextXOffset;

@@ -116,7 +117,7 @@ public class SplitJoinRenderer implements VertexRenderer
             vertexHeight

         );

         g2d.drawString( text, centrePoint.x - textXOffset, centrePoint.y + mTextYOffset );

-        

+

         if (!hasErrors) {

             g2d.setPaint( mErrorPaint );

             String errors = Language.translate(((WfVertex)vertex).getErrors());