More GUI refactoring

2 files changed, 18 insertions, 18 deletions

diff --git a/src/main/java/com/c2kernel/graph/model/GraphModel.java b/src/main/java/com/c2kernel/graph/model/GraphModel.java
index 47f368d..6f5ced5 100644
--- a/src/main/java/com/c2kernel/graph/model/GraphModel.java
+++ b/src/main/java/com/c2kernel/graph/model/GraphModel.java
@@ -56,22 +56,22 @@ public class GraphModel implements Serializable{
 

     /* Notification Events */

 

-    private ClearedEvent mClearedEvent = new ClearedEvent();

-    private EdgeRemovedEvent mEdgeRemovedEvent = new EdgeRemovedEvent();

-    private EdgesChangedEvent mEdgesChangedEvent = new EdgesChangedEvent();

-    private ForcedNotifyEvent mForcedNotifyEvent = new ForcedNotifyEvent();

-    private NewEdgeEndPointChangedEvent mNewEdgeEndPointChangedEvent = new NewEdgeEndPointChangedEvent();

-    private SelectionChangedEvent mSelectionChangedEvent = new SelectionChangedEvent();

-    private StartVertexIdChangedEvent mStartVertexIdChangedEvent = new StartVertexIdChangedEvent();

-    private VertexAddedEvent mVertexAddedEvent = new VertexAddedEvent();

-    private VertexCreatedEvent mVertexCreatedEvent = new VertexCreatedEvent();

-    private VertexMovedEvent mVertexMovedEvent = new VertexMovedEvent();

-    private SelectionMovedEvent mSelectionMovedEvent = new SelectionMovedEvent();

-    private VertexRemovedEvent mVertexRemovedEvent = new VertexRemovedEvent();

-    private VerticesChangedEvent mVerticesChangedEvent = new VerticesChangedEvent();

-    private ElasticBandSetEvent mElasticBandSetEvent = new ElasticBandSetEvent();

-    private ElasticBandResizedEvent mElasticBandResizedEvent = new ElasticBandResizedEvent();

-    private GraphModelResizedEvent mGraphModelResizedEvent = new GraphModelResizedEvent();

+    private final ClearedEvent mClearedEvent = new ClearedEvent();

+    private final EdgeRemovedEvent mEdgeRemovedEvent = new EdgeRemovedEvent();

+    private final EdgesChangedEvent mEdgesChangedEvent = new EdgesChangedEvent();

+    private final ForcedNotifyEvent mForcedNotifyEvent = new ForcedNotifyEvent();

+    private final NewEdgeEndPointChangedEvent mNewEdgeEndPointChangedEvent = new NewEdgeEndPointChangedEvent();

+    private final SelectionChangedEvent mSelectionChangedEvent = new SelectionChangedEvent();

+    private final StartVertexIdChangedEvent mStartVertexIdChangedEvent = new StartVertexIdChangedEvent();

+    private final VertexAddedEvent mVertexAddedEvent = new VertexAddedEvent();

+    private final VertexCreatedEvent mVertexCreatedEvent = new VertexCreatedEvent();

+    private final VertexMovedEvent mVertexMovedEvent = new VertexMovedEvent();

+    private final SelectionMovedEvent mSelectionMovedEvent = new SelectionMovedEvent();

+    private final VertexRemovedEvent mVertexRemovedEvent = new VertexRemovedEvent();

+    private final VerticesChangedEvent mVerticesChangedEvent = new VerticesChangedEvent();

+    private final ElasticBandSetEvent mElasticBandSetEvent = new ElasticBandSetEvent();

+    private final ElasticBandResizedEvent mElasticBandResizedEvent = new ElasticBandResizedEvent();

+    private final GraphModelResizedEvent mGraphModelResizedEvent = new GraphModelResizedEvent();

 

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

     // which is required by the method addVertexAndCreateId()

@@ -604,7 +604,7 @@ public class GraphModel implements Serializable{
         mExternalVertexFactory = factory;

     }

 

-    public void createVertex(Point location, TypeNameAndConstructionInfo typeNameAndConstructionInfo) {

+    public void createVertex(Point location, TypeNameAndConstructionInfo typeNameAndConstructionInfo) throws Exception {

         if (mExternalVertexFactory != null) {

             mExternalVertexFactory.create(mManager, location, typeNameAndConstructionInfo);

             setChanged();

diff --git a/src/main/java/com/c2kernel/graph/model/VertexFactory.java b/src/main/java/com/c2kernel/graph/model/VertexFactory.java
index 550367e..02681bd 100644
--- a/src/main/java/com/c2kernel/graph/model/VertexFactory.java
+++ b/src/main/java/com/c2kernel/graph/model/VertexFactory.java
@@ -10,7 +10,7 @@ public interface VertexFactory
         GraphModelManager           graphModelManager,

         Point                       location,

         TypeNameAndConstructionInfo typeNameAndConstructionInfo

-    );

+    ) throws Exception;

 

     public void setCreationContext(Object newContext);

 }