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, 46 insertions, 26 deletions

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)

     {

-    }   

-    

+    }

+

 }