More graph gui components. Selection moved from GraphModel to GraphPanel

1 files changed, 9 insertions, 8 deletions

diff --git a/src/main/java/com/c2kernel/gui/graph/view/EditorToolBar.java b/src/main/java/com/c2kernel/gui/graph/view/EditorToolBar.java
index deeaebb..b60c1ba 100644
--- a/src/main/java/com/c2kernel/gui/graph/view/EditorToolBar.java
+++ b/src/main/java/com/c2kernel/gui/graph/view/EditorToolBar.java
@@ -27,11 +27,11 @@ import javax.swing.JToggleButton;
 

 import com.c2kernel.graph.model.GraphModelManager;

 import com.c2kernel.graph.model.TypeNameAndConstructionInfo;

+import com.c2kernel.gui.ImageLoader;

 import com.c2kernel.gui.graph.controller.DeletionController;

 import com.c2kernel.gui.graph.controller.StartVertexController;

 import com.c2kernel.utils.Language;

 import com.c2kernel.utils.Logger;

-import com.c2kernel.utils.Resource;

 /**

  * Tool bar with mode toggle buttons, start and delete buttons, and the possibility to add other arbitrary buttons at constructions time.

  */

@@ -62,15 +62,15 @@ public class EditorToolBar extends Box implements Printable
 	protected JComboBox mEdgeTypeBox = new JComboBox();

 	// Mode buttons

 	protected ButtonGroup mModeButtonGroup = new ButtonGroup();

-	protected JToggleButton mVertexModeButton = new JToggleButton(Resource.findImage("graph/newvertex.png"));

-	protected JToggleButton mSelectModeButton = new JToggleButton(Resource.findImage("graph/selection.gif"));

-	protected JToggleButton mEdgeModeButton = new JToggleButton(Resource.findImage("graph/edge.png"));

+	protected JToggleButton mVertexModeButton = new JToggleButton(ImageLoader.findImage("graph/newvertex.png"));

+	protected JToggleButton mSelectModeButton = new JToggleButton(ImageLoader.findImage("graph/selection.gif"));

+	protected JToggleButton mEdgeModeButton = new JToggleButton(ImageLoader.findImage("graph/edge.png"));

 	// Normal buttons

 	protected JButton[] mOtherButtons = null;

-	protected JButton mStartButton = new JButton(Resource.findImage("graph/start.png"));

-	protected JButton mDeleteButton = new JButton(Resource.findImage("graph/delete.png"));

-	protected JButton mPrintButton = new JButton(Resource.findImage("graph/print.png"));

-	protected JButton mCopyButton = new JButton(Resource.findImage("graph/copy.png"));

+	protected JButton mStartButton = new JButton(ImageLoader.findImage("graph/start.png"));

+	protected JButton mDeleteButton = new JButton(ImageLoader.findImage("graph/delete.png"));

+	protected JButton mPrintButton = new JButton(ImageLoader.findImage("graph/print.png"));

+	protected JButton mCopyButton = new JButton(ImageLoader.findImage("graph/copy.png"));

 	// Controllers

 	protected StartVertexController mStartVertexController = new StartVertexController();

 	protected DeletionController mDeletionController = new DeletionController();

@@ -309,6 +309,7 @@ public class EditorToolBar extends Box implements Printable
 	public void setGraphPanel(GraphPanel graphPanel)

 	{

 		graphPanel.addKeyListener(mDeletionController);

+		mDeletionController.setGraphPanel(graphPanel);

 	}

 	public void addEditorModeListener(EditorModeListener listener)

 	{