From 11eb9557a35e17450c0aefb758471f1ff3148336 Mon Sep 17 00:00:00 2001
From: Andrew Branson <andrew.branson@cern.ch>
Date: Fri, 29 Jun 2012 16:20:11 +0200
Subject: Pull remaining graph GUI components into cristal-gui

---
 .../com/c2kernel/graph/model/GraphModelManager.java   | 19 ++++++-------------
 1 file changed, 6 insertions(+), 13 deletions(-)

(limited to 'src/main/java/com/c2kernel/graph/model/GraphModelManager.java')

diff --git a/src/main/java/com/c2kernel/graph/model/GraphModelManager.java b/src/main/java/com/c2kernel/graph/model/GraphModelManager.java
index 68d47e0..f639d07 100644
--- a/src/main/java/com/c2kernel/graph/model/GraphModelManager.java
+++ b/src/main/java/com/c2kernel/graph/model/GraphModelManager.java
@@ -18,10 +18,10 @@ public class GraphModelManager extends Observable
     private EdgeFactory mEdgeFactory;
     private VertexFactory mVertexFactory;
     private VertexOutlineCreator mVertexOutlineCreator;
-    private EntireModelChangedEvent     mEntireModelChangedEvent     = new EntireModelChangedEvent();
-    private ForcedNotifyEvent           mForcedNotifyEvent           = new ForcedNotifyEvent();
-    private Stack<GraphModel>                       mParentModels                 = new Stack<GraphModel>();
-    private ArrayList<Integer>                   mParentIds                    = new ArrayList<Integer>();
+    private final EntireModelChangedEvent     mEntireModelChangedEvent     = new EntireModelChangedEvent();
+    private final ForcedNotifyEvent           mForcedNotifyEvent           = new ForcedNotifyEvent();
+    private final Stack<GraphModel>                       mParentModels                 = new Stack<GraphModel>();
+    private final ArrayList<Integer>                   mParentIds                    = new ArrayList<Integer>();
     private boolean                    mEditable                     = true;
 
     // Calling this constructor does not create a vertex outline creator
@@ -60,7 +60,6 @@ public class GraphModelManager extends Observable
 
     public void setModel(GraphModel newModel) {
         // reset transient data
-        newModel.mSelection           = new Selection(null, null, 0, 0, 0, 0);
         newModel.mNewEdgeOriginVertex = null;
         newModel.mNewEdgeEndPoint     = null;
 
@@ -74,7 +73,6 @@ public class GraphModelManager extends Observable
         mGraphModel = newModel;
 
         // notify
-        setChanged();
         notifyObservers(mEntireModelChangedEvent);
     }
 
@@ -99,7 +97,6 @@ public class GraphModelManager extends Observable
 
     public void forceNotify()
     {
-        setChanged();
         notifyObservers(mForcedNotifyEvent);
     }
 
@@ -122,12 +119,8 @@ public class GraphModelManager extends Observable
         mGraphModel.setVertexOutlineCreator(newVertexOutlineCreator);
     }
 
-    @Override
-	protected void setChanged() {
-        super.setChanged();
-    }
-
-    protected void notifyObservers(GraphModelEvent ev) {
+    public void notifyObservers(GraphModelEvent ev) {
+    	setChanged();
         super.notifyObservers(ev);
     }
 
-- 
cgit v1.2.3