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

10 files changed, 103 insertions, 68 deletions

diff --git a/source/com/c2kernel/lifecycle/gui/model/WfDefGraphPanel.java b/source/com/c2kernel/lifecycle/gui/model/WfDefGraphPanel.java
index 973fcbf..e0f4f65 100755..100644
--- a/source/com/c2kernel/lifecycle/gui/model/WfDefGraphPanel.java
+++ b/source/com/c2kernel/lifecycle/gui/model/WfDefGraphPanel.java
@@ -18,6 +18,7 @@ public class WfDefGraphPanel extends GraphPanel
 		super(d,v);

 	}

 	// Draws the highlight of the specified edge

+	@Override

 	protected void drawEdgeHighlight(Graphics2D g2d, DirectedEdge edge)

 	{

 		GraphPoint originPoint   = edge.getOriginPoint();

@@ -49,7 +50,7 @@ public class WfDefGraphPanel extends GraphPanel
 		int minX = midPoint.x - 10;

 		int minY = midPoint.y - 10;

 		int maxX = midPoint.x + 10;

-		int maxY = midPoint.y + 10;		

+		int maxY = midPoint.y + 10;

 		g2d.drawLine(minX, minY, maxX, minY);

 		g2d.drawLine(maxX, minY, maxX, maxY);

 		g2d.drawLine(maxX, maxY, minX, maxY);

diff --git a/source/com/c2kernel/lifecycle/gui/model/WfEdgeDefFactory.java b/source/com/c2kernel/lifecycle/gui/model/WfEdgeDefFactory.java
index d6fd41c..6e6727a 100755..100644
--- a/source/com/c2kernel/lifecycle/gui/model/WfEdgeDefFactory.java
+++ b/source/com/c2kernel/lifecycle/gui/model/WfEdgeDefFactory.java
@@ -8,6 +8,7 @@ import com.c2kernel.lifecycle.NextDef;
 import com.c2kernel.lifecycle.WfVertexDef;

 public class WfEdgeDefFactory implements EdgeFactory

 {

+	@Override

 	public void create(

 		GraphModelManager graphModelManager,

 		Vertex origin,

@@ -20,7 +21,7 @@ public class WfEdgeDefFactory implements EdgeFactory
 					graphModelManager.getModel().addEdgeAndCreateId(nextDef, origin, terminus);

 				}

 	}

-	private boolean validCreation(GraphModelManager graphModelManager, Vertex origin, Vertex terminus)

+	private static boolean validCreation(GraphModelManager graphModelManager, Vertex origin, Vertex terminus)

 	{

 		DirectedEdge[] connectingEdgesAToB = graphModelManager.getModel().getConnectingEdges(origin.getID(), terminus.getID());

 		DirectedEdge[] connectingEdgesBToA = graphModelManager.getModel().getConnectingEdges(terminus.getID(), origin.getID());

diff --git a/source/com/c2kernel/lifecycle/gui/model/WfVertexDefFactory.java b/source/com/c2kernel/lifecycle/gui/model/WfVertexDefFactory.java
index 2ef9508..da59efd 100644
--- a/source/com/c2kernel/lifecycle/gui/model/WfVertexDefFactory.java
+++ b/source/com/c2kernel/lifecycle/gui/model/WfVertexDefFactory.java
@@ -20,6 +20,7 @@ import com.c2kernel.utils.Resource;
 public class WfVertexDefFactory implements VertexFactory, WorkflowDialogue

 {

 	protected CompositeActivityDef mCompositeActivityDef = null;

+	@Override

 	public void create(GraphModelManager graphModelManager, Point location, TypeNameAndConstructionInfo typeNameAndConstructionInfo)

 	{

 		String vertexTypeId = null;

@@ -46,7 +47,8 @@ public class WfVertexDefFactory implements VertexFactory, WorkflowDialogue
 				mCompositeActivityDef.newChild("", vertexTypeId, location);

 		}

 	}

-	public void loadThisWorkflow(String newName, HashMap hashMap)

+	@Override

+	public void loadThisWorkflow(String newName, HashMap<?, ?> hashMap)

 	{

 		String vertexTypeId = (String) hashMap.get("P1");

 		Point location = (Point) hashMap.get("P2");

@@ -86,6 +88,7 @@ public class WfVertexDefFactory implements VertexFactory, WorkflowDialogue
 			mCompositeActivityDef.newChild(newName, vertexTypeId, location);

 		}

 	}

+	@Override

 	public void setCreationContext(Object newContext)

 	{

 		if (newContext != null && newContext instanceof CompositeActivityDef)

diff --git a/source/com/c2kernel/lifecycle/gui/model/WfVertexDefOutlineCreator.java b/source/com/c2kernel/lifecycle/gui/model/WfVertexDefOutlineCreator.java
index 3727f35..63d3b2f 100755..100644
--- a/source/com/c2kernel/lifecycle/gui/model/WfVertexDefOutlineCreator.java
+++ b/source/com/c2kernel/lifecycle/gui/model/WfVertexDefOutlineCreator.java
@@ -12,7 +12,8 @@ public class WfVertexDefOutlineCreator implements VertexOutlineCreator
     private final int mSplitJoinWidth  = 60;

     private final int mSplitJoinHeight = 25;

 

-    public void setOutline(Vertex vertex)

+    @Override

+	public void setOutline(Vertex vertex)

     {

         GraphPoint   centrePoint   = vertex.getCentrePoint();

         GraphPoint[] outlinePoints = new GraphPoint[ 4 ];

diff --git a/source/com/c2kernel/lifecycle/gui/view/ActivitySlotDefRenderer.java b/source/com/c2kernel/lifecycle/gui/view/ActivitySlotDefRenderer.java
index 5746673..c4309ee 100755..100644
--- a/source/com/c2kernel/lifecycle/gui/view/ActivitySlotDefRenderer.java
+++ b/source/com/c2kernel/lifecycle/gui/view/ActivitySlotDefRenderer.java
@@ -19,7 +19,8 @@ public class ActivitySlotDefRenderer implements VertexRenderer
     private Paint mTextPaint     = Color.black;

 

 

-    public void draw( Graphics2D g2d, Vertex vertex)

+    @Override

+	public void draw( Graphics2D g2d, Vertex vertex)

     {

         ActivitySlotDef activitySlotDef  = ( ActivitySlotDef )vertex;

         boolean         hasError         = activitySlotDef.verify();

@@ -28,12 +29,12 @@ public class ActivitySlotDefRenderer implements VertexRenderer
         GraphPoint      centrePoint      = activitySlotDef.getCentrePoint();

         int             vertexHeight     = activitySlotDef.getHeight();

         int             vertexWidth      = activitySlotDef.getWidth();

-        

+

         String[]        linesOfText      = new String[2+(hasError?0:1)];

         FontMetrics     metrics          = g2d.getFontMetrics();

         int             lineWidth        = 0;

         int             lineHeight       = metrics.getHeight();

-        int             linesHeight      = lineHeight * linesOfText.length; 

+        int             linesHeight      = lineHeight * linesOfText.length;

         int             linesStartY      = centrePoint.y - linesHeight / 2 + lineHeight * 2 / 3;

         int             x                = 0;

         int             y                = 0;

@@ -41,7 +42,7 @@ public class ActivitySlotDefRenderer implements VertexRenderer
 

         linesOfText[0]="("+activitySlotDef.getActivityDef()+")";

         linesOfText[1]=(String)activitySlotDef.getProperties().get("Name");

-        

+

         if (!hasError)linesOfText[2]=Language.translate(activitySlotDef.getErrors());

 

         g2d.setPaint( !hasError ? mErrorPaint : isComposite ? mCompositePaint : mInactivePaint );

@@ -53,7 +54,7 @@ public class ActivitySlotDefRenderer implements VertexRenderer
             vertexHeight,

             true

         );

-                

+

         g2d.setPaint( mTextPaint );

 

         // Draw the lines of text

diff --git a/source/com/c2kernel/lifecycle/gui/view/CompActDefOutcomeHandler.java b/source/com/c2kernel/lifecycle/gui/view/CompActDefOutcomeHandler.java
index cb0ef59..58964aa 100755..100644
--- a/source/com/c2kernel/lifecycle/gui/view/CompActDefOutcomeHandler.java
+++ b/source/com/c2kernel/lifecycle/gui/view/CompActDefOutcomeHandler.java
@@ -15,7 +15,11 @@ import com.c2kernel.graph.layout.DefaultGraphLayoutGenerator;
 import com.c2kernel.graph.view.EditorPanel;

 import com.c2kernel.graph.view.VertexPropertyPanel;

 import com.c2kernel.gui.MainFrame;

-import com.c2kernel.gui.tabs.outcome.*;

+import com.c2kernel.gui.tabs.outcome.InvalidOutcomeException;

+import com.c2kernel.gui.tabs.outcome.InvalidSchemaException;

+import com.c2kernel.gui.tabs.outcome.OutcomeException;

+import com.c2kernel.gui.tabs.outcome.OutcomeHandler;

+import com.c2kernel.gui.tabs.outcome.OutcomeNotInitialisedException;

 import com.c2kernel.lifecycle.CompositeActivityDef;

 import com.c2kernel.lifecycle.gui.model.WfDefGraphPanel;

 import com.c2kernel.lifecycle.gui.model.WfEdgeDefFactory;

@@ -44,26 +48,26 @@ public class CompActDefOutcomeHandler
     protected JButton mLoadButton = new JButton(Resource.getImageResource("graph/load.png"));

     protected JButton mLayoutButton = new JButton(Resource.getImageResource("graph/autolayout.png"));

     protected JButton[] mOtherToolBarButtons = { mLayoutButton, mLoadButton };

-    

+

     protected CompositeActivityDef mCompActDef = null;

     protected WfEdgeDefFactory mWfEdgeDefFactory = new WfEdgeDefFactory();

-    protected WfVertexDefFactory mWfVertexDefFactory = new WfVertexDefFactory();    

+    protected WfVertexDefFactory mWfVertexDefFactory = new WfVertexDefFactory();

 

     protected EditorPanel mEditorPanel;

     protected VertexPropertyPanel mPropertyPanel;

     protected JSplitPane mSplitPane;

     boolean unsaved;

-        

+

     public CompActDefOutcomeHandler() {

         super();

-        mPropertyPanel = loadPropertyPanel(); 

-        mPropertyPanel.createLayout(new FindActDefPanel());        

+        mPropertyPanel = loadPropertyPanel();

+        mPropertyPanel.createLayout(new FindActDefPanel());

         mEditorPanel =

             new EditorPanel(

                 mWfEdgeDefFactory,

                 mWfVertexDefFactory,

                 new WfVertexDefOutlineCreator(),

-                true, 

+                true,

                 mOtherToolBarButtons,

         		new WfDefGraphPanel(new WfDirectedEdgeDefRenderer(),

 		new WfVertexDefRenderer()));

@@ -92,7 +96,8 @@ public class CompActDefOutcomeHandler
     protected void createListeners()

     {

         mLoadButton.addActionListener(new ActionListener() {

-            public void actionPerformed(ActionEvent ae) {

+            @Override

+			public void actionPerformed(ActionEvent ae) {

                 File selectedFile = null;

 

                 int returnValue = MainFrame.xmlChooser.showOpenDialog(null);

@@ -110,32 +115,34 @@ public class CompActDefOutcomeHandler
                         }

                     case JFileChooser.CANCEL_OPTION :

                     case JFileChooser.ERROR_OPTION :

-            

+

                     default :

                 }

             }

         });

-        

+

         mLayoutButton.addActionListener(new ActionListener() {

-            public void actionPerformed(ActionEvent ae) {

+            @Override

+			public void actionPerformed(ActionEvent ae) {

                 DefaultGraphLayoutGenerator.layoutGraph(mEditorPanel.mGraphModelManager.getModel());

             }

         });

-    }       

-    

+    }

+

     public void setUpGraphEditor() {

         mEditorPanel.mGraphModelManager.setModel(mCompActDef.getChildrenGraphModel());

         // Give the editor panel the edge and vertex types

         mEditorPanel.updateVertexTypes(mCompActDef.getVertexTypeNameAndConstructionInfo());

         mEditorPanel.updateEdgeTypes(mCompActDef.getEdgeTypeNameAndConstructionInfo());

         mEditorPanel.enterSelectMode();

-        mWfVertexDefFactory.setCreationContext(mCompActDef);        

+        mWfVertexDefFactory.setCreationContext(mCompActDef);

     }

-     

+

     /**

      *

      */

-    public void setOutcome(String outcome) throws InvalidOutcomeException {

+    @Override

+	public void setOutcome(String outcome) throws InvalidOutcomeException {

         try {

             CompositeActivityDef newAct = (CompositeActivityDef)CastorXMLUtility.unmarshall(outcome);

             if (mCompActDef != null)

@@ -149,14 +156,16 @@ public class CompActDefOutcomeHandler
     /**

      *

      */

-    public void setDescription(String description)

+    @Override

+	public void setDescription(String description)

         throws InvalidSchemaException {

-        // ignore - always the same 

+        // ignore - always the same

     }

     /**

      *

      */

-    public void setReadOnly(boolean readOnly) {

+    @Override

+	public void setReadOnly(boolean readOnly) {

         mLayoutButton.setEnabled(!readOnly);

         mLoadButton.setEnabled(!readOnly);

         mEditorPanel.setEditable(!readOnly);

@@ -165,13 +174,15 @@ public class CompActDefOutcomeHandler
     /**

      *

      */

-    public JPanel getPanel() throws OutcomeNotInitialisedException {

+    @Override

+	public JPanel getPanel() throws OutcomeNotInitialisedException {

         return this;

     }

     /**

      *

      */

-    public String getOutcome() throws OutcomeException {

+    @Override

+	public String getOutcome() throws OutcomeException {

         try {

             return CastorXMLUtility.marshall(mCompActDef);

         } catch (Exception ex) {

@@ -181,20 +192,21 @@ public class CompActDefOutcomeHandler
     /**

      *

      */

-    public void run() {

-        Thread.currentThread().setName("Composite Act Def Viewer");                       

+    @Override

+	public void run() {

+        Thread.currentThread().setName("Composite Act Def Viewer");

         createLayout();

         createListeners();

-        mPropertyPanel.setGraphModelManager(mEditorPanel.mGraphModelManager);  

-        setUpGraphEditor();  

+        mPropertyPanel.setGraphModelManager(mEditorPanel.mGraphModelManager);

+        setUpGraphEditor();

     }

-    

+

     public VertexPropertyPanel loadPropertyPanel()

     {

         String wfPanelClass = Gateway.getProperty("WfPropertyPanel");

         if (wfPanelClass != null) {

             try {

-                Class panelClass = Class.forName(wfPanelClass);

+                Class<?> panelClass = Class.forName(wfPanelClass);

                 return (VertexPropertyPanel)panelClass.newInstance();

             } catch (Exception ex) {

                 Logger.error("Could not load wf props panel:"+wfPanelClass);

@@ -203,15 +215,18 @@ public class CompActDefOutcomeHandler
         }

         return new VertexPropertyPanel();

     }

-    

-    public boolean isUnsaved() {

+

+    @Override

+	public boolean isUnsaved() {

         return unsaved;

     }

-    

-    public void saved() {

+

+    @Override

+	public void saved() {

         unsaved = false;

     }

-    

+

+	@Override

 	public void export(File targetFile) throws Exception {

 		ElemActDefOutcomeHandler.exportAct(targetFile.getParentFile(), mCompActDef);

 	}

diff --git a/source/com/c2kernel/lifecycle/gui/view/ElemActDefOutcomeHandler.java b/source/com/c2kernel/lifecycle/gui/view/ElemActDefOutcomeHandler.java
index a30491e..c37e5a7 100755..100644
--- a/source/com/c2kernel/lifecycle/gui/view/ElemActDefOutcomeHandler.java
+++ b/source/com/c2kernel/lifecycle/gui/view/ElemActDefOutcomeHandler.java
@@ -41,7 +41,8 @@ public class ElemActDefOutcomeHandler extends VertexPropertyPanel implements Out
     /**

      *

      */

-    public void setOutcome(String outcome) throws InvalidOutcomeException {

+    @Override

+	public void setOutcome(String outcome) throws InvalidOutcomeException {

         try {

             act = (ActivityDef)CastorXMLUtility.unmarshall(outcome);

             setVertex(act);

@@ -54,7 +55,8 @@ public class ElemActDefOutcomeHandler extends VertexPropertyPanel implements Out
     /**

      *

      */

-    public void setDescription(String description)

+    @Override

+	public void setDescription(String description)

             throws InvalidSchemaException {

         // ignore

     }

@@ -62,7 +64,8 @@ public class ElemActDefOutcomeHandler extends VertexPropertyPanel implements Out
     /**

      *

      */

-    public void setReadOnly(boolean readOnly) {

+    @Override

+	public void setReadOnly(boolean readOnly) {

         setEditable(!readOnly);

 

     }

@@ -70,48 +73,54 @@ public class ElemActDefOutcomeHandler extends VertexPropertyPanel implements Out
     /**

      *

      */

-    public JPanel getPanel() throws OutcomeNotInitialisedException {

+    @Override

+	public JPanel getPanel() throws OutcomeNotInitialisedException {

         return this;

     }

 

     /**

      *

      */

-    public String getOutcome() throws OutcomeException {

+    @Override

+	public String getOutcome() throws OutcomeException {

         try {

             return CastorXMLUtility.marshall(act);

         } catch (Exception ex) {

             Logger.error(ex);

             throw new OutcomeException();

-        }           

+        }

     }

 

     /**

      *

      */

-    public void run() {

+    @Override

+	public void run() {

         validate();

     }

-    

-    public boolean isUnsaved() {

+

+    @Override

+	public boolean isUnsaved() {

         return unsaved;

     }

-    

-    public void saved() {

+

+    @Override

+	public void saved() {

         unsaved = false;

     }

-    

+

+	@Override

 	public void export(File targetFile) throws Exception {

 		exportAct(targetFile.getParentFile(), act);

 	}

-	

+

 	public static void exportAct(File dir, ActivityDef actDef) throws Exception {

 		FileStringUtility.string2File(new File(dir, actDef.getActName()+".xml"), CastorXMLUtility.marshall(actDef));

 		// Export associated schema

 		exportSchema((String)actDef.getProperties().get("SchemaType"), (String)actDef.getProperties().get("SchemaVersion"), dir);

 		// Export associated script

 		exportScript((String)actDef.getProperties().get("ScriptName"), (String)actDef.getProperties().get("ScriptVersion"), dir);

-		

+

 		//Export child act if composite

 		if (actDef instanceof CompositeActivityDef) {

 			CompositeActivityDef compActDef = (CompositeActivityDef)actDef;

@@ -121,32 +130,32 @@ public class ElemActDefOutcomeHandler extends VertexPropertyPanel implements Out
 				exportScript((String)vert.getProperties().get("RoutingScriptName"), (String)vert.getProperties().get("RoutingScriptVersion"), dir);

 			}

 			GraphableVertex[] childDefs = compActDef.getLayoutableChildren();

-			for (int i=0; i<childDefs.length; i++) {

-				if (childDefs[i] instanceof ActivitySlotDef)

-				exportAct(dir, ((ActivitySlotDef)childDefs[i]).getTheActivityDef());

+			for (GraphableVertex childDef : childDefs) {

+				if (childDef instanceof ActivitySlotDef)

+				exportAct(dir, ((ActivitySlotDef)childDef).getTheActivityDef());

 			}

 		}

 	}

-	

+

 	public static void exportScript(String name, String version, File dir) {

 		if (name == null || name.length()==0) return;

 		try {

-			FileStringUtility.string2File(new File(dir, name+"_"+version+".xml"), 

+			FileStringUtility.string2File(new File(dir, name+"_"+version+".xml"),

 				LocalObjectLoader.getScript(name, version));

 		} catch (Exception ex) {

 			Logger.error(ex);

 			JOptionPane.showMessageDialog(null, "Could not export script "+name+"_"+version, "Error", JOptionPane.ERROR_MESSAGE);

 		}

 	}

-	

+

 	public static void exportSchema(String name, String version, File dir) {

 		if (name == null || name.length()==0) return;

 		try {

-			FileStringUtility.string2File(new File(dir, name+"_"+version+".xsd"), 

+			FileStringUtility.string2File(new File(dir, name+"_"+version+".xsd"),

 					LocalObjectLoader.getSchema(name, Integer.parseInt(version)).schema);

 		} catch (Exception ex) {

 			Logger.error(ex);

 			JOptionPane.showMessageDialog(null, "Could not export schema "+name+"_"+version, "Error", JOptionPane.ERROR_MESSAGE);

 		}

-	}	

+	}

 }

diff --git a/source/com/c2kernel/lifecycle/gui/view/SplitJoinDefRenderer.java b/source/com/c2kernel/lifecycle/gui/view/SplitJoinDefRenderer.java
index 1c6f1ba..84be70c 100755..100644
--- a/source/com/c2kernel/lifecycle/gui/view/SplitJoinDefRenderer.java
+++ b/source/com/c2kernel/lifecycle/gui/view/SplitJoinDefRenderer.java
@@ -39,7 +39,8 @@ public class SplitJoinDefRenderer implements VertexRenderer
     private String  mXXXText                   = "XXX";

     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;

@@ -75,9 +76,9 @@ public class SplitJoinDefRenderer implements VertexRenderer
             textXOffset = mAndTextXOffset;

         }

         else if ( vertex instanceof JoinDef)

-        {    

+        {

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

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

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

             {

                 text        = mRouteText;

                 textXOffset = mRouteTextXOffset;

diff --git a/source/com/c2kernel/lifecycle/gui/view/WfDirectedEdgeDefRenderer.java b/source/com/c2kernel/lifecycle/gui/view/WfDirectedEdgeDefRenderer.java
index 7eb646f..12df7a1 100755..100644
--- a/source/com/c2kernel/lifecycle/gui/view/WfDirectedEdgeDefRenderer.java
+++ b/source/com/c2kernel/lifecycle/gui/view/WfDirectedEdgeDefRenderer.java
@@ -4,6 +4,7 @@ import java.awt.Graphics2D;
 import java.awt.Shape;

 import java.awt.geom.AffineTransform;

 import java.awt.geom.GeneralPath;

+

 import com.c2kernel.graph.model.DirectedEdge;

 import com.c2kernel.graph.model.GraphPoint;

 import com.c2kernel.graph.view.DirectedEdgeRenderer;

@@ -17,6 +18,7 @@ public class WfDirectedEdgeDefRenderer implements DirectedEdgeRenderer
 		mArrowTemplate.lineTo(0, 0);

 		mArrowTemplate.lineTo(5, 5);

 	}

+	@Override

 	public void draw(Graphics2D g2d, DirectedEdge directedEdge)

 	{

 		GraphPoint originPoint = directedEdge.getOriginPoint();

@@ -91,7 +93,7 @@ public class WfDirectedEdgeDefRenderer implements DirectedEdgeRenderer
 		if (text != null)

 			g2d.drawString(text, midPoint.x + 10, midPoint.y);

 	}

-	private double calcArrowAngle(int originX, int originY, int terminusX, int terminusY)

+	private static double calcArrowAngle(int originX, int originY, int terminusX, int terminusY)

 	{

 		double width = terminusX - originX;

 		double height = terminusY - originY;

diff --git a/source/com/c2kernel/lifecycle/gui/view/WfVertexDefRenderer.java b/source/com/c2kernel/lifecycle/gui/view/WfVertexDefRenderer.java
index 5f17888..9199615 100755..100644
--- a/source/com/c2kernel/lifecycle/gui/view/WfVertexDefRenderer.java
+++ b/source/com/c2kernel/lifecycle/gui/view/WfVertexDefRenderer.java
@@ -14,7 +14,8 @@ public class WfVertexDefRenderer implements VertexRenderer
     protected SplitJoinDefRenderer    mSplitJoinDefRenderer    = new SplitJoinDefRenderer();

 

 

-    public void draw( Graphics2D g2d, Vertex vertex)

+    @Override

+	public void draw( Graphics2D g2d, Vertex vertex)

     {

         if ( vertex instanceof ActivitySlotDef )

         {