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

27 files changed, 304 insertions, 200 deletions

diff --git a/source/com/c2kernel/graph/controller/AutoScrollController.java b/source/com/c2kernel/graph/controller/AutoScrollController.java
index d1e0d8d..aa04609 100755..100644
--- a/source/com/c2kernel/graph/controller/AutoScrollController.java
+++ b/source/com/c2kernel/graph/controller/AutoScrollController.java
@@ -20,7 +20,8 @@ public class AutoScrollController implements MouseMotionListener
     }

 

 

-    public void mouseDragged(MouseEvent me)

+    @Override

+	public void mouseDragged(MouseEvent me)

     {

         Point mousePoint = null;

 

@@ -33,7 +34,8 @@ public class AutoScrollController implements MouseMotionListener
     }

 

 

-    public void mouseMoved(MouseEvent me)

+    @Override

+	public void mouseMoved(MouseEvent me)

     {

     }

 }

diff --git a/source/com/c2kernel/graph/controller/DeletionController.java b/source/com/c2kernel/graph/controller/DeletionController.java
index 38e8347..44ea990 100755..100644
--- a/source/com/c2kernel/graph/controller/DeletionController.java
+++ b/source/com/c2kernel/graph/controller/DeletionController.java
@@ -47,7 +47,8 @@ public class DeletionController extends KeyAdapter implements Observer, ActionLi
 

 

     // Invoked by the graph model

-    public void update(Observable o, Object arg)

+    @Override

+	public void update(Observable o, Object arg)

     {

         SelectionChangedEvent event            = null;

         DirectedEdge          selectedEdge     = null;

@@ -69,7 +70,8 @@ public class DeletionController extends KeyAdapter implements Observer, ActionLi
 

 

     // Invoked by the graph panel

-    public void keyPressed(KeyEvent e)

+    @Override

+	public void keyPressed(KeyEvent e)

     {

         if(e.getKeyCode() == KeyEvent.VK_DELETE && mGraphModelManager.isEditable())

         {

@@ -79,7 +81,8 @@ public class DeletionController extends KeyAdapter implements Observer, ActionLi
 

 

     // Invoked by the delete button

-    public void actionPerformed(ActionEvent ae)

+    @Override

+	public void actionPerformed(ActionEvent ae)

     {

         if(mGraphModelManager != null && mGraphModelManager.isEditable())

         {

diff --git a/source/com/c2kernel/graph/controller/EdgeConstructionController.java b/source/com/c2kernel/graph/controller/EdgeConstructionController.java
index fdf52bf..00ea45b 100755..100644
--- a/source/com/c2kernel/graph/controller/EdgeConstructionController.java
+++ b/source/com/c2kernel/graph/controller/EdgeConstructionController.java
@@ -3,7 +3,6 @@ package com.c2kernel.graph.controller;
 import java.awt.Point;

 import java.awt.event.MouseAdapter;

 import java.awt.event.MouseEvent;

-import java.awt.event.MouseMotionListener;

 

 import com.c2kernel.graph.model.GraphModelManager;

 import com.c2kernel.graph.model.GraphPoint;

@@ -12,7 +11,7 @@ import com.c2kernel.graph.view.EditorModeListener;
 import com.c2kernel.graph.view.EditorToolBar;

 

 

-public class EdgeConstructionController extends MouseAdapter implements MouseMotionListener, EditorModeListener

+public class EdgeConstructionController extends MouseAdapter implements EditorModeListener

 {

     private GraphModelManager mGraphModelManager = null;

     private EditorToolBar     mEditorToolBar     = null;

@@ -49,7 +48,8 @@ public class EdgeConstructionController extends MouseAdapter implements MouseMot
 

     private Action mSetOriginVertex = new Action()

     {

-        public void doIt(Object data)

+        @Override

+		public void doIt(Object data)

         {

             if(mGraphModelManager != null)

             {

@@ -61,7 +61,8 @@ public class EdgeConstructionController extends MouseAdapter implements MouseMot
 

     private Action mSetEndPoint = new Action()

     {

-        public void doIt(Object data)

+        @Override

+		public void doIt(Object data)

         {

             if(mGraphModelManager != null)

             {

@@ -73,7 +74,8 @@ public class EdgeConstructionController extends MouseAdapter implements MouseMot
 

     private Action mClearEdge = new Action()

     {

-        public void doIt(Object data)

+        @Override

+		public void doIt(Object data)

         {

             if(mGraphModelManager != null)

             {

@@ -86,7 +88,8 @@ public class EdgeConstructionController extends MouseAdapter implements MouseMot
 

     private Action mCreateEdge = new Action()

     {

-        public void doIt(Object data)

+        @Override

+		public void doIt(Object data)

         {

             if((mGraphModelManager != null) && (mEditorToolBar != null) && mGraphModelManager.isEditable())

             {

@@ -170,7 +173,8 @@ public class EdgeConstructionController extends MouseAdapter implements MouseMot
     }

 

 

-    public void editorModeChanged(String idOfNewMode)

+    @Override

+	public void editorModeChanged(String idOfNewMode)

     {

         if(idOfNewMode.equals("Edge"))

         {

@@ -183,7 +187,8 @@ public class EdgeConstructionController extends MouseAdapter implements MouseMot
     }

 

 

-    public void mousePressed(MouseEvent me)

+    @Override

+	public void mousePressed(MouseEvent me)

     {

         Vertex vertex     = null;

         Point  mousePoint = null;

@@ -203,7 +208,8 @@ public class EdgeConstructionController extends MouseAdapter implements MouseMot
     }

 

 

-    public void mouseReleased(MouseEvent me)

+    @Override

+	public void mouseReleased(MouseEvent me)

     {

         Vertex vertex     = null;

         Point  mousePoint = null;

@@ -227,18 +233,21 @@ public class EdgeConstructionController extends MouseAdapter implements MouseMot
     }

 

 

-    public void mouseExited(MouseEvent me)

+    @Override

+	public void mouseExited(MouseEvent me)

     {

     }

 

 

-    public void mouseDragged(MouseEvent me)

+    @Override

+	public void mouseDragged(MouseEvent me)

     {

         processEvent(kDrag, me.getPoint());

     }

 

 

-    public void mouseMoved(MouseEvent me)

+    @Override

+	public void mouseMoved(MouseEvent me)

     {

     }

 }

diff --git a/source/com/c2kernel/graph/controller/MultiSelectionDragController.java b/source/com/c2kernel/graph/controller/MultiSelectionDragController.java
index 8e9a2b3..eda5c1c 100755..100644
--- a/source/com/c2kernel/graph/controller/MultiSelectionDragController.java
+++ b/source/com/c2kernel/graph/controller/MultiSelectionDragController.java
@@ -6,7 +6,6 @@ import java.awt.event.KeyEvent;
 import java.awt.event.KeyListener;

 import java.awt.event.MouseAdapter;

 import java.awt.event.MouseEvent;

-import java.awt.event.MouseMotionListener;

 

 import com.c2kernel.graph.model.DirectedEdge;

 import com.c2kernel.graph.model.ElasticBand;

@@ -20,7 +19,7 @@ import com.c2kernel.graph.view.EditorModeListener;
 

 public class MultiSelectionDragController

 extends MouseAdapter

-implements EditorModeListener, MouseMotionListener, KeyListener

+implements EditorModeListener, KeyListener

 {

     private class ResizeInf

     {

@@ -90,7 +89,8 @@ implements EditorModeListener, MouseMotionListener, KeyListener
 

     protected Action mStoreResizeInf = new Action()

     {

-        public void doIt(Object data)

+        @Override

+		public void doIt(Object data)

         {

             Point      mousePoint = (Point)data;

             GraphPoint centre     = null;

@@ -110,8 +110,9 @@ implements EditorModeListener, MouseMotionListener, KeyListener
 

     protected Action mResizeVertex = new Action()

     {

-        public void doIt(Object data)

-        {   

+        @Override

+		public void doIt(Object data)

+        {

             Point mousePoint = (Point)data;

             int   resizeX    = 0;

             int   resizeY    = 0;

@@ -186,7 +187,8 @@ implements EditorModeListener, MouseMotionListener, KeyListener
 

     protected Action mSelectEdge = new Action()

     {

-        public void doIt(Object data)

+        @Override

+		public void doIt(Object data)

         {

             Selection selection = new Selection((DirectedEdge)data, null, 0, 0, 0, 0);

 

@@ -197,7 +199,8 @@ implements EditorModeListener, MouseMotionListener, KeyListener
 

     protected Action mSelectVertexAndStoreDisp = new Action()

     {

-        public void doIt(Object data)

+        @Override

+		public void doIt(Object data)

         {

             VertexAndDisp vertexAndDisp = (VertexAndDisp)data;

             GraphPoint    centrePoint   = vertexAndDisp.mVertex.getCentrePoint();

@@ -218,7 +221,8 @@ implements EditorModeListener, MouseMotionListener, KeyListener
 

     protected Action mStoreDisp = new Action()

     {

-        public void doIt(Object data)

+        @Override

+		public void doIt(Object data)

         {

             mDispForSelection = (DispForSelection)data;

         }

@@ -227,7 +231,8 @@ implements EditorModeListener, MouseMotionListener, KeyListener
 

     protected Action mToggleVertex = new Action()

     {

-        public void doIt(Object data)

+        @Override

+		public void doIt(Object data)

         {

             Vertex vertex = (Vertex)data;

 

@@ -245,7 +250,8 @@ implements EditorModeListener, MouseMotionListener, KeyListener
 

     protected Action mSelectAll = new Action()

     {

-        public void doIt(Object data)

+        @Override

+		public void doIt(Object data)

         {

             mGraphModelManager.getModel().selectAll();

         }

@@ -254,7 +260,8 @@ implements EditorModeListener, MouseMotionListener, KeyListener
 

     protected Action mCreateBand = new Action()

     {

-        public void doIt(Object data)

+        @Override

+		public void doIt(Object data)

         {

             Point fixedCorner = (Point)data;

 

@@ -265,7 +272,8 @@ implements EditorModeListener, MouseMotionListener, KeyListener
 

     protected Action mMoveSelection = new Action()

     {

-        public void doIt(Object data)

+        @Override

+		public void doIt(Object data)

         {

             Point mousePoint = (Point)data;

             int   topLeftX   = mousePoint.x - mDispForSelection.mXDisp;

@@ -279,7 +287,8 @@ implements EditorModeListener, MouseMotionListener, KeyListener
 

     protected Action mResizeBand = new Action()

     {

-        public void doIt(Object data)

+        @Override

+		public void doIt(Object data)

         {

             mGraphModelManager.getModel().resizeElasticBand((Point)data);

         }

@@ -288,7 +297,8 @@ implements EditorModeListener, MouseMotionListener, KeyListener
 

     protected Action mSelectContents = new Action()

     {

-        public void doIt(Object data)

+        @Override

+		public void doIt(Object data)

         {

             mGraphModelManager.getModel().selectContentsOfElasticBand();

         }

@@ -296,7 +306,8 @@ implements EditorModeListener, MouseMotionListener, KeyListener
 

     protected Action mZoomIn = new Action()

     {

-        public void doIt(Object data) // data is the clicked vertex

+        @Override

+		public void doIt(Object data) // data is the clicked vertex

         {

             // Need to get child graph model out of the vertex before we can zoom in

             if (data instanceof Vertex) {

@@ -372,7 +383,8 @@ implements EditorModeListener, MouseMotionListener, KeyListener
     }

 

 

-    public void editorModeChanged(String idOfNewMode)

+    @Override

+	public void editorModeChanged(String idOfNewMode)

     {

         if(idOfNewMode.equals("Select"))

         {

@@ -385,7 +397,8 @@ implements EditorModeListener, MouseMotionListener, KeyListener
     }

 

 

-    public void mousePressed(MouseEvent me)

+    @Override

+	public void mousePressed(MouseEvent me)

     {

         int modifiers = me.getModifiers();

 

@@ -402,7 +415,8 @@ implements EditorModeListener, MouseMotionListener, KeyListener
         }

     }

 

-    public void mouseClicked(MouseEvent me)

+    @Override

+	public void mouseClicked(MouseEvent me)

     {

         if (me.getClickCount() == 2) { // want double click

             Point clickedSpot = me.getPoint();

@@ -513,24 +527,28 @@ implements EditorModeListener, MouseMotionListener, KeyListener
     }

 

 

-    public void mouseReleased(MouseEvent me)

+    @Override

+	public void mouseReleased(MouseEvent me)

     {

         processEvent(kRelease, null);

     }

 

 

-    public void mouseMoved(MouseEvent me)

+    @Override

+	public void mouseMoved(MouseEvent me)

     {

     }

 

 

-    public void mouseDragged(MouseEvent e)

+    @Override

+	public void mouseDragged(MouseEvent e)

     {

         processEvent(kDrag, e.getPoint());

     }

 

 

-    public void keyPressed(KeyEvent e)

+    @Override

+	public void keyPressed(KeyEvent e)

     {

         if((e.getKeyCode() == KeyEvent.VK_A) && e.isControlDown())

         {

@@ -539,13 +557,15 @@ implements EditorModeListener, MouseMotionListener, KeyListener
     }

 

 

-    public void keyReleased(KeyEvent e)

+    @Override

+	public void keyReleased(KeyEvent e)

     {

     }

 

 

-    public void keyTyped(KeyEvent e)

+    @Override

+	public void keyTyped(KeyEvent e)

     {

-    }   

-    

+    }

+

 }

diff --git a/source/com/c2kernel/graph/controller/StartVertexController.java b/source/com/c2kernel/graph/controller/StartVertexController.java
index 0dc959c..3984cb7 100755..100644
--- a/source/com/c2kernel/graph/controller/StartVertexController.java
+++ b/source/com/c2kernel/graph/controller/StartVertexController.java
@@ -44,7 +44,8 @@ public class StartVertexController implements Observer, ActionListener
     }

 

 

-    public void update(Observable o, Object arg)

+    @Override

+	public void update(Observable o, Object arg)

     {

         SelectionChangedEvent event            = null;

         Vertex[]              selectedVertices = null;

@@ -67,7 +68,8 @@ public class StartVertexController implements Observer, ActionListener
     }

 

 

-    public void actionPerformed(ActionEvent ae)

+    @Override

+	public void actionPerformed(ActionEvent ae)

     {

         if(mGraphModelManager != null)

         {

diff --git a/source/com/c2kernel/graph/controller/VertexConstructionController.java b/source/com/c2kernel/graph/controller/VertexConstructionController.java
index d351b0a..1eb91f6 100755..100644
--- a/source/com/c2kernel/graph/controller/VertexConstructionController.java
+++ b/source/com/c2kernel/graph/controller/VertexConstructionController.java
@@ -28,13 +28,15 @@ public class VertexConstructionController extends MouseAdapter implements Editor
     }

 

 

-    public void editorModeChanged(String idOfNewMode)

+    @Override

+	public void editorModeChanged(String idOfNewMode)

     {

         mCreatingVertices = idOfNewMode.equals("Vertex");

     }

 

 

-    public void mouseClicked(MouseEvent me)

+    @Override

+	public void mouseClicked(MouseEvent me)

     {

         if(mCreatingVertices && (mGraphModelManager != null) && (mEditorToolBar != null) && mGraphModelManager.isEditable())

         {

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);

diff --git a/source/com/c2kernel/graph/model/DirectedEdge.java b/source/com/c2kernel/graph/model/DirectedEdge.java
index 3848373..830d70d 100755..100644
--- a/source/com/c2kernel/graph/model/DirectedEdge.java
+++ b/source/com/c2kernel/graph/model/DirectedEdge.java
@@ -51,7 +51,7 @@ public abstract class DirectedEdge implements Serializable
 

 

     public boolean containsPoint(GraphPoint p)

-    {        

+    {

         int midX = mOriginPoint.x + (mTerminusPoint.x - mOriginPoint.x)/2;

         int midY = mOriginPoint.y + (mTerminusPoint.y - mOriginPoint.y)/2;

         int minX = midX - 10;

diff --git a/source/com/c2kernel/graph/model/GraphModel.java b/source/com/c2kernel/graph/model/GraphModel.java
index e9ae02f..47f368d 100644
--- a/source/com/c2kernel/graph/model/GraphModel.java
+++ b/source/com/c2kernel/graph/model/GraphModel.java
@@ -6,7 +6,23 @@ import java.io.Serializable;
 import java.util.Hashtable;

 import java.util.Vector;

 

-import com.c2kernel.graph.event.*;

+import com.c2kernel.graph.event.ClearedEvent;

+import com.c2kernel.graph.event.EdgeRemovedEvent;

+import com.c2kernel.graph.event.EdgesChangedEvent;

+import com.c2kernel.graph.event.ElasticBandResizedEvent;

+import com.c2kernel.graph.event.ElasticBandSetEvent;

+import com.c2kernel.graph.event.ForcedNotifyEvent;

+import com.c2kernel.graph.event.GraphModelEvent;

+import com.c2kernel.graph.event.GraphModelResizedEvent;

+import com.c2kernel.graph.event.NewEdgeEndPointChangedEvent;

+import com.c2kernel.graph.event.SelectionChangedEvent;

+import com.c2kernel.graph.event.SelectionMovedEvent;

+import com.c2kernel.graph.event.StartVertexIdChangedEvent;

+import com.c2kernel.graph.event.VertexAddedEvent;

+import com.c2kernel.graph.event.VertexCreatedEvent;

+import com.c2kernel.graph.event.VertexMovedEvent;

+import com.c2kernel.graph.event.VertexRemovedEvent;

+import com.c2kernel.graph.event.VerticesChangedEvent;

 import com.c2kernel.utils.Logger;

 

 public class GraphModel implements Serializable{

@@ -153,7 +169,7 @@ public class GraphModel implements Serializable{
     public Vertex getStartVertex() {

         return resolveVertex(getStartVertexId());

     }

-    

+

     /**

      * @return Returns the mParentVertex.

      */

@@ -165,13 +181,13 @@ public class GraphModel implements Serializable{
      */

     public void setContainingVertex(GraphableVertex vertex) {

         mContainingVertex = vertex;

-    }    

+    }

 

     public void setVertices(Vertex[] vertices) {

         mVertexHashtable = new Hashtable<String, Vertex>();

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

-            mVertexHashtable.put(String.valueOf(vertices[i].getID()), vertices[i]);

-            checkSize(vertices[i]);

+        for (Vertex vertice : vertices) {

+            mVertexHashtable.put(String.valueOf(vertice.getID()), vertice);

+            checkSize(vertice);

 

         }

         setChanged();

@@ -190,8 +206,8 @@ public class GraphModel implements Serializable{
 

     public void setEdges(DirectedEdge[] edges) {

         mEdgeHashtable = new Hashtable<String, DirectedEdge>();

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

-            mEdgeHashtable.put(String.valueOf(edges[i].getID()), edges[i]);

+        for (DirectedEdge edge : edges) {

+            mEdgeHashtable.put(String.valueOf(edge.getID()), edge);

         }

         setChanged();

         notifyObservers(mEdgesChangedEvent);

@@ -229,11 +245,11 @@ public class GraphModel implements Serializable{
             return null;

         }

         else {

-            smallestVertex = (Vertex)vertexVector.elementAt(0);

+            smallestVertex = vertexVector.elementAt(0);

             sizeOfSmallestVertex = smallestVertex.getHeight() * smallestVertex.getWidth();

             // Determine the smallest vertex

             for (i = 1; i < numVerticesFound; i++) {

-                vertex = (Vertex)vertexVector.elementAt(i);

+                vertex = vertexVector.elementAt(i);

                 sizeOfVertex = vertex.getHeight() * vertex.getWidth();

                 if (sizeOfVertex < sizeOfSmallestVertex) {

                     smallestVertex = vertex;

@@ -245,7 +261,7 @@ public class GraphModel implements Serializable{
     }

 

 	public Vertex getVertexById(int id) {

-		return (Vertex)mVertexHashtable.get(String.valueOf(id));

+		return mVertexHashtable.get(String.valueOf(id));

 	}

 

     public DirectedEdge getEdge(GraphPoint p) {

@@ -302,7 +318,7 @@ public class GraphModel implements Serializable{
 	        if (mVertexOutlineCreator == null) {

 	            Logger.msg(1,"You cannot add a vertex with no outline creator");

 	            return -1;

-	        

+

 	        	}

 	        mVertexHashtable.put(String.valueOf(mNextId), v);

 	        placeVertex(v, location);

@@ -316,7 +332,7 @@ public class GraphModel implements Serializable{
         if (mVertexOutlineCreator != null) {

             mVertexOutlineCreator.setOutline(v);

         }

-        setChanged(); 

+        setChanged();

         notifyObservers(mVertexAddedEvent);

         checkSize(v);

     }

@@ -420,11 +436,11 @@ public class GraphModel implements Serializable{
     }

 

     public Vertex resolveVertex(int id) {

-        return (Vertex)mVertexHashtable.get(String.valueOf(id));

+        return mVertexHashtable.get(String.valueOf(id));

     }

 

     public DirectedEdge resolveEdge(int id) {

-        return (DirectedEdge)mEdgeHashtable.get(String.valueOf(id));

+        return mEdgeHashtable.get(String.valueOf(id));

     }

 

     public DirectedEdge[] getInEdges(Vertex v) {

@@ -641,7 +657,7 @@ public class GraphModel implements Serializable{
                 verticesInside.add(allVertices[i]);

             }

         }

-        

+

         // Select the vertices found within the elastic band polygon

         if (verticesInside.size() == 0) {

             mSelection.mTopLeftX = 0;

@@ -651,15 +667,15 @@ public class GraphModel implements Serializable{
             mSelection.mEdge = null;

             if (mContainingVertex != null)

                 verticesInside.add(mContainingVertex);

-            else 

+            else

                 mSelection.mVertices = null;

         }

-        

+

         if (verticesInside.size() > 0) {

             mSelection.mEdge = null;

             mSelection.mVertices = new Vertex[verticesInside.size()];

             for (i = 0; i < verticesInside.size(); i++) {

-                mSelection.mVertices[i] = (Vertex)verticesInside.elementAt(i);

+                mSelection.mVertices[i] = verticesInside.elementAt(i);

             }

             updateSelectionCorners();

         }

@@ -679,8 +695,8 @@ public class GraphModel implements Serializable{
         mSelection.mTopLeftY = centrePoint.y;

         mSelection.mBottomRightX = centrePoint.x;

         mSelection.mBottomRightY = centrePoint.y;

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

-            vertex = mSelection.mVertices[i];

+        for (Vertex mVertice : mSelection.mVertices) {

+            vertex = mVertice;

             centrePoint = vertex.getCentrePoint();

             if (centrePoint.x < mSelection.mTopLeftX) {

                 mSelection.mTopLeftX = centrePoint.x;

@@ -825,7 +841,7 @@ public class GraphModel implements Serializable{
     }

 

     public void setGraphModelCastorData(GraphModelCastorData data) {

-        Class vertexOutlineCreatorClass = null;

+        Class<?> vertexOutlineCreatorClass = null;

         int i = 0;

         // Create the vertex outline creator

         if (data.mClassNameOfVertexOutlineCreator.equals("")) {

diff --git a/source/com/c2kernel/graph/model/GraphModelManager.java b/source/com/c2kernel/graph/model/GraphModelManager.java
index 3146c24..68d47e0 100644
--- a/source/com/c2kernel/graph/model/GraphModelManager.java
+++ b/source/com/c2kernel/graph/model/GraphModelManager.java
@@ -23,7 +23,7 @@ public class GraphModelManager extends Observable
     private Stack<GraphModel>                       mParentModels                 = new Stack<GraphModel>();

     private ArrayList<Integer>                   mParentIds                    = new ArrayList<Integer>();

     private boolean                    mEditable                     = true;

-    

+

     // Calling this constructor does not create a vertex outline creator

     // which is required by the method addVertexAndCreateId()

     public GraphModelManager()

@@ -31,7 +31,7 @@ public class GraphModelManager extends Observable
         mGraphModel = new GraphModel();

         mGraphModel.setManager(this);

     }

-    

+

     public GraphModelManager(GraphModel newModel) {

         newModel.setManager(this);

         mGraphModel = newModel;

@@ -41,8 +41,8 @@ public class GraphModelManager extends Observable
         mParentModels.clear();

 

         //zoom back to where we were

-        for (Iterator iter = mParentIds.iterator(); iter.hasNext();) {

-            Integer parentId = (Integer) iter.next();

+        for (Iterator<Integer> iter = mParentIds.iterator(); iter.hasNext();) {

+            Integer parentId = iter.next();

             GraphableVertex childModelVertex = (GraphableVertex)newModel.getVertexById(parentId.intValue());

             if (childModelVertex == null) { // we've been deleted, stay here

                 Logger.msg(7, "Didn't find "+parentId+" in new model tree. Stopping here.");

@@ -54,17 +54,17 @@ public class GraphModelManager extends Observable
                 Logger.msg(7, "Pushing model and switching to "+parentId);

                 newModel = childModelVertex.getChildGraphModel();

             }

-        }        

+        }

         setModel(newModel);

     }

-    

+

     public void setModel(GraphModel newModel) {

         // reset transient data

         newModel.mSelection           = new Selection(null, null, 0, 0, 0, 0);

         newModel.mNewEdgeOriginVertex = null;

         newModel.mNewEdgeEndPoint     = null;

 

-        // copy factories over 

+        // copy factories over

         newModel.setExternalEdgeFactory(mEdgeFactory);

         newModel.setExternalVertexFactory(mVertexFactory);

         newModel.setVertexOutlineCreator(mVertexOutlineCreator);

@@ -72,12 +72,12 @@ public class GraphModelManager extends Observable
         newModel.setManager(this);

         mGraphModel.setManager(null);

         mGraphModel = newModel;

-        

+

         // notify

         setChanged();

         notifyObservers(mEntireModelChangedEvent);

     }

-    

+

     public void zoomIn(Vertex child) {

         GraphModel childModel = child.getChildGraphModel();

         if (childModel != null) {

@@ -87,53 +87,54 @@ public class GraphModelManager extends Observable
             Logger.msg(7, "ZoomIn - Stack size: "+mParentModels.size()+" ids:"+mParentIds.size());

         }

     }

-    

+

     public void zoomOut() {

         if (!mParentModels.empty()) {

-            setModel((GraphModel)mParentModels.pop());

+            setModel(mParentModels.pop());

             mParentIds.remove(mParentIds.size()-1);

         }

         Logger.msg(7, "ZoomOut - Stack size: "+mParentModels.size()+" ids:"+mParentIds.size());

-        

+

     }

-    

+

     public void forceNotify()

     {

         setChanged();

         notifyObservers(mForcedNotifyEvent);

     }

-    

+

     public GraphModel getModel() {

         return mGraphModel;

     }

-    

+

     public void setExternalEdgeFactory(EdgeFactory newEdgeFactory) {

         mEdgeFactory = newEdgeFactory;

         mGraphModel.setExternalEdgeFactory(newEdgeFactory);

-    }   

+    }

 

     public void setExternalVertexFactory(VertexFactory newVertexFactory) {

         mVertexFactory = newVertexFactory;

         mGraphModel.setExternalVertexFactory(newVertexFactory);

-    }   

+    }

 

     public void setVertexOutlineCreator(VertexOutlineCreator newVertexOutlineCreator) {

         mVertexOutlineCreator = newVertexOutlineCreator;

         mGraphModel.setVertexOutlineCreator(newVertexOutlineCreator);

-    }   

-    

-    protected void setChanged() {

+    }

+

+    @Override

+	protected void setChanged() {

         super.setChanged();

     }

-    

+

     protected void notifyObservers(GraphModelEvent ev) {

         super.notifyObservers(ev);

     }

-    

+

     public void setEditable(boolean editable) {

         mEditable = editable;

     }

-    

+

     public boolean isEditable() {

         return mEditable;

     }

diff --git a/source/com/c2kernel/graph/model/GraphPoint.java b/source/com/c2kernel/graph/model/GraphPoint.java
index c1c6ccc..f2aa165 100755..100644
--- a/source/com/c2kernel/graph/model/GraphPoint.java
+++ b/source/com/c2kernel/graph/model/GraphPoint.java
@@ -6,11 +6,11 @@ public class GraphPoint implements Serializable{
 

     public int x;

     public int y;

-    

+

     public GraphPoint() {

         x=0; y=0;

     }

-    

+

     public GraphPoint(int x, int y) {

         this.x = x;

         this.y = y;

diff --git a/source/com/c2kernel/graph/model/Graphable.java b/source/com/c2kernel/graph/model/Graphable.java
index 5dde105..ed55271 100755..100644
--- a/source/com/c2kernel/graph/model/Graphable.java
+++ b/source/com/c2kernel/graph/model/Graphable.java
@@ -42,10 +42,12 @@ abstract public class Graphable extends Vertex
 	{

 		this.parent = parent;

 	}

+	@Override

 	public GraphModel getChildGraphModel() {

 		return children;

 	}

 

+	@Override

 	public Object getCreationContext() {

 		return this;

 	}

diff --git a/source/com/c2kernel/graph/model/GraphableEdge.java b/source/com/c2kernel/graph/model/GraphableEdge.java
index a6d9a63..23499be 100755..100644
--- a/source/com/c2kernel/graph/model/GraphableEdge.java
+++ b/source/com/c2kernel/graph/model/GraphableEdge.java
@@ -64,7 +64,7 @@ public abstract class GraphableEdge extends DirectedEdge
     public KeyValuePair[] getKeyValuePairs() {

         return mProperties.getKeyValuePairs();

     }

-    

+

     public void setKeyValuePairs(KeyValuePair[] pairs) {

         mProperties.setKeyValuePairs(pairs);

     }

diff --git a/source/com/c2kernel/graph/model/GraphableVertex.java b/source/com/c2kernel/graph/model/GraphableVertex.java
index 6efd298..fc04743 100644
--- a/source/com/c2kernel/graph/model/GraphableVertex.java
+++ b/source/com/c2kernel/graph/model/GraphableVertex.java
@@ -4,6 +4,7 @@ package com.c2kernel.graph.model;
 * @author  $Author: abranson $

 */

 import java.awt.Point;

+

 import com.c2kernel.utils.CastorHashMap;

 import com.c2kernel.utils.KeyValuePair;

 public abstract class GraphableVertex extends Vertex

@@ -52,10 +53,12 @@ public abstract class GraphableVertex extends Vertex
 			throw new ExceptionInInitializerError();

 		this.parent = parent;

 	}

+	@Override

 	public GraphModel getChildGraphModel()

 	{

 		return mChildrenGraphModel;

 	}

+	@Override

 	public Object getCreationContext()

 	{

 		return this;

@@ -134,9 +137,9 @@ public abstract class GraphableVertex extends Vertex
 				ids = ids.substring(getPath().length() + 1);

 			else

                 return null;

-            

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

-					GraphableVertex grap = graphables[i].search(ids);

+

+            for (GraphableVertex graphable : graphables) {

+					GraphableVertex grap = graphable.search(ids);

 					if (grap != null) return grap;

 			}

         }

@@ -201,17 +204,18 @@ public abstract class GraphableVertex extends Vertex
 		DirectedEdge[] edges = mChildrenGraphModel.getEdges();

 		GraphableVertex[] graphables = this.getLayoutableChildren();

 		if (graphables != null)

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

-				graphables[i].setParent(this);

+			for (GraphableVertex graphable : graphables)

+				graphable.setParent(this);

 		if (edges != null)

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

-				 ((GraphableEdge) edges[i]).setParent(this);

+			for (DirectedEdge edge : edges)

+				((GraphableEdge) edge).setParent(this);

         childrenGraph.setContainingVertex(this);

 	}

 

 	/**

 	 * @see com.c2kernel.graph.model.Vertex#getCentrePoint()

 	 */

+	@Override

 	public GraphPoint getCentrePoint()

 	{

 		if (!getIsLayoutable())

@@ -221,6 +225,7 @@ public abstract class GraphableVertex extends Vertex
 	/**

 	 * @see com.c2kernel.graph.model.Vertex#getInEdgeIds()

 	 */

+	@Override

 	public int[] getInEdgeIds()

 	{

 		if (!getIsLayoutable())

@@ -230,6 +235,7 @@ public abstract class GraphableVertex extends Vertex
 	/**

 	 * @see com.c2kernel.graph.model.Vertex#getOutEdgeIds()

 	 */

+	@Override

 	public int[] getOutEdgeIds()

 	{

 		if (!getIsLayoutable())

@@ -239,6 +245,7 @@ public abstract class GraphableVertex extends Vertex
 	/**

 	 * @see com.c2kernel.graph.model.Vertex#getOutlinePoints()

 	 */

+	@Override

 	public GraphPoint[] getOutlinePoints()

 	{

 		if (!getIsLayoutable())

diff --git a/source/com/c2kernel/graph/model/TypeNameAndConstructionInfo.java b/source/com/c2kernel/graph/model/TypeNameAndConstructionInfo.java
index 6443064..e5b6c3d 100755..100644
--- a/source/com/c2kernel/graph/model/TypeNameAndConstructionInfo.java
+++ b/source/com/c2kernel/graph/model/TypeNameAndConstructionInfo.java
@@ -16,7 +16,8 @@ public class TypeNameAndConstructionInfo implements Serializable
     }

 

 

-    public String toString()

+    @Override

+	public String toString()

     {

         return mName;

     }

diff --git a/source/com/c2kernel/graph/model/Vertex.java b/source/com/c2kernel/graph/model/Vertex.java
index a9a5238..ccef437 100644
--- a/source/com/c2kernel/graph/model/Vertex.java
+++ b/source/com/c2kernel/graph/model/Vertex.java
@@ -198,7 +198,7 @@ public class Vertex implements Serializable
     }

 

 

-    private int[] integerVectorToIntArray(Vector vector)

+    private static int[] integerVectorToIntArray(Vector<Integer> vector)

     {

         int[]   array   = new int[vector.size()];

         Integer integer = null;

@@ -206,7 +206,7 @@ public class Vertex implements Serializable
 

         for(i=0; i<array.length; i++)

         {

-            integer  = (Integer)vector.elementAt(i);

+            integer  = vector.elementAt(i);

             array[i] = integer.intValue();

         }

 

@@ -227,7 +227,7 @@ public class Vertex implements Serializable
 

         for(i=0; i<mInEdgeIdVector.size(); i++)

         {

-            integer = (Integer)mInEdgeIdVector.elementAt(i);

+            integer = mInEdgeIdVector.elementAt(i);

 

             if(integer.intValue() == id)

             {

@@ -251,7 +251,7 @@ public class Vertex implements Serializable
 

         for(i=0; i<mOutEdgeIdVector.size(); i++)

         {

-            integer = (Integer)mOutEdgeIdVector.elementAt(i);

+            integer = mOutEdgeIdVector.elementAt(i);

 

             if(integer.intValue() == id)

             {

@@ -272,22 +272,22 @@ public class Vertex implements Serializable
     {

         return mTags.contains(o);

     }

-    

+

     public void clearTag(Object o)

     {

         mTags.remove(o);

     }

 

-    

+

     public GraphModel getChildGraphModel() {

         return null;

     }

-    

+

     public Object getCreationContext() {

         return null;

     }

-    

-    

+

+

 	public GraphModel getGraphModel()

 	{

 		return graphModel;

@@ -297,7 +297,7 @@ public class Vertex implements Serializable
 	{

 		this.graphModel = graphModel;

 	}

-    

+

     public boolean isJoin() {

         return false;

     }

diff --git a/source/com/c2kernel/graph/model/VertexFactory.java b/source/com/c2kernel/graph/model/VertexFactory.java
index f47d9a6..550367e 100755..100644
--- a/source/com/c2kernel/graph/model/VertexFactory.java
+++ b/source/com/c2kernel/graph/model/VertexFactory.java
@@ -11,6 +11,6 @@ public interface VertexFactory
         Point                       location,

         TypeNameAndConstructionInfo typeNameAndConstructionInfo

     );

-    

+

     public void setCreationContext(Object newContext);

 }

diff --git a/source/com/c2kernel/graph/traversal/GraphTraversal.java b/source/com/c2kernel/graph/traversal/GraphTraversal.java
index b50030d..0d9c819 100644
--- a/source/com/c2kernel/graph/traversal/GraphTraversal.java
+++ b/source/com/c2kernel/graph/traversal/GraphTraversal.java
@@ -55,8 +55,8 @@ public class GraphTraversal
                     ((vertex.isJoin() && direction == kUp) ||

                     (vertex.isLoop() && direction == kDown))) {

                     Vertex[] following = getTraversal(graphModel, children[i], direction, false);

-                    for (int j = 0; j < following.length; j++) {

-                        if (following[j] == vertex) {

+                    for (Vertex element : following) {

+                        if (element == vertex) {

                             skipBackLink = true;

                             break;

                         }

@@ -69,7 +69,7 @@ public class GraphTraversal
     }

 

 

-    private static Vertex[] vectorToVertexArray(Vector vector)

+    private static Vertex[] vectorToVertexArray(Vector<Vertex> vector)

     {

         Vertex[] vertices = new Vertex[vector.size()];

         int      i        = 0;

@@ -77,7 +77,7 @@ public class GraphTraversal
 

         for(i=0; i<vertices.length; i++)

         {

-            vertices[i] = (Vertex)vector.elementAt(i);

+            vertices[i] = vector.elementAt(i);

         }

 

         return vertices;

diff --git a/source/com/c2kernel/graph/view/DefaultDirectedEdgeRenderer.java b/source/com/c2kernel/graph/view/DefaultDirectedEdgeRenderer.java
index b8c4081..2882141 100755..100644
--- a/source/com/c2kernel/graph/view/DefaultDirectedEdgeRenderer.java
+++ b/source/com/c2kernel/graph/view/DefaultDirectedEdgeRenderer.java
@@ -26,7 +26,8 @@ public class DefaultDirectedEdgeRenderer implements DirectedEdgeRenderer
     }

 

 

-    public void draw(Graphics2D g2d, DirectedEdge directedEdge)

+    @Override

+	public void draw(Graphics2D g2d, DirectedEdge directedEdge)

     {

         GraphPoint      originPoint   = directedEdge.getOriginPoint();

         GraphPoint      terminusPoint = directedEdge.getTerminusPoint();

@@ -49,10 +50,9 @@ public class DefaultDirectedEdgeRenderer implements DirectedEdgeRenderer
     }

 

 

-    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;

-        double theta  = 0;

 

         if((width == 0) && (height > 0))  return Math.PI;

 

diff --git a/source/com/c2kernel/graph/view/DefaultVertexRenderer.java b/source/com/c2kernel/graph/view/DefaultVertexRenderer.java
index 6f57185..e9b92d0 100755..100644
--- a/source/com/c2kernel/graph/view/DefaultVertexRenderer.java
+++ b/source/com/c2kernel/graph/view/DefaultVertexRenderer.java
@@ -24,7 +24,8 @@ public class DefaultVertexRenderer implements VertexRenderer
     }

 

 

-    public void draw(Graphics2D g2d, Vertex vertex)

+    @Override

+	public void draw(Graphics2D g2d, Vertex vertex)

     {

         GraphPoint[]    outlinePoints = vertex.getOutlinePoints();

         GraphPoint      centrePoint   = vertex.getCentrePoint();

diff --git a/source/com/c2kernel/graph/view/EditorPanel.java b/source/com/c2kernel/graph/view/EditorPanel.java
index 78fb5c9..fb25b68 100755..100644
--- a/source/com/c2kernel/graph/view/EditorPanel.java
+++ b/source/com/c2kernel/graph/view/EditorPanel.java
@@ -10,7 +10,11 @@ import com.c2kernel.graph.controller.AutoScrollController;
 import com.c2kernel.graph.controller.EdgeConstructionController;

 import com.c2kernel.graph.controller.MultiSelectionDragController;

 import com.c2kernel.graph.controller.VertexConstructionController;

-import com.c2kernel.graph.model.*;

+import com.c2kernel.graph.model.EdgeFactory;

+import com.c2kernel.graph.model.GraphModelManager;

+import com.c2kernel.graph.model.TypeNameAndConstructionInfo;

+import com.c2kernel.graph.model.VertexFactory;

+import com.c2kernel.graph.model.VertexOutlineCreator;

 public class EditorPanel extends JPanel

 {

 	// Graph Model

diff --git a/source/com/c2kernel/graph/view/EditorToolBar.java b/source/com/c2kernel/graph/view/EditorToolBar.java
index e01056f..cc7ab41 100644
--- a/source/com/c2kernel/graph/view/EditorToolBar.java
+++ b/source/com/c2kernel/graph/view/EditorToolBar.java
@@ -50,6 +50,7 @@ public class EditorToolBar extends Box implements Printable
 		{

 			mModeId = modeId;

 		}

+		@Override

 		public void actionPerformed(ActionEvent ae)

 		{

 			notifyListeners(mModeId);

@@ -185,6 +186,7 @@ public class EditorToolBar extends Box implements Printable
 		// user select a vertex type from the vertex type box

 		mVertexTypeBox.addActionListener(new ActionListener()

 		{

+			@Override

 			public void actionPerformed(ActionEvent ae)

 			{

 				mVertexModeButton.setSelected(true);

@@ -195,6 +197,7 @@ public class EditorToolBar extends Box implements Printable
 		// user select an edge type from the edge type box

 		mEdgeTypeBox.addActionListener(new ActionListener()

 		{

+			@Override

 			public void actionPerformed(ActionEvent ae)

 			{

 				mEdgeModeButton.setSelected(true);

@@ -203,6 +206,7 @@ public class EditorToolBar extends Box implements Printable
 		});

 		mPrintButton.addActionListener(new ActionListener()

 		{

+			@Override

 			public void actionPerformed(ActionEvent ae)

 			{

 				PrinterJob _monJob = PrinterJob.getPrinterJob();

@@ -222,10 +226,11 @@ public class EditorToolBar extends Box implements Printable
             Class.forName("java.awt.datatransfer.DataFlavor").getDeclaredField("imageFlavor");

     		mCopyButton.addActionListener(new ActionListener()

     		{

-    			public void actionPerformed(ActionEvent ae)

+    			@Override

+				public void actionPerformed(ActionEvent ae)

     			{

     				try

-    				{      

+    				{

                         Image i = createImage(mGraphPanel.getWidth(),mGraphPanel.getHeight());

                         Graphics g = i.getGraphics();

                         mGraphPanel.paintComponent(g);

@@ -242,7 +247,7 @@ public class EditorToolBar extends Box implements Printable
             mCopyButton.setEnabled(false);

         }

 	}

-    

+

     protected class ImageTransferable implements Transferable, ClipboardOwner {

         Image image;

         int width,height;

@@ -255,19 +260,22 @@ public class EditorToolBar extends Box implements Printable
                 javaImg = new DataFlavor("image/x-java-image; class=java.awt.Image", "AWT Image");

             } catch (Exception ex){ }

         }

-        public Object getTransferData(DataFlavor flavor) throws UnsupportedFlavorException {

+        @Override

+		public Object getTransferData(DataFlavor flavor) throws UnsupportedFlavorException {

             if (!isDataFlavorSupported(flavor) || image == null) {

                 throw new UnsupportedFlavorException(flavor);

             }

             return image;

         }

 

-        public boolean isDataFlavorSupported(DataFlavor flavor) {

+        @Override

+		public boolean isDataFlavorSupported(DataFlavor flavor) {

             boolean result = in(flavor, getTransferDataFlavors());

             return result;

         }

-        

-        public DataFlavor[] getTransferDataFlavors() {

+

+        @Override

+		public DataFlavor[] getTransferDataFlavors() {

             return new DataFlavor[] { javaImg };

         }

         protected boolean in(DataFlavor flavor, DataFlavor[] flavors) {

@@ -277,18 +285,19 @@ public class EditorToolBar extends Box implements Printable
             }

             return f < flavors.length;

         }

-        public void lostOwnership(Clipboard clipboard, Transferable contents) {

+        @Override

+		public void lostOwnership(Clipboard clipboard, Transferable contents) {

             image = null;

         }

     }

-    

+

 	protected void notifyListeners(String newModeId)

 	{

 		int i = 0;

 		EditorModeListener listener = null;

 		for (i = 0; i < mListenerVector.size(); i++)

 		{

-			listener = (EditorModeListener) mListenerVector.elementAt(i);

+			listener = mListenerVector.elementAt(i);

 			listener.editorModeChanged(newModeId);

 		}

 	}

@@ -318,6 +327,7 @@ public class EditorToolBar extends Box implements Printable
 	{

 		return this;

 	}

+	@Override

 	public int print(Graphics g, PageFormat pf, int i) throws PrinterException

 	{

 		if (i >= 1)

diff --git a/source/com/c2kernel/graph/view/GraphPanel.java b/source/com/c2kernel/graph/view/GraphPanel.java
index 9db481e..5edd070 100755..100644
--- a/source/com/c2kernel/graph/view/GraphPanel.java
+++ b/source/com/c2kernel/graph/view/GraphPanel.java
@@ -41,6 +41,7 @@ public class GraphPanel extends JPanel implements Observer
 		// is pressed on the graph panel

 		addMouseListener(new MouseAdapter()

 		{

+			@Override

 			public void mousePressed(MouseEvent me)

 			{

 				requestFocus();

@@ -51,6 +52,7 @@ public class GraphPanel extends JPanel implements Observer
 	{

 		mGraphModelManager = graphModelManager;

 	}

+	@Override

 	public void update(Observable o, Object arg)

 	{

 		if (arg instanceof GraphModelResizedEvent || arg instanceof EntireModelChangedEvent)

@@ -60,6 +62,7 @@ public class GraphPanel extends JPanel implements Observer
 		}

 		repaint();

 	}

+	@Override

 	public void paintComponent(Graphics g)

 	{

         Graphics2D g2d = (Graphics2D) g;

@@ -111,7 +114,7 @@ public class GraphPanel extends JPanel implements Observer
                         drawVertexHighlight(g2d, selection.mVertices[i], 5);

 				}

 				// Draw the resize pads if there is one and only one vertex selected

-				if (selection.mVertices.length == 1 && 

+				if (selection.mVertices.length == 1 &&

                         selection.mVertices[0] != mGraphModelManager.getModel().getContainingVertex())

 				{

 					vertexCentre = selection.mVertices[0].getCentrePoint();

@@ -189,7 +192,7 @@ public class GraphPanel extends JPanel implements Observer
 			outlinePoints[0].y);

 	}

 	// Draws the specifed line the specified distance away from the specified centre point

-	private void drawShiftedLine(int dist, Graphics2D g2d, GraphPoint centrePoint, int x1, int y1, int x2, int y2)

+	private static void drawShiftedLine(int dist, Graphics2D g2d, GraphPoint centrePoint, int x1, int y1, int x2, int y2)

 	{

 		if (x1 > centrePoint.x)

 			x1 += dist;

@@ -225,6 +228,7 @@ public class GraphPanel extends JPanel implements Observer
 		g2d.drawLine(maxX, maxY, minX, maxY);

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

 	}

+	@Override

 	public void printComponent(Graphics g)

 	{

         super.paintComponent(g);

@@ -232,12 +236,6 @@ public class GraphPanel extends JPanel implements Observer
 		DirectedEdge[] edges = null;

 		Vertex[] vertices = null;

 		Vertex startVertex = null;

-		Selection selection = null;

-		ElasticBand elasticBand = null;

-		Vertex newEdgeOriginVertex = null;

-		GraphPoint newEdgeOriginPoint = null;

-		Point newEdgeEndPoint = null;

-		GraphPoint vertexCentre = null;

 		int i = 0;

 		g.setColor(Color.white);

 		g2d.fillRect(0,0,getWidth(),getHeight());

@@ -266,7 +264,7 @@ public class GraphPanel extends JPanel implements Observer
 			}

 		}

 	}

-    

+

     protected void superPaint(Graphics g)

     {

         super.paintComponent(g);

diff --git a/source/com/c2kernel/graph/view/PropertyTable.java b/source/com/c2kernel/graph/view/PropertyTable.java
index e067e68..c1257aa 100755..100644
--- a/source/com/c2kernel/graph/view/PropertyTable.java
+++ b/source/com/c2kernel/graph/view/PropertyTable.java
@@ -13,26 +13,28 @@ public class PropertyTable extends JTable
     }

 

 

-    public TableCellRenderer getCellRenderer(int row, int column) {

+    @Override

+	public TableCellRenderer getCellRenderer(int row, int column) {

+

 

-        

         return getDefaultRenderer(getCellClass(row, column));

 

    }

 

-   public TableCellEditor getCellEditor(int row, int column) {

-       

+   @Override

+public TableCellEditor getCellEditor(int row, int column) {

+

         return getDefaultEditor(getCellClass(row, column));

 

    }

-   

-   private Class getCellClass(int row, int column) {

-       Class cellClass = String.class;

-        

+

+   private Class<?> getCellClass(int row, int column) {

+       Class<?> cellClass = String.class;

+

        try {

            cellClass = dataModel.getValueAt(row, column).getClass();

        } catch (NullPointerException ex) { }

-       

+

        return cellClass;

    }

 }

diff --git a/source/com/c2kernel/graph/view/PropertyTableModel.java b/source/com/c2kernel/graph/view/PropertyTableModel.java
index 22ba4f3..b1e69b1 100644
--- a/source/com/c2kernel/graph/view/PropertyTableModel.java
+++ b/source/com/c2kernel/graph/view/PropertyTableModel.java
@@ -1,6 +1,9 @@
 package com.c2kernel.graph.view;

 

-import java.util.*;

+import java.util.ArrayList;

+import java.util.Collections;

+import java.util.Comparator;

+import java.util.HashMap;

 

 import javax.swing.JOptionPane;

 import javax.swing.event.TableModelEvent;

@@ -23,26 +26,30 @@ public class PropertyTableModel extends AbstractTableModel {
     HashMap<String, Object> sourceMap = new HashMap<String, Object>();

     ArrayList<String> sortedNameList = new ArrayList<String>();

     boolean isEditable = false;

-    

+

     public PropertyTableModel() {

         super();

     }

 

-    public int getColumnCount()

+    @Override

+	public int getColumnCount()

     {

         return mColumnNames.length;

     }

-    public String getColumnName(int col)

+    @Override

+	public String getColumnName(int col)

     {

         return mColumnNames[col];

     }

-    public int getRowCount()

+    @Override

+	public int getRowCount()

     {

         synchronized (sourceMap) {

             return sourceMap.size();

         }

     }

-    public Object getValueAt(int rowIndex, int colIndex)    

+    @Override

+	public Object getValueAt(int rowIndex, int colIndex)

     {

         synchronized (sourceMap) {

             String rowName = sortedNameList.get(rowIndex);

@@ -52,18 +59,19 @@ public class PropertyTableModel extends AbstractTableModel {
                 return sourceMap.get(rowName);

         }

     }

-    

-    public void setValueAt(Object value, int rowIndex, int colIndex)

+

+    @Override

+	public void setValueAt(Object value, int rowIndex, int colIndex)

     {

         synchronized (sourceMap) {

             if (colIndex == 0) return;

             String rowName = sortedNameList.get(rowIndex);

-            Class oldElement = sourceMap.get(rowName).getClass();

+            Class<? extends Object> oldElement = sourceMap.get(rowName).getClass();

             if (oldElement == Float.class && value.getClass() == String.class)

         		try {

         			value = Float.valueOf((String)value);

         		} catch (Exception ex) { }

-            if (value.getClass() != oldElement)            		

+            if (value.getClass() != oldElement)

             	JOptionPane.showMessageDialog(null, "This property should contain a "+oldElement.getName()+" not a "+value.getClass().getName(), "Incorrect datatype", JOptionPane.ERROR_MESSAGE);

             else {

             	sourceMap.put(rowName, value);

@@ -71,24 +79,26 @@ public class PropertyTableModel extends AbstractTableModel {
             }

         }

     }

-    

+

     public void setMap(HashMap<String, Object> props) {

         synchronized (sourceMap) {

             sourceMap = props;

             sortedNameList = new ArrayList<String>(props.size());

-            for (Iterator<String> keys = props.keySet().iterator(); keys.hasNext();)

-                sortedNameList.add(keys.next());

-    

+            for (String string : props.keySet())

+				sortedNameList.add(string);

+

             Collections.sort(sortedNameList, new Comparator<String>() {

-                public int compare(String o1, String o2) {

+                @Override

+				public int compare(String o1, String o2) {

                     return (o1.compareToIgnoreCase(o2));

                 }

             });

         }

         fireTableChanged(new TableModelEvent(this));

     }

-    

-    public boolean isCellEditable(int row, int col)

+

+    @Override

+	public boolean isCellEditable(int row, int col)

     {

         return col==1 && isEditable;

     }

@@ -112,7 +122,7 @@ public class PropertyTableModel extends AbstractTableModel {
      */

     public void addProperty(String text, Object object) {

         sourceMap.put(text,object);

-        setMap(sourceMap);   

+        setMap(sourceMap);

     }

 

     /**

diff --git a/source/com/c2kernel/graph/view/SelectedVertexPanel.java b/source/com/c2kernel/graph/view/SelectedVertexPanel.java
index 18658dd..966f527 100755..100644
--- a/source/com/c2kernel/graph/view/SelectedVertexPanel.java
+++ b/source/com/c2kernel/graph/view/SelectedVertexPanel.java
@@ -16,12 +16,12 @@ import com.c2kernel.graph.model.Vertex;
 

 

 public abstract class SelectedVertexPanel extends JPanel {

-    

+

 	public SelectedVertexPanel() {

 		super();

 	}

 

 	public abstract void select(Vertex vert);

-	

+

 	public abstract void clear();

 }

diff --git a/source/com/c2kernel/graph/view/VertexPropertyPanel.java b/source/com/c2kernel/graph/view/VertexPropertyPanel.java
index dd5fbd2..2cc03c2 100644
--- a/source/com/c2kernel/graph/view/VertexPropertyPanel.java
+++ b/source/com/c2kernel/graph/view/VertexPropertyPanel.java
@@ -10,13 +10,24 @@ import java.util.HashMap;
 import java.util.Observable;

 import java.util.Observer;

 

-import javax.swing.*;

+import javax.swing.Box;

+import javax.swing.JButton;

+import javax.swing.JComboBox;

+import javax.swing.JLabel;

+import javax.swing.JOptionPane;

+import javax.swing.JPanel;

+import javax.swing.JScrollPane;

+import javax.swing.JTextField;

 import javax.swing.event.TableModelEvent;

 import javax.swing.event.TableModelListener;

 

 import com.c2kernel.graph.event.EntireModelChangedEvent;

 import com.c2kernel.graph.event.SelectionChangedEvent;

-import com.c2kernel.graph.model.*;

+import com.c2kernel.graph.model.DirectedEdge;

+import com.c2kernel.graph.model.GraphModelManager;

+import com.c2kernel.graph.model.GraphableEdge;

+import com.c2kernel.graph.model.GraphableVertex;

+import com.c2kernel.graph.model.Vertex;

 import com.c2kernel.gui.tabs.EntityTabPane;

 import com.c2kernel.utils.Language;

 import com.c2kernel.utils.Logger;

@@ -47,7 +58,7 @@ public class VertexPropertyPanel extends JPanel implements Observer, TableModelL
     String[] typeOptions = { "String", "Boolean", "Integer", "Float" };

     String[] typeInitVal = { "", "false", "0", "0.0"};

     SelectedVertexPanel mSelPanel;

-    

+

     public VertexPropertyPanel() {

         super();

         setLayout(gridbag);

@@ -60,7 +71,8 @@ public class VertexPropertyPanel extends JPanel implements Observer, TableModelL
     *

     */

 

-    public void update(Observable o, Object arg) {

+    @Override

+	public void update(Observable o, Object arg) {

         Vertex[] selectedVertices = null;

         DirectedEdge selectedEdge = null;

         // If the selection has changed

@@ -87,14 +99,15 @@ public class VertexPropertyPanel extends JPanel implements Observer, TableModelL
             clear();

         }

     }

-    

 

-    public void tableChanged(TableModelEvent e) {

+

+    @Override

+	public void tableChanged(TableModelEvent e) {

         if (mGraphModelManager!=null)

             mGraphModelManager.forceNotify();

 

     }

-    

+

     public void setVertex(Vertex vert) {

         if (vert.getName().equals("domain"))

             selObjName.setText("Domain Workflow");

@@ -109,7 +122,7 @@ public class VertexPropertyPanel extends JPanel implements Observer, TableModelL
             delPropButton.setEnabled(isEditable);

         }

     }

-    

+

     public void setEdge(DirectedEdge edge) {

         selObjName.setText(edge.getName());

         String className = edge.getClass().getName();

@@ -121,7 +134,7 @@ public class VertexPropertyPanel extends JPanel implements Observer, TableModelL
         }

         if (mSelPanel != null) mSelPanel.clear();

     }

-    

+

     public void clear() {

         selObjName.setText("");

         selObjClass.setText("Nothing Selected");

@@ -130,7 +143,7 @@ public class VertexPropertyPanel extends JPanel implements Observer, TableModelL
         addPropButton.setEnabled(false);

         delPropButton.setEnabled(false);

     }

-    

+

     /**

      * @param isEditable The isEditable to set.

      */

@@ -139,12 +152,12 @@ public class VertexPropertyPanel extends JPanel implements Observer, TableModelL
         isEditable = editable;

         newPropBox.setVisible(editable);

     }

-    

+

     public void setGraphModelManager(GraphModelManager manager) {

         mGraphModelManager = manager;

         manager.addObserver(this);

     }

-    

+

     public void createLayout(SelectedVertexPanel selPanel)

     {

         GridBagConstraints c = new GridBagConstraints();

@@ -155,30 +168,30 @@ public class VertexPropertyPanel extends JPanel implements Observer, TableModelL
         c.anchor = GridBagConstraints.NORTHWEST;

         c.ipadx = 5;

         c.ipady = 5;

-        

+

         selObjName = new JLabel();

         selObjName.setFont(EntityTabPane.titleFont);

         gridbag.setConstraints(selObjName, c);

-        add(selObjName); 

-        

+        add(selObjName);

+

         c.gridy++;

         selObjClass = new JLabel();

         gridbag.setConstraints(selObjClass, c);

         add(selObjClass);

-        

+

         c.gridy++;

         JLabel title = new JLabel("Properties");

         title.setFont(EntityTabPane.titleFont);

         gridbag.setConstraints(title, c);

-        add(title);       

-        

+        add(title);

+

         c.gridy++;

         c.fill = GridBagConstraints.BOTH;

         c.weighty = 2;

         JScrollPane scroll = new JScrollPane(mPropertyTable);

         gridbag.setConstraints(scroll, c);

         add(scroll);

-        

+

         newPropBox = Box.createHorizontalBox();

         newPropBox.add(new JLabel(Language.translate("New :")));

         newPropBox.add(Box.createHorizontalGlue());

@@ -195,13 +208,13 @@ public class VertexPropertyPanel extends JPanel implements Observer, TableModelL
         delPropButton.addActionListener(this);

         newPropBox.add(addPropButton);

         newPropBox.add(delPropButton);

-        

+

         c.gridy++;

         c.weighty=0;

         c.fill= GridBagConstraints.HORIZONTAL;

         gridbag.setConstraints(newPropBox, c);

         add(newPropBox);

-        

+

         if (selPanel != null) {

             c.gridy++;

             mSelPanel = selPanel;

@@ -209,8 +222,9 @@ public class VertexPropertyPanel extends JPanel implements Observer, TableModelL
             add(mSelPanel);

         }

     }

-    

-    public void actionPerformed(ActionEvent e) {

+

+    @Override

+	public void actionPerformed(ActionEvent e) {

         if (e.getSource() == addPropButton) {

             if (newPropName.getText().length() < 1) {

                 JOptionPane.showMessageDialog(this, "Enter a name for the new property", "Cannot add property", JOptionPane.ERROR_MESSAGE);

@@ -225,8 +239,8 @@ public class VertexPropertyPanel extends JPanel implements Observer, TableModelL
 

             try {

                 Class<?> newPropClass = Class.forName("java.lang."+typeOptions[newPropType.getSelectedIndex()]);

-                Class[] params = {String.class};

-                Constructor init = newPropClass.getConstructor(params);

+                Class<?>[] params = {String.class};

+                Constructor<?> init = newPropClass.getConstructor(params);

                 Object[] initParams = { typeInitVal[newPropType.getSelectedIndex()] };

                 mPropertyModel.addProperty(newPropName.getText(), init.newInstance(initParams));

             } catch (Exception ex) {