From d6f6211306708d22ddcbe4e350f906c63220d7a4 Mon Sep 17 00:00:00 2001 From: Andrew Branson Date: Fri, 29 Jun 2012 16:21:42 +0200 Subject: More graph gui components. Selection moved from GraphModel to GraphPanel --- .../gui/graph/controller/DeletionController.java | 16 +++++++++++----- 1 file changed, 11 insertions(+), 5 deletions(-) (limited to 'src/main/java/com/c2kernel/gui/graph/controller/DeletionController.java') diff --git a/src/main/java/com/c2kernel/gui/graph/controller/DeletionController.java b/src/main/java/com/c2kernel/gui/graph/controller/DeletionController.java index 4a8fb47..d83a588 100644 --- a/src/main/java/com/c2kernel/gui/graph/controller/DeletionController.java +++ b/src/main/java/com/c2kernel/gui/graph/controller/DeletionController.java @@ -9,10 +9,11 @@ import java.util.Observer; import javax.swing.JButton; -import com.c2kernel.graph.event.SelectionChangedEvent; import com.c2kernel.graph.model.DirectedEdge; import com.c2kernel.graph.model.GraphModelManager; import com.c2kernel.graph.model.Vertex; +import com.c2kernel.gui.graph.event.SelectionChangedEvent; +import com.c2kernel.gui.graph.view.GraphPanel; // The deletion controller is responsible for deleting the present @@ -29,6 +30,7 @@ import com.c2kernel.graph.model.Vertex; public class DeletionController extends KeyAdapter implements Observer, ActionListener { private GraphModelManager mGraphModelManager = null; + private GraphPanel mGraphPanel = null; private JButton mDeleteButton = null; @@ -37,6 +39,11 @@ public class DeletionController extends KeyAdapter implements Observer, ActionLi mGraphModelManager = graphModelManager; mGraphModelManager.addObserver(this); } + + public void setGraphPanel(GraphPanel graphPanel) + { + mGraphPanel = graphPanel; + } public void setDeleteButton(JButton deleteButton) @@ -63,8 +70,7 @@ public class DeletionController extends KeyAdapter implements Observer, ActionLi selectedEdge = event.mSelection.mEdge; selectedVertices = event.mSelection.mVertices; - - mDeleteButton.setEnabled((selectedEdge != null) || (selectedVertices != null)); + mDeleteButton.setEnabled(selectedEdge != null || selectedVertices != null); } } @@ -75,7 +81,7 @@ public class DeletionController extends KeyAdapter implements Observer, ActionLi { if(e.getKeyCode() == KeyEvent.VK_DELETE && mGraphModelManager.isEditable()) { - mGraphModelManager.getModel().deleteSelection(); + mGraphPanel.deleteSelection(); } } @@ -86,7 +92,7 @@ public class DeletionController extends KeyAdapter implements Observer, ActionLi { if(mGraphModelManager != null && mGraphModelManager.isEditable()) { - mGraphModelManager.getModel().deleteSelection(); + mGraphPanel.deleteSelection(); } } } -- cgit v1.2.3