1 files changed, 7 insertions, 5 deletions
diff --git a/src/main/java/com/c2kernel/gui/graph/controller/StartVertexController.java b/src/main/java/com/c2kernel/gui/graph/controller/StartVertexController.java
index e973132..41a53b3 100644
--- a/src/main/java/com/c2kernel/gui/graph/controller/StartVertexController.java
+++ b/src/main/java/com/c2kernel/gui/graph/controller/StartVertexController.java
@@ -7,9 +7,9 @@ import java.util.Observer;
 
 import javax.swing.JButton;
 
-import com.c2kernel.graph.event.SelectionChangedEvent;
 import com.c2kernel.graph.model.GraphModelManager;
 import com.c2kernel.graph.model.Vertex;
+import com.c2kernel.gui.graph.event.SelectionChangedEvent;
 
 
 // The start vertex controller is responsible for selecting
@@ -28,6 +28,7 @@ public class StartVertexController implements Observer, ActionListener
 {
     private GraphModelManager mGraphModelManager  = null;
     private JButton           mStartButton        = null;
+    private Vertex 			  selectedVertex	  = null;
 
 
     public void setGraphModelManager(GraphModelManager graphModelManager)
@@ -56,13 +57,14 @@ public class StartVertexController implements Observer, ActionListener
             event            = (SelectionChangedEvent)arg;
             selectedVertices = event.mSelection.mVertices;
 
-            if(selectedVertices == null)
+            if(selectedVertices == null || selectedVertices.length != 1)
             {
                 mStartButton.setEnabled(false);
             }
             else if (mGraphModelManager.isEditable())
             {
-                mStartButton.setEnabled(selectedVertices.length == 1);
+                mStartButton.setEnabled(true);
+                selectedVertex = selectedVertices[0];
             }
         }
     }
@@ -71,9 +73,9 @@ public class StartVertexController implements Observer, ActionListener
     @Override
 	public void actionPerformed(ActionEvent ae)
     {
-        if(mGraphModelManager != null)
+        if(selectedVertex != null)
         {
-            mGraphModelManager.getModel().setSelectedVertexToBeStart();
+            mGraphModelManager.getModel().setStartVertexId(selectedVertex.getID());
         }
     }
 }