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, 21 insertions, 12 deletions

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)

     {

     }

 }