Changeset 3355 for trunk/sources/HeuristicLab.ExtLibs

Timestamp:

04/15/10 16:07:38 (15 years ago)

Author:

mkommend

Message:

adapted OperatorGraphView to readyonly mechanism (ticket #973)

Location:

trunk/sources/HeuristicLab.ExtLibs/HeuristicLab.Netron/3.0.2672.12446

Files:

• HeuristicLab.Netron-3.0.2672.12446/Controller.cs (modified) (1 diff)
• Netron.Diagramming.Core-3.0.2672.12446/Core/ControllerBase.cs (modified) (3 diffs)

trunk/sources/HeuristicLab.ExtLibs/HeuristicLab.Netron/3.0.2672.12446/HeuristicLab.Netron-3.0.2672.12446/Controller.cs

@@ -56 +56 @@
       }
     }
+
+    public void RemoveTool(ITool tool) {
+      if (tool == null)
+        return;
+      tool.Controller = null;
+      registeredTools.Remove(tool);
+
+      IMouseListener mouseTool = tool as IMouseListener;
+      if (mouseTool != null)
+        mouseListeners.Remove(mouseTool);
+      IKeyboardListener keyboardTool = tool as IKeyboardListener;
+      if (keyboardTool != null)
+        keyboardListeners.Remove(keyboardTool);
+      IDragDropListener dragdropTool = tool as IDragDropListener;
+      if (dragdropTool != null)
+        dragdropListeners.Remove(dragdropTool);
+
+      tool.OnToolActivate -= new EventHandler<ToolEventArgs>(AddedTool_OnToolActivate);
+      tool.OnToolDeactivate -= new EventHandler<ToolEventArgs>(AddedTool_OnToolDeactivate);
+    }
   }
 }

trunk/sources/HeuristicLab.ExtLibs/HeuristicLab.Netron/3.0.2672.12446/Netron.Diagramming.Core-3.0.2672.12446/Core/ControllerBase.cs

@@ -155 +155 @@
     /// </summary>
     private IView mView;
-    private CollectionBase<IMouseListener> mouseListeners;
-    private CollectionBase<IKeyboardListener> keyboardListeners;
-    private CollectionBase<IDragDropListener> dragdropListeners;
-    private IDiagramControl parentControl;
-    private CollectionBase<ITool> registeredTools;
-    private CollectionBase<IActivity> registeredActivity;
+    protected CollectionBase<IMouseListener> mouseListeners;
+    protected CollectionBase<IKeyboardListener> keyboardListeners;
+    protected CollectionBase<IDragDropListener> dragdropListeners;
+    protected IDiagramControl parentControl;
+    protected CollectionBase<ITool> registeredTools;
+    protected CollectionBase<IActivity> registeredActivity;
 
     #endregion
@@ -811 +811 @@
     /// <param name="e">ToolEventArgs</param>
     // ------------------------------------------------------------------
-    void AddedTool_OnToolDeactivate(object sender, ToolEventArgs e) {
+    protected void AddedTool_OnToolDeactivate(object sender, ToolEventArgs e) {
       ITool nextActiveToolInList = null;
       if (this.activeTool == e.Properties) {
@@ -833 +833 @@
     /// <param name="e">ToolEventArgs</param>
     // ------------------------------------------------------------------
-    void AddedTool_OnToolActivate(object sender, ToolEventArgs e) {
+    protected void AddedTool_OnToolActivate(object sender, ToolEventArgs e) {
       this.RaiseOnToolActivate(e);
     }