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, 24 insertions, 23 deletions

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;

     }