From 2ce62db2ee1b059caf0158cbbcb161ab17d1fb4e Mon Sep 17 00:00:00 2001
From: "s.feenstra" <Stefan@129.125.58.58>
Date: Thu, 30 Sep 2010 15:10:55 +0200
Subject: [PATCH] SelectionController in GraphFrame wordt nu geset.

---
 java/Graph Editor/src/controllers/SelectionController.java | 2 +-
 java/Graph Editor/src/controllers/actions/DeleteNode.java  | 2 +-
 java/Graph Editor/src/interfaces/GraphFrame.java           | 6 +++++-
 3 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/java/Graph Editor/src/controllers/SelectionController.java b/java/Graph Editor/src/controllers/SelectionController.java
index 53f880f..29b4418 100644
--- a/java/Graph Editor/src/controllers/SelectionController.java	
+++ b/java/Graph Editor/src/controllers/SelectionController.java	
@@ -26,7 +26,7 @@ public class SelectionController implements MouseListener,MouseMotionListener{
 	
 	public SelectionController(GraphFrame frame, GraphModel model){
 		this.frame = frame;
-		enableIfSelected = new ArrayList<JMenuItem>();
+		frame.setSelectionController(this);		
 		setObject(frame.getPanel());
 		setModel(model);
 	}
diff --git a/java/Graph Editor/src/controllers/actions/DeleteNode.java b/java/Graph Editor/src/controllers/actions/DeleteNode.java
index b2a5d2f..ab6313b 100644
--- a/java/Graph Editor/src/controllers/actions/DeleteNode.java	
+++ b/java/Graph Editor/src/controllers/actions/DeleteNode.java	
@@ -20,8 +20,8 @@ public class DeleteNode extends AbstractUndoableEdit {
 	
 	public void redo()
 	{
-		selectionController.getModel().removeGraph(o);
 		selectionController.removeSelected();
+		selectionController.getModel().removeGraph(o);
 	}
 	
 	public void undo()
diff --git a/java/Graph Editor/src/interfaces/GraphFrame.java b/java/Graph Editor/src/interfaces/GraphFrame.java
index 53df35e..6b711f7 100644
--- a/java/Graph Editor/src/interfaces/GraphFrame.java	
+++ b/java/Graph Editor/src/interfaces/GraphFrame.java	
@@ -38,10 +38,12 @@ public class GraphFrame extends JFrame {
 	private ActionListener onMenuEditDeleteNode;
 	
 	public GraphFrame(GraphModel model){
+		undoManager = new UndoManager();
 		this.setTitle("Graph Editor");
 		this.setSize(500, 500);
 		menubar = new JMenuBar();
 		
+		
 		menuOptionFile = new JMenu("File");
 		menuOptionFile.setMnemonic(KeyEvent.VK_F);
 		menuOptionEdit = new JMenu("Edit");
@@ -78,11 +80,12 @@ public class GraphFrame extends JFrame {
 		onMenuEditUndo = new ActionListener(){
 			public void actionPerformed(ActionEvent arg0) {
 				//TODO
+				undoManager.undo();
 			}
 		};
 		onMenuEditAddNode = new ActionListener(){
 			public void actionPerformed(ActionEvent arg0) {
-				undoManager.addEdit(new AddNode(selectionController));
+				GraphFrame.this.undoManager.addEdit(new AddNode(GraphFrame.this.selectionController));
 			}
 		};
 		onMenuEditAddEdge = new ActionListener(){
@@ -118,6 +121,7 @@ public class GraphFrame extends JFrame {
 		menubar.add(menuOptionEdit);
 		setJMenuBar(menubar);
 		panel = new GraphPanel(model);
+		
 		add(panel);
 		setVisible(true);
 	}
-- 
2.11.4.GIT