Take getVertex(point) and getEdge(point) from GraphModel

2 files changed, 15 insertions, 8 deletions

diff --git a/src/main/java/com/c2kernel/gui/graph/controller/EdgeConstructionController.java b/src/main/java/com/c2kernel/gui/graph/controller/EdgeConstructionController.java
index b200991..87742f8 100644
--- a/src/main/java/com/c2kernel/gui/graph/controller/EdgeConstructionController.java
+++ b/src/main/java/com/c2kernel/gui/graph/controller/EdgeConstructionController.java
@@ -9,11 +9,13 @@ import com.c2kernel.graph.model.GraphPoint;
 import com.c2kernel.graph.model.Vertex;

 import com.c2kernel.gui.graph.view.EditorModeListener;

 import com.c2kernel.gui.graph.view.EditorToolBar;

+import com.c2kernel.gui.graph.view.GraphPanel;

 

 

 public class EdgeConstructionController extends MouseAdapter implements EditorModeListener

 {

     private GraphModelManager mGraphModelManager = null;

+    private GraphPanel 		  mGraphPanel		 = null;

     private EditorToolBar     mEditorToolBar     = null;

 

 

@@ -165,6 +167,11 @@ public class EdgeConstructionController extends MouseAdapter implements EditorMo
     {

         mGraphModelManager = graphModelManager;

     }

+    

+    public void setGraphPanel(GraphPanel graphPanel)

+    {

+        mGraphPanel = graphPanel;

+    }

 

 

     public void setEditorToolBar(EditorToolBar editorToolBar)

@@ -194,11 +201,11 @@ public class EdgeConstructionController extends MouseAdapter implements EditorMo
         Vertex vertex     = null;

         Point  mousePoint = null;

 

-        if(mGraphModelManager != null)

+        if(mGraphModelManager != null && mGraphPanel != null)

         {

             // Determine if there is a vertex under the mouse cursor

             mousePoint = me.getPoint();

-            vertex     = mGraphModelManager.getModel().getVertex(new GraphPoint(mousePoint.x, mousePoint.y));

+            vertex     = mGraphPanel.getVertex(new GraphPoint(mousePoint.x, mousePoint.y));

 

             // If the mouse has been pressed on a vertex

             if(vertex != null)

@@ -215,11 +222,11 @@ public class EdgeConstructionController extends MouseAdapter implements EditorMo
         Vertex vertex     = null;

         Point  mousePoint = null;

 

-        if(mGraphModelManager != null)

+        if(mGraphModelManager != null && mGraphPanel != null)

         {

             // Determine if there is a vertex under the mouse cursor

             mousePoint = me.getPoint();

-            vertex     = mGraphModelManager.getModel().getVertex(new GraphPoint(mousePoint.x, mousePoint.y));

+            vertex     = mGraphPanel.getVertex(new GraphPoint(mousePoint.x, mousePoint.y));

 

             // If the mouse has been released on a vertex which is not the origin vertex

             if((vertex != null) && (vertex != mGraphModelManager.getModel().getNewEdgeOriginVertex()))

diff --git a/src/main/java/com/c2kernel/gui/graph/controller/MultiSelectionDragController.java b/src/main/java/com/c2kernel/gui/graph/controller/MultiSelectionDragController.java
index 498f3d9..ed9d6a1 100644
--- a/src/main/java/com/c2kernel/gui/graph/controller/MultiSelectionDragController.java
+++ b/src/main/java/com/c2kernel/gui/graph/controller/MultiSelectionDragController.java
@@ -424,7 +424,7 @@ implements EditorModeListener, KeyListener
         if (me.getClickCount() == 2) { // want double click

             Point clickedSpot = me.getPoint();

             GraphPoint mouseGPoint = new GraphPoint(clickedSpot.x, clickedSpot.y);

-            Vertex clicked = mGraphModelManager.getModel().getVertex(mouseGPoint);

+            Vertex clicked = mGraphPanel.getVertex(mouseGPoint);

             if (clicked != null)

                 processEvent(kZoomIn, clicked);

         }

@@ -433,8 +433,8 @@ implements EditorModeListener, KeyListener
     private void mousePressedWithoutCTRL(Point mousePoint)

     {

         GraphPoint       mouseGPoint       = new GraphPoint(mousePoint.x, mousePoint.y);

-        DirectedEdge     edge              = mGraphModelManager.getModel().getEdge(mouseGPoint);

-        Vertex           vertex            = mGraphModelManager.getModel().getVertex(mouseGPoint);

+        DirectedEdge     edge              = mGraphPanel.getEdge(mouseGPoint);

+        Vertex           vertex            = mGraphPanel.getVertex(mouseGPoint);

         GraphPoint       vertexCentrePoint = null;

         VertexAndDisp    vertexAndDisp     = null;

         Selection        selection         = null;

@@ -521,7 +521,7 @@ implements EditorModeListener, KeyListener
 

     private void mousePressedWithCTRL(Point mousePoint)

     {

-        Vertex vertex = mGraphModelManager.getModel().getVertex(new GraphPoint(mousePoint.x, mousePoint.y));

+        Vertex vertex = mGraphPanel.getVertex(new GraphPoint(mousePoint.x, mousePoint.y));

 

         if(vertex != null)

         {