Index: Core/Plugins/src/Core.Plugins.OxyPlot/Commands/ToggleLegendViewCommand.cs
===================================================================
diff -u -r4512af7782ee31b36941bb280b54d9da2953dd71 -r170ec8698dfed095e23f4fa822fe2198b3e5f242
--- Core/Plugins/src/Core.Plugins.OxyPlot/Commands/ToggleLegendViewCommand.cs	(.../ToggleLegendViewCommand.cs)	(revision 4512af7782ee31b36941bb280b54d9da2953dd71)
+++ Core/Plugins/src/Core.Plugins.OxyPlot/Commands/ToggleLegendViewCommand.cs	(.../ToggleLegendViewCommand.cs)	(revision 170ec8698dfed095e23f4fa822fe2198b3e5f242)
@@ -25,17 +25,17 @@
 namespace Core.Plugins.OxyPlot.Commands
 {
     /// <summary>
-    /// This class describes the command which toggles the visibility of the <see cref="LegendView"/>.
+    /// This class describes the command which toggles the visibility of the <see cref="ChartLegendView"/>.
     /// </summary>
     public class ToggleLegendViewCommand : ICommand
     {
-        private readonly LegendController controller;
+        private readonly ChartLegendController controller;
 
         /// <summary>
         /// Creates a new instance of <see cref="ToggleLegendViewCommand"/>.
         /// </summary>
-        /// <param name="controller">The <see cref="LegendController"/> to use to invoke actions and determine state.</param>
-        public ToggleLegendViewCommand(LegendController controller)
+        /// <param name="controller">The <see cref="ChartLegendController"/> to use to invoke actions and determine state.</param>
+        public ToggleLegendViewCommand(ChartLegendController controller)
         {
             this.controller = controller;
         }
Index: Core/Plugins/src/Core.Plugins.OxyPlot/Core.Plugins.OxyPlot.csproj
===================================================================
diff -u -r44055100aa3c3f382227becdaeae7d97c75d386c -r170ec8698dfed095e23f4fa822fe2198b3e5f242
--- Core/Plugins/src/Core.Plugins.OxyPlot/Core.Plugins.OxyPlot.csproj	(.../Core.Plugins.OxyPlot.csproj)	(revision 44055100aa3c3f382227becdaeae7d97c75d386c)
+++ Core/Plugins/src/Core.Plugins.OxyPlot/Core.Plugins.OxyPlot.csproj	(.../Core.Plugins.OxyPlot.csproj)	(revision 170ec8698dfed095e23f4fa822fe2198b3e5f242)
@@ -66,13 +66,13 @@
     <Compile Include="Forms\ChartDataView.Designer.cs">
       <DependentUpon>ChartDataView.cs</DependentUpon>
     </Compile>
-    <Compile Include="Legend\LegendView.cs">
+    <Compile Include="Legend\ChartLegendView.cs">
       <SubType>UserControl</SubType>
     </Compile>
-    <Compile Include="Legend\LegendView.Designer.cs">
-      <DependentUpon>LegendView.cs</DependentUpon>
+    <Compile Include="Legend\ChartLegendView.Designer.cs">
+      <DependentUpon>ChartLegendView.cs</DependentUpon>
     </Compile>
-    <Compile Include="Legend\LegendController.cs" />
+    <Compile Include="Legend\ChartLegendController.cs" />
     <Compile Include="OxyPlotGuiPlugin.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
     <Compile Include="Properties\Resources.Designer.cs">
@@ -133,8 +133,8 @@
     <EmbeddedResource Include="Forms\ChartDataView.resx">
       <DependentUpon>ChartDataView.cs</DependentUpon>
     </EmbeddedResource>
-    <EmbeddedResource Include="Legend\LegendView.resx">
-      <DependentUpon>LegendView.cs</DependentUpon>
+    <EmbeddedResource Include="Legend\ChartLegendView.resx">
+      <DependentUpon>ChartLegendView.cs</DependentUpon>
       <SubType>Designer</SubType>
     </EmbeddedResource>
     <EmbeddedResource Include="Properties\Resources.resx">
Index: Core/Plugins/src/Core.Plugins.OxyPlot/Legend/ChartLegendController.cs
===================================================================
diff -u
--- Core/Plugins/src/Core.Plugins.OxyPlot/Legend/ChartLegendController.cs	(revision 0)
+++ Core/Plugins/src/Core.Plugins.OxyPlot/Legend/ChartLegendController.cs	(revision 170ec8698dfed095e23f4fa822fe2198b3e5f242)
@@ -0,0 +1,115 @@
+// Copyright (C) Stichting Deltares 2016. All rights reserved.
+//
+// This file is part of Ringtoets.
+//
+// Ringtoets is free software: you can redistribute it and/or modify
+// it under the terms of the GNU Lesser General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+// 
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+// GNU Lesser General Public License for more details.
+//
+// You should have received a copy of the GNU Lesser General Public License
+// along with this program. If not, see <http://www.gnu.org/licenses/>.
+//
+// All names, logos, and references to "Deltares" are registered trademarks of
+// Stichting Deltares and remain full property of Stichting Deltares at all times.
+// All rights reserved.
+
+using System;
+using Core.Common.Controls.Views;
+using Core.Common.Gui;
+using Core.Components.Charting.Data;
+
+namespace Core.Plugins.OxyPlot.Legend
+{
+    /// <summary>
+    /// This class controls the actions which are related to controlling visibility and updating contents of a <see cref="ChartLegendView"/>.
+    /// </summary>
+    public class ChartLegendController
+    {
+        private readonly IToolViewController toolViewController;
+        private IView legendView;
+
+        /// <summary>
+        /// Fired when the legend has been opened.
+        /// </summary>
+        public EventHandler<EventArgs> OnOpenLegend;
+
+        /// <summary>
+        /// Creates a new instance of <see cref="ChartLegendController"/>.
+        /// </summary>
+        /// <param name="toolViewController">The <see cref="IToolViewController"/> to invoke actions upon.</param>
+        public ChartLegendController(IToolViewController toolViewController)
+        {
+            if (toolViewController == null)
+            {
+                throw new ArgumentNullException("toolViewController", "Cannot create a ChartLegendController when the tool view controller is null.");
+            }
+            this.toolViewController = toolViewController;
+        }
+
+        /// <summary>
+        /// Toggles the <see cref="ChartLegendView"/>.
+        /// </summary>
+        public void ToggleLegend()
+        {
+            if (IsLegendViewOpen())
+            {
+                CloseLegendView();
+            }
+            else
+            {
+                OpenLegendView();
+            }
+        }
+
+        /// <summary>
+        /// Checks whether a <see cref="ChartLegendView"/> is open.
+        /// </summary>
+        /// <returns><c>true</c> if the <see cref="ChartLegendView"/> is open, <c>false</c> otherwise.</returns>
+        public bool IsLegendViewOpen()
+        {
+            return toolViewController.IsToolWindowOpen<ChartLegendView>();
+        }
+
+        /// <summary>
+        /// Open the <see cref="ChartLegendView"/>.
+        /// </summary>
+        private void OpenLegendView()
+        {
+            legendView = new ChartLegendView();
+            toolViewController.OpenToolView(legendView);
+            if (OnOpenLegend != null)
+            {
+                OnOpenLegend(this, EventArgs.Empty);
+            }
+        }
+
+        /// <summary>
+        /// Closes the <see cref="ChartLegendView"/>.
+        /// </summary>
+        private void CloseLegendView()
+        {
+            toolViewController.CloseToolView(legendView);
+            legendView.Dispose();
+            legendView = null;
+        }
+
+        /// <summary>
+        /// Updates the data for the <see cref="ChartLegendView"/> if it is open.
+        /// </summary>
+        /// <param name="data">The <see cref="ChartData"/> to show. If <c>null</c> the 
+        /// data will be cleared.</param>
+        public void Update(ChartData data)
+        {
+            if (IsLegendViewOpen())
+            {
+                legendView.Data = data;
+            }
+        }
+    }
+}
\ No newline at end of file
Index: Core/Plugins/src/Core.Plugins.OxyPlot/Legend/ChartLegendView.Designer.cs
===================================================================
diff -u
--- Core/Plugins/src/Core.Plugins.OxyPlot/Legend/ChartLegendView.Designer.cs	(revision 0)
+++ Core/Plugins/src/Core.Plugins.OxyPlot/Legend/ChartLegendView.Designer.cs	(revision 170ec8698dfed095e23f4fa822fe2198b3e5f242)
@@ -0,0 +1,44 @@
+using Core.Common.Controls.TreeView;
+
+namespace Core.Plugins.OxyPlot.Legend
+{
+    partial class ChartLegendView
+    {
+        /// <summary> 
+        /// Required designer variable.
+        /// </summary>
+        private System.ComponentModel.IContainer components = null;
+
+        #region Component Designer generated code
+
+        /// <summary> 
+        /// Required method for Designer support - do not modify 
+        /// the contents of this method with the code editor.
+        /// </summary>
+        private void InitializeComponent()
+        {
+            this.components = new System.ComponentModel.Container();
+            System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(ChartLegendView));
+            this.treeViewControl = new TreeViewControl();
+            this.SuspendLayout();
+            // 
+            // treeViewControl
+            // 
+            resources.ApplyResources(this.treeViewControl, "treeViewControl");
+            this.treeViewControl.Name = "treeViewControl";
+            // 
+            // ChartLegendView
+            // 
+            resources.ApplyResources(this, "$this");
+            this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
+            this.Controls.Add(this.treeViewControl);
+            this.Name = "ChartLegendView";
+            this.ResumeLayout(false);
+
+        }
+
+        #endregion
+
+        private TreeViewControl treeViewControl;
+    }
+}
\ No newline at end of file
Index: Core/Plugins/src/Core.Plugins.OxyPlot/Legend/ChartLegendView.cs
===================================================================
diff -u
--- Core/Plugins/src/Core.Plugins.OxyPlot/Legend/ChartLegendView.cs	(revision 0)
+++ Core/Plugins/src/Core.Plugins.OxyPlot/Legend/ChartLegendView.cs	(revision 170ec8698dfed095e23f4fa822fe2198b3e5f242)
@@ -0,0 +1,162 @@
+// Copyright (C) Stichting Deltares 2016. All rights reserved.
+//
+// This file is part of Ringtoets.
+//
+// Ringtoets is free software: you can redistribute it and/or modify
+// it under the terms of the GNU Lesser General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+// 
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+// GNU Lesser General Public License for more details.
+//
+// You should have received a copy of the GNU Lesser General Public License
+// along with this program. If not, see <http://www.gnu.org/licenses/>.
+//
+// All names, logos, and references to "Deltares" are registered trademarks of
+// Stichting Deltares and remain full property of Stichting Deltares at all times.
+// All rights reserved.
+
+using System.Linq;
+using System.Windows.Forms;
+using Core.Common.Base;
+using Core.Common.Controls.TreeView;
+using Core.Common.Controls.Views;
+using Core.Components.Charting.Data;
+using Core.Components.OxyPlot.Forms;
+using OxyPlotResources = Core.Plugins.OxyPlot.Properties.Resources;
+using GuiResources = Core.Common.Gui.Properties.Resources;
+
+namespace Core.Plugins.OxyPlot.Legend
+{
+    /// <summary>
+    /// This class defines a view which shows the data that have been added to a <see cref="ChartControl"/>.
+    /// </summary>
+    public sealed partial class ChartLegendView : UserControl, IView
+    {
+        /// <summary>
+        /// Creates a new instance of <see cref="ChartLegendView"/>.
+        /// </summary>
+        public ChartLegendView()
+        {
+            InitializeComponent();
+            Text = OxyPlotResources.General_Chart;
+
+            RegisterTreeNodeInfos();
+        }
+
+        public object Data
+        {
+            get
+            {
+                return (ChartData) treeViewControl.Data;
+            }
+            set
+            {
+                if (IsDisposed)
+                {
+                    return;
+                }
+
+                treeViewControl.Data = (ChartData) value;
+            }
+        }
+
+        protected override void Dispose(bool disposing)
+        {
+            Data = null;
+
+            if (disposing && (components != null))
+            {
+                components.Dispose();
+            }
+
+            base.Dispose(disposing);
+        }
+
+        private void RegisterTreeNodeInfos()
+        {
+            treeViewControl.RegisterTreeNodeInfo(new TreeNodeInfo<ChartPointData>
+            {
+                Text = pointData => pointData.Name,
+                Image = pointData => OxyPlotResources.PointsIcon,
+                CanDrag = (pointData, parentData) => true,
+                CanCheck = pointData => true,
+                IsChecked = pointData => pointData.IsVisible,
+                OnNodeChecked = PointBasedChartDataOnNodeChecked
+            });
+
+            treeViewControl.RegisterTreeNodeInfo(new TreeNodeInfo<ChartLineData>
+            {
+                Text = lineData => lineData.Name,
+                Image = lineData => OxyPlotResources.LineIcon,
+                CanDrag = (lineData, parentData) => true,
+                CanCheck = lineData => true,
+                IsChecked = lineData => lineData.IsVisible,
+                OnNodeChecked = PointBasedChartDataOnNodeChecked
+            });
+
+            treeViewControl.RegisterTreeNodeInfo(new TreeNodeInfo<ChartAreaData>
+            {
+                Text = areaData => areaData.Name,
+                Image = areaData => OxyPlotResources.AreaIcon,
+                CanDrag = (areaData, parentData) => true,
+                CanCheck = areaData => true,
+                IsChecked = areaData => areaData.IsVisible,
+                OnNodeChecked = PointBasedChartDataOnNodeChecked
+            });
+
+            treeViewControl.RegisterTreeNodeInfo(new TreeNodeInfo<ChartDataCollection>
+            {
+                Text = chartControl => chartControl.Name,
+                Image = chartControl => GuiResources.folder,
+                ChildNodeObjects = chartControl => chartControl.List.Reverse().Cast<object>().ToArray(),
+                CanDrop = ChartControlCanDrop,
+                CanInsert = ChartControlCanInsert,
+                OnDrop = ChartControlOnDrop
+            });
+        }
+
+        # region ChartData
+
+        private static void PointBasedChartDataOnNodeChecked(PointBasedChartData pointBasedChartData, object parentData)
+        {
+            pointBasedChartData.IsVisible = !pointBasedChartData.IsVisible;
+            pointBasedChartData.NotifyObservers();
+
+            var observableParent = parentData as IObservable;
+            if (observableParent != null)
+            {
+                observableParent.NotifyObservers();
+            }
+        }
+
+        # endregion
+
+        # region ChartDataCollection
+
+        private static bool ChartControlCanDrop(object draggedData, object targetData)
+        {
+            return draggedData is ChartData;
+        }
+
+        private static bool ChartControlCanInsert(object draggedData, object targetData)
+        {
+            return draggedData is ChartData;
+        }
+
+        private static void ChartControlOnDrop(object droppedData, object newParentData, object oldParentData, int position, TreeViewControl control)
+        {
+            var chartData = (ChartData) droppedData;
+            var target = (ChartDataCollection) newParentData;
+
+            target.List.Remove(chartData);
+            target.List.Insert(target.List.Count - position, chartData); // Note: target is the same as the previous parent in this case
+            target.NotifyObservers();
+        }
+
+        # endregion
+    }
+}
\ No newline at end of file
Index: Core/Plugins/src/Core.Plugins.OxyPlot/Legend/ChartLegendView.resx
===================================================================
diff -u
--- Core/Plugins/src/Core.Plugins.OxyPlot/Legend/ChartLegendView.resx	(revision 0)
+++ Core/Plugins/src/Core.Plugins.OxyPlot/Legend/ChartLegendView.resx	(revision 170ec8698dfed095e23f4fa822fe2198b3e5f242)
@@ -0,0 +1,168 @@
+<?xml version="1.0" encoding="utf-8"?>
+<root>
+  <!-- 
+    Microsoft ResX Schema 
+    
+    Version 2.0
+    
+    The primary goals of this format is to allow a simple XML format 
+    that is mostly human readable. The generation and parsing of the 
+    various data types are done through the TypeConverter classes 
+    associated with the data types.
+    
+    Example:
+    
+    ... ado.net/XML headers & schema ...
+    <resheader name="resmimetype">text/microsoft-resx</resheader>
+    <resheader name="version">2.0</resheader>
+    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
+    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
+    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
+    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
+    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
+        <value>[base64 mime encoded serialized .NET Framework object]</value>
+    </data>
+    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
+        <comment>This is a comment</comment>
+    </data>
+                
+    There are any number of "resheader" rows that contain simple 
+    name/value pairs.
+    
+    Each data row contains a name, and value. The row also contains a 
+    type or mimetype. Type corresponds to a .NET class that support 
+    text/value conversion through the TypeConverter architecture. 
+    Classes that don't support this are serialized and stored with the 
+    mimetype set.
+    
+    The mimetype is used for serialized objects, and tells the 
+    ResXResourceReader how to depersist the object. This is currently not 
+    extensible. For a given mimetype the value must be set accordingly:
+    
+    Note - application/x-microsoft.net.object.binary.base64 is the format 
+    that the ResXResourceWriter will generate, however the reader can 
+    read any of the formats listed below.
+    
+    mimetype: application/x-microsoft.net.object.binary.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
+            : and then encoded with base64 encoding.
+    
+    mimetype: application/x-microsoft.net.object.soap.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
+            : and then encoded with base64 encoding.
+
+    mimetype: application/x-microsoft.net.object.bytearray.base64
+    value   : The object must be serialized into a byte array 
+            : using a System.ComponentModel.TypeConverter
+            : and then encoded with base64 encoding.
+    -->
+  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
+    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
+    <xsd:element name="root" msdata:IsDataSet="true">
+      <xsd:complexType>
+        <xsd:choice maxOccurs="unbounded">
+          <xsd:element name="metadata">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" />
+              </xsd:sequence>
+              <xsd:attribute name="name" use="required" type="xsd:string" />
+              <xsd:attribute name="type" type="xsd:string" />
+              <xsd:attribute name="mimetype" type="xsd:string" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="assembly">
+            <xsd:complexType>
+              <xsd:attribute name="alias" type="xsd:string" />
+              <xsd:attribute name="name" type="xsd:string" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="data">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
+              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
+              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="resheader">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" />
+            </xsd:complexType>
+          </xsd:element>
+        </xsd:choice>
+      </xsd:complexType>
+    </xsd:element>
+  </xsd:schema>
+  <resheader name="resmimetype">
+    <value>text/microsoft-resx</value>
+  </resheader>
+  <resheader name="version">
+    <value>2.0</value>
+  </resheader>
+  <resheader name="reader">
+    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <resheader name="writer">
+    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <assembly alias="System.Windows.Forms" name="System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
+  <data name="treeViewControl.Dock" type="System.Windows.Forms.DockStyle, System.Windows.Forms">
+    <value>Fill</value>
+  </data>
+  <assembly alias="mscorlib" name="mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
+  <data name="treeViewControl.ImageIndex" type="System.Int32, mscorlib">
+    <value>0</value>
+  </data>
+  <assembly alias="System.Drawing" name="System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
+  <data name="treeViewControl.Location" type="System.Drawing.Point, System.Drawing">
+    <value>0, 0</value>
+  </data>
+  <data name="treeViewControl.SelectedImageIndex" type="System.Int32, mscorlib">
+    <value>0</value>
+  </data>
+  <data name="treeViewControl.Size" type="System.Drawing.Size, System.Drawing">
+    <value>228, 412</value>
+  </data>
+  <data name="treeViewControl.TabIndex" type="System.Int32, mscorlib">
+    <value>2</value>
+  </data>
+  <data name="&gt;&gt;treeViewControl.Name" xml:space="preserve">
+    <value>treeViewControl</value>
+  </data>
+  <data name="&gt;&gt;treeViewControl.Type" xml:space="preserve">
+    <value>Core.Plugins.OxyPlot.Legend.LegendTreeView, Core.Plugins.OxyPlot, Version=0.5.0.1876, Culture=neutral, PublicKeyToken=null</value>
+  </data>
+  <data name="&gt;&gt;treeViewControl.Parent" xml:space="preserve">
+    <value>$this</value>
+  </data>
+  <data name="&gt;&gt;treeViewControl.ZOrder" xml:space="preserve">
+    <value>0</value>
+  </data>
+  <metadata name="$this.Localizable" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <data name="$this.AutoScaleDimensions" type="System.Drawing.SizeF, System.Drawing">
+    <value>6, 13</value>
+  </data>
+  <data name="$this.Size" type="System.Drawing.Size, System.Drawing">
+    <value>228, 412</value>
+  </data>
+  <data name="&gt;&gt;$this.Name" xml:space="preserve">
+    <value>ChartLegendView</value>
+  </data>
+  <data name="&gt;&gt;$this.Type" xml:space="preserve">
+    <value>System.Windows.Forms.UserControl, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </data>
+</root>
\ No newline at end of file
Fisheye: Tag 170ec8698dfed095e23f4fa822fe2198b3e5f242 refers to a dead (removed) revision in file `Core/Plugins/src/Core.Plugins.OxyPlot/Legend/LegendController.cs'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 170ec8698dfed095e23f4fa822fe2198b3e5f242 refers to a dead (removed) revision in file `Core/Plugins/src/Core.Plugins.OxyPlot/Legend/LegendView.Designer.cs'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 170ec8698dfed095e23f4fa822fe2198b3e5f242 refers to a dead (removed) revision in file `Core/Plugins/src/Core.Plugins.OxyPlot/Legend/LegendView.cs'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 170ec8698dfed095e23f4fa822fe2198b3e5f242 refers to a dead (removed) revision in file `Core/Plugins/src/Core.Plugins.OxyPlot/Legend/LegendView.resx'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: Core/Plugins/src/Core.Plugins.OxyPlot/OxyPlotGuiPlugin.cs
===================================================================
diff -u -r25bdf707d3cd78e182705e16371a376222b7ee79 -r170ec8698dfed095e23f4fa822fe2198b3e5f242
--- Core/Plugins/src/Core.Plugins.OxyPlot/OxyPlotGuiPlugin.cs	(.../OxyPlotGuiPlugin.cs)	(revision 25bdf707d3cd78e182705e16371a376222b7ee79)
+++ Core/Plugins/src/Core.Plugins.OxyPlot/OxyPlotGuiPlugin.cs	(.../OxyPlotGuiPlugin.cs)	(revision 170ec8698dfed095e23f4fa822fe2198b3e5f242)
@@ -40,7 +40,7 @@
     {
         private ChartingRibbon chartingRibbon;
 
-        private LegendController legendController;
+        private ChartLegendController chartLegendController;
 
         private bool activated;
 
@@ -54,10 +54,10 @@
 
         public override void Activate()
         {
-            legendController = CreateLegendController(Gui);
-            chartingRibbon = CreateRibbon(legendController, Gui);
+            chartLegendController = CreateLegendController(Gui);
+            chartingRibbon = CreateRibbon(chartLegendController, Gui);
 
-            legendController.ToggleLegend();
+            chartLegendController.ToggleLegend();
             Gui.ActiveViewChanged += GuiOnActiveViewChanged;
             activated = true;
         }
@@ -81,30 +81,30 @@
         }
 
         /// <summary>
-        /// Creates a new <see cref="LegendController"/>.
+        /// Creates a new <see cref="ChartLegendController"/>.
         /// </summary>
         /// <param name="toolViewController">The <see cref="IToolViewController"/> to use for the controller
-        /// <see cref="LegendController"/>.</param>
-        /// <returns>A new <see cref="LegendController"/> instance.</returns>
-        private LegendController CreateLegendController(IToolViewController toolViewController)
+        /// <see cref="ChartLegendController"/>.</param>
+        /// <returns>A new <see cref="ChartLegendController"/> instance.</returns>
+        private ChartLegendController CreateLegendController(IToolViewController toolViewController)
         {
-            var controller = new LegendController(toolViewController);
+            var controller = new ChartLegendController(toolViewController);
             controller.OnOpenLegend += (s,e) => UpdateComponentsForActiveView();
             return controller;
         }
 
         /// <summary>
         /// Creates the <see cref="ChartingRibbon"/> and the commands that will be used when clicking on the buttons.
         /// </summary>
-        /// <param name="legendController">The <see cref="LegendController"/> to use for the 
+        /// <param name="chartLegendController">The <see cref="ChartLegendController"/> to use for the 
         /// <see cref="ChartingRibbon"/>.</param>
         /// <param name="documentViewController">The controller for Document Views.</param>
         /// <returns>A new <see cref="ChartingRibbon"/> instance.</returns>
-        private static ChartingRibbon CreateRibbon(LegendController legendController, IDocumentViewController documentViewController)
+        private static ChartingRibbon CreateRibbon(ChartLegendController chartLegendController, IDocumentViewController documentViewController)
         {
             return new ChartingRibbon
             {
-                ToggleLegendViewCommand = new ToggleLegendViewCommand(legendController)
+                ToggleLegendViewCommand = new ToggleLegendViewCommand(chartLegendController)
             };
         }
 
@@ -123,12 +123,12 @@
             if (chartView != null)
             {
                 chartingRibbon.Chart = chartView.Chart;
-                legendController.Update(chartView.Chart.Data);
+                chartLegendController.Update(chartView.Chart.Data);
             }
             else
             {
                 chartingRibbon.Chart = null;
-                legendController.Update(null);
+                chartLegendController.Update(null);
             }
         }
     }
Index: Core/Plugins/src/Core.Plugins.OxyPlot/Properties/Resources.Designer.cs
===================================================================
diff -u -r6afedd402a3e74f1dc15367275220d6d5c04fb40 -r170ec8698dfed095e23f4fa822fe2198b3e5f242
--- Core/Plugins/src/Core.Plugins.OxyPlot/Properties/Resources.Designer.cs	(.../Resources.Designer.cs)	(revision 6afedd402a3e74f1dc15367275220d6d5c04fb40)
+++ Core/Plugins/src/Core.Plugins.OxyPlot/Properties/Resources.Designer.cs	(.../Resources.Designer.cs)	(revision 170ec8698dfed095e23f4fa822fe2198b3e5f242)
@@ -1,7 +1,7 @@
 //------------------------------------------------------------------------------
 // <auto-generated>
 //     This code was generated by a tool.
-//     Runtime Version:4.0.30319.42000
+//     Runtime Version:4.0.30319.17929
 //
 //     Changes to this file may cause incorrect behavior and will be lost if
 //     the code is regenerated.
@@ -71,33 +71,6 @@
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Gebied.
-        /// </summary>
-        public static string ChartData_Area_data_label {
-            get {
-                return ResourceManager.GetString("ChartData_Area_data_label", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to Lijn.
-        /// </summary>
-        public static string ChartData_Line_data_label {
-            get {
-                return ResourceManager.GetString("ChartData_Line_data_label", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to Punten.
-        /// </summary>
-        public static string ChartData_Point_data_label {
-            get {
-                return ResourceManager.GetString("ChartData_Point_data_label", resourceCulture);
-            }
-        }
-        
-        /// <summary>
         ///   Looks up a localized resource of type System.Drawing.Bitmap.
         /// </summary>
         public static System.Drawing.Bitmap ChartIcon {
Index: Core/Plugins/src/Core.Plugins.OxyPlot/Properties/Resources.resx
===================================================================
diff -u -r6afedd402a3e74f1dc15367275220d6d5c04fb40 -r170ec8698dfed095e23f4fa822fe2198b3e5f242
--- Core/Plugins/src/Core.Plugins.OxyPlot/Properties/Resources.resx	(.../Resources.resx)	(revision 6afedd402a3e74f1dc15367275220d6d5c04fb40)
+++ Core/Plugins/src/Core.Plugins.OxyPlot/Properties/Resources.resx	(.../Resources.resx)	(revision 170ec8698dfed095e23f4fa822fe2198b3e5f242)
@@ -121,15 +121,6 @@
   <data name="AreaIcon" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\resources\area.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
-  <data name="ChartData_Area_data_label" xml:space="preserve">
-    <value>Gebied</value>
-  </data>
-  <data name="ChartData_Line_data_label" xml:space="preserve">
-    <value>Lijn</value>
-  </data>
-  <data name="ChartData_Point_data_label" xml:space="preserve">
-    <value>Punten</value>
-  </data>
   <data name="ChartIcon" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\resources\chart.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
Index: Core/Plugins/test/Core.Plugins.DotSpatial.Test/Legend/MapLineDataTreeNodeInfoTest.cs
===================================================================
diff -u -r068e27ad7b5fb663d8f272d4aebbcf2d3e365abf -r170ec8698dfed095e23f4fa822fe2198b3e5f242
--- Core/Plugins/test/Core.Plugins.DotSpatial.Test/Legend/MapLineDataTreeNodeInfoTest.cs	(.../MapLineDataTreeNodeInfoTest.cs)	(revision 068e27ad7b5fb663d8f272d4aebbcf2d3e365abf)
+++ Core/Plugins/test/Core.Plugins.DotSpatial.Test/Legend/MapLineDataTreeNodeInfoTest.cs	(.../MapLineDataTreeNodeInfoTest.cs)	(revision 170ec8698dfed095e23f4fa822fe2198b3e5f242)
@@ -47,7 +47,7 @@
         }
 
         [Test]
-        public void Text_Always_ReturnsTextFromResource()
+        public void Text_Always_ReturnsNameFromMapData()
         {
             // Setup
             var mocks = CreateDefaultMocks();
Index: Core/Plugins/test/Core.Plugins.DotSpatial.Test/Legend/MapPointDataTreeNodeInfoTest.cs
===================================================================
diff -u -r354027b2a36a779798852d3edadaaf339140295c -r170ec8698dfed095e23f4fa822fe2198b3e5f242
--- Core/Plugins/test/Core.Plugins.DotSpatial.Test/Legend/MapPointDataTreeNodeInfoTest.cs	(.../MapPointDataTreeNodeInfoTest.cs)	(revision 354027b2a36a779798852d3edadaaf339140295c)
+++ Core/Plugins/test/Core.Plugins.DotSpatial.Test/Legend/MapPointDataTreeNodeInfoTest.cs	(.../MapPointDataTreeNodeInfoTest.cs)	(revision 170ec8698dfed095e23f4fa822fe2198b3e5f242)
@@ -41,7 +41,7 @@
         }
 
         [Test]
-        public void Text_Always_ReturnsTextFromResource()
+        public void Text_Always_ReturnsNameFromMapData()
         {
             // Setup
             var mocks = CreateDefaultMocks();
Index: Core/Plugins/test/Core.Plugins.DotSpatial.Test/Legend/MapPolygonDataTreeNodeInfoTest.cs
===================================================================
diff -u -r354027b2a36a779798852d3edadaaf339140295c -r170ec8698dfed095e23f4fa822fe2198b3e5f242
--- Core/Plugins/test/Core.Plugins.DotSpatial.Test/Legend/MapPolygonDataTreeNodeInfoTest.cs	(.../MapPolygonDataTreeNodeInfoTest.cs)	(revision 354027b2a36a779798852d3edadaaf339140295c)
+++ Core/Plugins/test/Core.Plugins.DotSpatial.Test/Legend/MapPolygonDataTreeNodeInfoTest.cs	(.../MapPolygonDataTreeNodeInfoTest.cs)	(revision 170ec8698dfed095e23f4fa822fe2198b3e5f242)
@@ -41,7 +41,7 @@
         }
 
         [Test]
-        public void Text_Always_ReturnsTextFromResource()
+        public void Text_Always_ReturnsNameFromMapData()
         {
             // Setup
             var mocks = CreateDefaultMocks();
Index: Core/Plugins/test/Core.Plugins.OxyPlot.Test/ChartingRibbonTest.cs
===================================================================
diff -u -r30b12b82918d500fe834eafd9f6cd9b2c5dbe60f -r170ec8698dfed095e23f4fa822fe2198b3e5f242
--- Core/Plugins/test/Core.Plugins.OxyPlot.Test/ChartingRibbonTest.cs	(.../ChartingRibbonTest.cs)	(revision 30b12b82918d500fe834eafd9f6cd9b2c5dbe60f)
+++ Core/Plugins/test/Core.Plugins.OxyPlot.Test/ChartingRibbonTest.cs	(.../ChartingRibbonTest.cs)	(revision 170ec8698dfed095e23f4fa822fe2198b3e5f242)
@@ -38,7 +38,7 @@
             var toolViewController = mocks.Stub<IToolViewController>();
             mocks.ReplayAll();
 
-            var toggleLegendViewCommand = new ToggleLegendViewCommand(new LegendController(toolViewController));
+            var toggleLegendViewCommand = new ToggleLegendViewCommand(new ChartLegendController(toolViewController));
             var ribbon = new ChartingRibbon
             {
                 ToggleLegendViewCommand = toggleLegendViewCommand,
Index: Core/Plugins/test/Core.Plugins.OxyPlot.Test/Commands/ToggleLegendViewCommandTest.cs
===================================================================
diff -u -r0d7895f07d2c1b15457ffdc8e8762780a5837030 -r170ec8698dfed095e23f4fa822fe2198b3e5f242
--- Core/Plugins/test/Core.Plugins.OxyPlot.Test/Commands/ToggleLegendViewCommandTest.cs	(.../ToggleLegendViewCommandTest.cs)	(revision 0d7895f07d2c1b15457ffdc8e8762780a5837030)
+++ Core/Plugins/test/Core.Plugins.OxyPlot.Test/Commands/ToggleLegendViewCommandTest.cs	(.../ToggleLegendViewCommandTest.cs)	(revision 170ec8698dfed095e23f4fa822fe2198b3e5f242)
@@ -38,11 +38,11 @@
             // Setup
             var mocks = new MockRepository();
             var plugin = mocks.StrictMock<IToolViewController>();
-            plugin.Expect(p => p.IsToolWindowOpen<LegendView>()).Return(open);
+            plugin.Expect(p => p.IsToolWindowOpen<ChartLegendView>()).Return(open);
 
             mocks.ReplayAll();
 
-            var controller = new LegendController(plugin);
+            var controller = new ChartLegendController(plugin);
             var command = new ToggleLegendViewCommand(controller);
 
             // Call
@@ -63,16 +63,16 @@
             // Open first
             using (mocks.Ordered())
             {
-                plugin.Expect(p => p.IsToolWindowOpen<LegendView>()).Return(false);
-                plugin.Expect(p => p.OpenToolView(Arg<LegendView>.Matches(v => true)));
+                plugin.Expect(p => p.IsToolWindowOpen<ChartLegendView>()).Return(false);
+                plugin.Expect(p => p.OpenToolView(Arg<ChartLegendView>.Matches(v => true)));
 
                 // Then close
-                plugin.Expect(p => p.IsToolWindowOpen<LegendView>()).Return(true);
-                plugin.Expect(p => p.CloseToolView(Arg<LegendView>.Matches(v => true)));
+                plugin.Expect(p => p.IsToolWindowOpen<ChartLegendView>()).Return(true);
+                plugin.Expect(p => p.CloseToolView(Arg<ChartLegendView>.Matches(v => true)));
             }
             mocks.ReplayAll();
 
-            var controller = new LegendController(plugin);
+            var controller = new ChartLegendController(plugin);
             var command = new ToggleLegendViewCommand(controller);
 
             // Call
Index: Core/Plugins/test/Core.Plugins.OxyPlot.Test/Core.Plugins.OxyPlot.Test.csproj
===================================================================
diff -u -r25bdf707d3cd78e182705e16371a376222b7ee79 -r170ec8698dfed095e23f4fa822fe2198b3e5f242
--- Core/Plugins/test/Core.Plugins.OxyPlot.Test/Core.Plugins.OxyPlot.Test.csproj	(.../Core.Plugins.OxyPlot.Test.csproj)	(revision 25bdf707d3cd78e182705e16371a376222b7ee79)
+++ Core/Plugins/test/Core.Plugins.OxyPlot.Test/Core.Plugins.OxyPlot.Test.csproj	(.../Core.Plugins.OxyPlot.Test.csproj)	(revision 170ec8698dfed095e23f4fa822fe2198b3e5f242)
@@ -62,11 +62,11 @@
     <Compile Include="Commands\ToggleLegendViewCommandTest.cs" />
     <Compile Include="Forms\ChartDataViewTest.cs" />
     <Compile Include="Legend\ChartDataCollectionTreeNodeInfoTest.cs" />
-    <Compile Include="Legend\PointDataTreeNodeInfoTest.cs" />
-    <Compile Include="Legend\AreaDataTreeNodeInfoTest.cs" />
-    <Compile Include="Legend\LegendViewTest.cs" />
-    <Compile Include="Legend\LegendControllerTest.cs" />
-    <Compile Include="Legend\LineDataTreeNodeInfoTest.cs" />
+    <Compile Include="Legend\ChartPointDataTreeNodeInfoTest.cs" />
+    <Compile Include="Legend\ChartAreaDataTreeNodeInfoTest.cs" />
+    <Compile Include="Legend\ChartLegendViewTest.cs" />
+    <Compile Include="Legend\ChartLegendControllerTest.cs" />
+    <Compile Include="Legend\ChartLineDataTreeNodeInfoTest.cs" />
     <Compile Include="OxyPlotGuiPluginTest.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
     <Compile Include="ChartingRibbonTest.cs" />
Fisheye: Tag 170ec8698dfed095e23f4fa822fe2198b3e5f242 refers to a dead (removed) revision in file `Core/Plugins/test/Core.Plugins.OxyPlot.Test/Legend/AreaDataTreeNodeInfoTest.cs'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: Core/Plugins/test/Core.Plugins.OxyPlot.Test/Legend/ChartAreaDataTreeNodeInfoTest.cs
===================================================================
diff -u
--- Core/Plugins/test/Core.Plugins.OxyPlot.Test/Legend/ChartAreaDataTreeNodeInfoTest.cs	(revision 0)
+++ Core/Plugins/test/Core.Plugins.OxyPlot.Test/Legend/ChartAreaDataTreeNodeInfoTest.cs	(revision 170ec8698dfed095e23f4fa822fe2198b3e5f242)
@@ -0,0 +1,190 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using Core.Common.Base;
+using Core.Common.Controls.TreeView;
+using Core.Common.TestUtil;
+using Core.Common.Utils.Reflection;
+using Core.Components.Charting.Data;
+using Core.Plugins.OxyPlot.Legend;
+using Core.Plugins.OxyPlot.Properties;
+using NUnit.Framework;
+using Rhino.Mocks;
+
+namespace Core.Plugins.OxyPlot.Test.Legend
+{
+    [TestFixture]
+    public class ChartAreaDataTreeNodeInfoTest
+    {
+        private MockRepository mocks;
+        private ChartLegendView chartLegendView;
+        private TreeNodeInfo info;
+
+        [SetUp]
+        public void SetUp()
+        {
+            mocks = new MockRepository();
+            chartLegendView = new ChartLegendView();
+
+            var treeViewControl = TypeUtils.GetField<TreeViewControl>(chartLegendView, "treeViewControl");
+            var treeNodeInfoLookup = TypeUtils.GetField<Dictionary<Type, TreeNodeInfo>>(treeViewControl, "tagTypeTreeNodeInfoLookup");
+
+            info = treeNodeInfoLookup[typeof(ChartAreaData)];
+        }
+
+        [TearDown]
+        public void TearDown()
+        {
+            chartLegendView.Dispose();
+        }
+
+        [Test]
+        public void Initialized_Always_ExpectedPropertiesSet()
+        {
+            // Assert
+            Assert.AreEqual(typeof(ChartAreaData), info.TagType);
+            Assert.IsNull(info.ForeColor);
+            Assert.IsNull(info.ContextMenuStrip);
+            Assert.IsNull(info.EnsureVisibleOnCreate);
+            Assert.IsNull(info.ChildNodeObjects);
+            Assert.IsNull(info.CanRename);
+            Assert.IsNull(info.OnNodeRenamed);
+            Assert.IsNull(info.CanRemove);
+            Assert.IsNull(info.OnNodeRemoved);
+            Assert.IsNull(info.CanDrop);
+            Assert.IsNull(info.CanInsert);
+            Assert.IsNull(info.OnDrop);
+        }
+
+        [Test]
+        public void Text_Always_ReturnsNameFromChartData()
+        {
+            // Setup
+            var areaData = mocks.StrictMock<ChartAreaData>(Enumerable.Empty<Tuple<double, double>>(), "test data");
+
+            mocks.ReplayAll();
+
+            // Call
+            var text = info.Text(areaData);
+
+            // Assert
+            Assert.AreEqual(areaData.Name, text);
+
+            mocks.VerifyAll();
+        }
+
+        [Test]
+        public void Image_Always_ReturnsSetImage()
+        {
+            // Setup
+            var areaData = mocks.StrictMock<ChartAreaData>(Enumerable.Empty<Tuple<double, double>>(), "test data");
+
+            mocks.ReplayAll();
+
+            // Call
+            var image = info.Image(areaData);
+
+            // Assert
+            TestHelper.AssertImagesAreEqual(Resources.AreaIcon, image);
+
+            mocks.VerifyAll();
+        }
+
+        [Test]
+        public void CanDrag_Always_ReturnsTrue()
+        {
+            // Setup
+            var areaData = mocks.StrictMock<ChartAreaData>(Enumerable.Empty<Tuple<double, double>>(), "test data");
+
+            mocks.ReplayAll();
+
+            // Call
+            var canDrag = info.CanDrag(areaData, null);
+
+            // Assert
+            Assert.IsTrue(canDrag);
+
+            mocks.VerifyAll();
+        }
+
+        [Test]
+        public void CanCheck_Always_ReturnsTrue()
+        {
+            // Setup
+            var areaData = mocks.StrictMock<ChartAreaData>(Enumerable.Empty<Tuple<double, double>>(), "test data");
+
+            mocks.ReplayAll();
+
+            // Call
+            var canCheck = info.CanCheck(areaData);
+
+            // Assert
+            Assert.IsTrue(canCheck);
+
+            mocks.VerifyAll();
+        }
+
+        [TestCase(true)]
+        [TestCase(false)]
+        public void IsChecked_Always_ReturnsAccordingToVisibleStateOfAreaData(bool isVisible)
+        {
+            // Setup
+            var areaData = mocks.StrictMock<ChartAreaData>(Enumerable.Empty<Tuple<double, double>>(), "test data");
+
+            areaData.IsVisible = isVisible;
+
+            mocks.ReplayAll();
+
+            // Call
+            var canCheck = info.IsChecked(areaData);
+
+            // Assert
+            Assert.AreEqual(isVisible, canCheck);
+
+            mocks.VerifyAll();
+        }
+
+        [TestCase(true)]
+        [TestCase(false)]
+        public void OnNodeChecked_AreaDataNodeWithoutParent_SetsAreaDataVisibility(bool initialVisibleState)
+        {
+            // Setup
+            var areaData = mocks.StrictMock<ChartAreaData>(Enumerable.Empty<Tuple<double, double>>(), "test data");
+
+            mocks.ReplayAll();
+
+            areaData.IsVisible = initialVisibleState;
+
+            // Call
+            info.OnNodeChecked(areaData, null);
+
+            // Assert
+            Assert.AreEqual(!initialVisibleState, areaData.IsVisible);
+
+            mocks.VerifyAll();
+        }
+
+        [TestCase(true)]
+        [TestCase(false)]
+        public void OnNodeChecked_AreaDataNodeWithObservableParent_SetsAreaDataVisibilityAndNotifiesParentObservers(bool initialVisibleState)
+        {
+            // Setup
+            var observable = mocks.StrictMock<IObservable>();
+            var areaData = mocks.StrictMock<ChartAreaData>(Enumerable.Empty<Tuple<double, double>>(), "test data");
+
+            observable.Expect(o => o.NotifyObservers());
+
+            mocks.ReplayAll();
+
+            areaData.IsVisible = initialVisibleState;
+
+            // Call
+            info.OnNodeChecked(areaData, observable);
+
+            // Assert
+            Assert.AreEqual(!initialVisibleState, areaData.IsVisible);
+
+            mocks.VerifyAll();
+        }
+    }
+}
\ No newline at end of file
Index: Core/Plugins/test/Core.Plugins.OxyPlot.Test/Legend/ChartDataCollectionTreeNodeInfoTest.cs
===================================================================
diff -u -r8aa11a9aa48733a5b5b72c58c71674472825b26c -r170ec8698dfed095e23f4fa822fe2198b3e5f242
--- Core/Plugins/test/Core.Plugins.OxyPlot.Test/Legend/ChartDataCollectionTreeNodeInfoTest.cs	(.../ChartDataCollectionTreeNodeInfoTest.cs)	(revision 8aa11a9aa48733a5b5b72c58c71674472825b26c)
+++ Core/Plugins/test/Core.Plugins.OxyPlot.Test/Legend/ChartDataCollectionTreeNodeInfoTest.cs	(.../ChartDataCollectionTreeNodeInfoTest.cs)	(revision 170ec8698dfed095e23f4fa822fe2198b3e5f242)
@@ -18,16 +18,16 @@
     public class ChartDataCollectionTreeNodeInfoTest
     {
         private MockRepository mocks;
-        private LegendView legendView;
+        private ChartLegendView chartLegendView;
         private TreeNodeInfo info;
 
         [SetUp]
         public void SetUp()
         {
             mocks = new MockRepository();
-            legendView = new LegendView();
+            chartLegendView = new ChartLegendView();
 
-            var treeViewControl = TypeUtils.GetField<TreeViewControl>(legendView, "treeViewControl");
+            var treeViewControl = TypeUtils.GetField<TreeViewControl>(chartLegendView, "treeViewControl");
             var treeNodeInfoLookup = TypeUtils.GetField<Dictionary<Type, TreeNodeInfo>>(treeViewControl, "tagTypeTreeNodeInfoLookup");
 
             info = treeNodeInfoLookup[typeof(ChartDataCollection)];
@@ -36,7 +36,7 @@
         [TearDown]
         public void TearDown()
         {
-            legendView.Dispose();
+            chartLegendView.Dispose();
         }
 
         [Test]
@@ -58,7 +58,7 @@
         }
 
         [Test]
-        public void Text_Always_ReturnsTextFromResource()
+        public void Text_Always_ReturnsNameFromChartData()
         {
             // Setup
             var chartDataCollection = mocks.StrictMock<ChartDataCollection>(new List<ChartData>(), "test data");
@@ -69,7 +69,7 @@
             var text = info.Text(chartDataCollection);
 
             // Assert
-            Assert.AreEqual(Resources.General_Chart, text);
+            Assert.AreEqual(chartDataCollection.Name, text);
 
             mocks.VerifyAll();
         }
Index: Core/Plugins/test/Core.Plugins.OxyPlot.Test/Legend/ChartLegendControllerTest.cs
===================================================================
diff -u
--- Core/Plugins/test/Core.Plugins.OxyPlot.Test/Legend/ChartLegendControllerTest.cs	(revision 0)
+++ Core/Plugins/test/Core.Plugins.OxyPlot.Test/Legend/ChartLegendControllerTest.cs	(revision 170ec8698dfed095e23f4fa822fe2198b3e5f242)
@@ -0,0 +1,97 @@
+using System;
+using Core.Common.Gui;
+using Core.Plugins.OxyPlot.Legend;
+using NUnit.Framework;
+using Rhino.Mocks;
+
+namespace Core.Plugins.OxyPlot.Test.Legend
+{
+    [TestFixture]
+    public class ChartLegendControllerTest
+    {
+        [Test]
+        public void Constructor_WithoutPlugin_ThrowsArgumentNullException()
+        {
+            // Call
+            TestDelegate test = () => new ChartLegendController(null);
+
+            // Assert
+            Assert.Throws<ArgumentNullException>(test);
+        }
+
+        [Test]
+        public void Constructor_WithToolViewController_DoesNotThrow()
+        {
+            // Setup
+            var mocks = new MockRepository();
+            var toolViewController = mocks.StrictMock<IToolViewController>();
+
+            mocks.ReplayAll();
+
+            // Call
+            TestDelegate test = () => new ChartLegendController(toolViewController);
+
+            // Assert
+            Assert.DoesNotThrow(test);
+            mocks.VerifyAll();
+        }
+
+        [Test]
+        [TestCase(true)]
+        [TestCase(false)]
+        public void IsLegendViewOpen_LegendViewOpenAndClosedState_ReturnsExpectedState(bool open)
+        {
+            // Setup
+            var mocks = new MockRepository();
+            var toolViewController = mocks.StrictMock<IToolViewController>();
+            toolViewController.Expect(p => p.IsToolWindowOpen<ChartLegendView>()).Return(open);
+
+            mocks.ReplayAll();
+
+            var controller = new ChartLegendController(toolViewController);
+
+            // Call
+            var result = controller.IsLegendViewOpen();
+
+            // Assert
+            Assert.AreEqual(open, result);
+            mocks.VerifyAll();
+        }
+
+        [Test]
+        [TestCase(true)]
+        [TestCase(false)]
+        public void ToggleLegendView_LegendViewOpenAndClosedState_TogglesStateOfLegendView(bool open)
+        {
+            // Setup
+            var mocks = new MockRepository();
+            var toolViewController = mocks.StrictMock<IToolViewController>();
+            if (open)
+            {
+                toolViewController.Expect(p => p.IsToolWindowOpen<ChartLegendView>()).Return(false);
+                toolViewController.Expect(p => p.OpenToolView(Arg<ChartLegendView>.Matches(c => true)));
+                toolViewController.Expect(p => p.CloseToolView(Arg<ChartLegendView>.Matches(c => true)));
+            }
+            else
+            {
+                toolViewController.Expect(p => p.OpenToolView(Arg<ChartLegendView>.Matches(c => true)));
+            }
+            toolViewController.Expect(p => p.IsToolWindowOpen<ChartLegendView>()).Return(open);
+
+            mocks.ReplayAll();
+
+            var controller = new ChartLegendController(toolViewController);
+
+            if (open)
+            {
+                controller.ToggleLegend();
+            }
+
+            // Call
+            controller.ToggleLegend();
+
+            // Assert
+            mocks.VerifyAll();
+        }
+    }
+}
\ No newline at end of file
Index: Core/Plugins/test/Core.Plugins.OxyPlot.Test/Legend/ChartLegendViewTest.cs
===================================================================
diff -u
--- Core/Plugins/test/Core.Plugins.OxyPlot.Test/Legend/ChartLegendViewTest.cs	(revision 0)
+++ Core/Plugins/test/Core.Plugins.OxyPlot.Test/Legend/ChartLegendViewTest.cs	(revision 170ec8698dfed095e23f4fa822fe2198b3e5f242)
@@ -0,0 +1,95 @@
+using System;
+using System.Collections.Generic;
+using System.Windows.Forms;
+using Core.Common.Controls.TreeView;
+using Core.Common.Controls.Views;
+using Core.Common.Utils.Reflection;
+using Core.Components.Charting.Data;
+using Core.Plugins.OxyPlot.Legend;
+using Core.Plugins.OxyPlot.Properties;
+using NUnit.Framework;
+
+namespace Core.Plugins.OxyPlot.Test.Legend
+{
+    [TestFixture]
+    public class ChartLegendViewTest
+    {
+        [Test]
+        public void DefaultConstructor_CreatesUserControl()
+        {
+            // Call 
+            using (var view = new ChartLegendView())
+            {
+                // Assert
+                Assert.IsInstanceOf<UserControl>(view);
+                Assert.IsInstanceOf<IView>(view);
+                Assert.IsNull(view.Data);
+                Assert.AreEqual(Resources.General_Chart, view.Text);
+            }
+        }
+
+        [Test]
+        public void Data_ChartControl_DataSet()
+        {
+            // Setup 
+            using (var view = new ChartLegendView())
+            {
+                var chartDataCollection = new ChartDataCollection(new List<ChartData>(), "test data");
+
+                // Call
+                view.Data = chartDataCollection;
+
+                // Assert
+                Assert.AreSame(chartDataCollection, view.Data);
+            }
+        }
+
+        [Test]
+        public void Data_ForNull_NullSet()
+        {
+            // Setup 
+            using (var view = new ChartLegendView())
+            {
+                // Call
+                view.Data = null;
+
+                // Assert
+                Assert.IsNull(view.Data);
+            }
+        }
+
+        [Test]
+        public void Data_OtherObject_ThrowsInvalidCastException()
+        {
+            // Setup 
+            using (var view = new ChartLegendView())
+            {
+                // Call
+                TestDelegate test = () => view.Data = new object();
+
+                // Assert
+                Assert.Throws<InvalidCastException>(test);
+            }
+        }
+
+        [Test]
+        public void Dispose_Always_DataSetToNull()
+        {
+            // Setup
+            var legendView = new ChartLegendView
+            {
+                Data = new ChartDataCollection(new List<ChartData>(), "test data")
+            };
+
+            var treeViewControl = TypeUtils.GetField<TreeViewControl>(legendView, "treeViewControl");
+
+            // Call
+            legendView.Dispose();
+
+            // Assert
+            Assert.IsNull(legendView.Data);
+            Assert.IsNull(treeViewControl.Data);
+            Assert.IsTrue(treeViewControl.IsDisposed);
+        }
+    }
+}
\ No newline at end of file
Index: Core/Plugins/test/Core.Plugins.OxyPlot.Test/Legend/ChartLineDataTreeNodeInfoTest.cs
===================================================================
diff -u
--- Core/Plugins/test/Core.Plugins.OxyPlot.Test/Legend/ChartLineDataTreeNodeInfoTest.cs	(revision 0)
+++ Core/Plugins/test/Core.Plugins.OxyPlot.Test/Legend/ChartLineDataTreeNodeInfoTest.cs	(revision 170ec8698dfed095e23f4fa822fe2198b3e5f242)
@@ -0,0 +1,190 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using Core.Common.Base;
+using Core.Common.Controls.TreeView;
+using Core.Common.TestUtil;
+using Core.Common.Utils.Reflection;
+using Core.Components.Charting.Data;
+using Core.Plugins.OxyPlot.Legend;
+using Core.Plugins.OxyPlot.Properties;
+using NUnit.Framework;
+using Rhino.Mocks;
+
+namespace Core.Plugins.OxyPlot.Test.Legend
+{
+    [TestFixture]
+    public class ChartLineDataTreeNodeInfoTest
+    {
+        private MockRepository mocks;
+        private ChartLegendView chartLegendView;
+        private TreeNodeInfo info;
+
+        [SetUp]
+        public void SetUp()
+        {
+            mocks = new MockRepository();
+            chartLegendView = new ChartLegendView();
+
+            var treeViewControl = TypeUtils.GetField<TreeViewControl>(chartLegendView, "treeViewControl");
+            var treeNodeInfoLookup = TypeUtils.GetField<Dictionary<Type, TreeNodeInfo>>(treeViewControl, "tagTypeTreeNodeInfoLookup");
+
+            info = treeNodeInfoLookup[typeof(ChartLineData)];
+        }
+
+        [TearDown]
+        public void TearDown()
+        {
+            chartLegendView.Dispose();
+        }
+
+        [Test]
+        public void Initialized_Always_ExpectedPropertiesSet()
+        {
+            // Assert
+            Assert.AreEqual(typeof(ChartLineData), info.TagType);
+            Assert.IsNull(info.ForeColor);
+            Assert.IsNull(info.ContextMenuStrip);
+            Assert.IsNull(info.EnsureVisibleOnCreate);
+            Assert.IsNull(info.ChildNodeObjects);
+            Assert.IsNull(info.CanRename);
+            Assert.IsNull(info.OnNodeRenamed);
+            Assert.IsNull(info.CanRemove);
+            Assert.IsNull(info.OnNodeRemoved);
+            Assert.IsNull(info.CanDrop);
+            Assert.IsNull(info.CanInsert);
+            Assert.IsNull(info.OnDrop);
+        }
+
+        [Test]
+        public void Text_Always_ReturnsNameFromChartData()
+        {
+            // Setup
+            var lineData = mocks.StrictMock<ChartLineData>(Enumerable.Empty<Tuple<double, double>>(), "test data");
+
+            mocks.ReplayAll();
+
+            // Call
+            var text = info.Text(lineData);
+
+            // Assert
+            Assert.AreEqual(lineData.Name, text);
+
+            mocks.VerifyAll();
+        }
+
+        [Test]
+        public void Image_Always_ReturnsSetImage()
+        {
+            // Setup
+            var lineData = mocks.StrictMock<ChartLineData>(Enumerable.Empty<Tuple<double, double>>(), "test data");
+
+            mocks.ReplayAll();
+
+            // Call
+            var image = info.Image(lineData);
+
+            // Assert
+            TestHelper.AssertImagesAreEqual(Resources.LineIcon, image);
+
+            mocks.VerifyAll();
+        }
+
+        [Test]
+        public void CanDrag_Always_ReturnsTrue()
+        {
+            // Setup
+            var lineData = mocks.StrictMock<ChartLineData>(Enumerable.Empty<Tuple<double, double>>(), "test data");
+
+            mocks.ReplayAll();
+
+            // Call
+            var canDrag = info.CanDrag(lineData, null);
+
+            // Assert
+            Assert.IsTrue(canDrag);
+
+            mocks.VerifyAll();
+        }
+
+        [Test]
+        public void CanCheck_Always_ReturnsTrue()
+        {
+            // Setup
+            var lineData = mocks.StrictMock<ChartLineData>(Enumerable.Empty<Tuple<double, double>>(), "test data");
+
+            mocks.ReplayAll();
+
+            // Call
+            var canCheck = info.CanCheck(lineData);
+
+            // Assert
+            Assert.IsTrue(canCheck);
+
+            mocks.VerifyAll();
+        }
+
+        [TestCase(true)]
+        [TestCase(false)]
+        public void IsChecked_Always_ReturnsAccordingToVisibleStateOfLineData(bool isVisible)
+        {
+            // Setup
+            var lineData = mocks.StrictMock<ChartLineData>(Enumerable.Empty<Tuple<double, double>>(), "test data");
+
+            lineData.IsVisible = isVisible;
+
+            mocks.ReplayAll();
+
+            // Call
+            var canCheck = info.IsChecked(lineData);
+
+            // Assert
+            Assert.AreEqual(isVisible, canCheck);
+
+            mocks.VerifyAll();
+        }
+
+        [TestCase(true)]
+        [TestCase(false)]
+        public void LineDataNodeWithoutParent_SetsLineDataVisibility(bool initialVisibleState)
+        {
+            // Setup
+            var lineData = mocks.StrictMock<ChartLineData>(Enumerable.Empty<Tuple<double, double>>(), "test data");
+
+            mocks.ReplayAll();
+
+            lineData.IsVisible = initialVisibleState;
+
+            // Call
+            info.OnNodeChecked(lineData, null);
+
+            // Assert
+            Assert.AreEqual(!initialVisibleState, lineData.IsVisible);
+
+            mocks.VerifyAll();
+        }
+
+        [TestCase(true)]
+        [TestCase(false)]
+        public void OnNodeChecked_LineDataNodeWithObservableParent_SetsLineDataVisibilityAndNotifiesParentObservers(bool initialVisibleState)
+        {
+            // Setup
+            var observable = mocks.StrictMock<IObservable>();
+            var lineData = mocks.StrictMock<ChartLineData>(Enumerable.Empty<Tuple<double, double>>(), "test data");
+
+            observable.Expect(o => o.NotifyObservers());
+
+            mocks.ReplayAll();
+
+            lineData.IsVisible = initialVisibleState;
+
+            // Call
+            info.OnNodeChecked(lineData, observable);
+
+            // Assert
+            Assert.AreEqual(!initialVisibleState, lineData.IsVisible);
+
+            mocks.VerifyAll();
+        }
+    }
+}
\ No newline at end of file
Index: Core/Plugins/test/Core.Plugins.OxyPlot.Test/Legend/ChartPointDataTreeNodeInfoTest.cs
===================================================================
diff -u
--- Core/Plugins/test/Core.Plugins.OxyPlot.Test/Legend/ChartPointDataTreeNodeInfoTest.cs	(revision 0)
+++ Core/Plugins/test/Core.Plugins.OxyPlot.Test/Legend/ChartPointDataTreeNodeInfoTest.cs	(revision 170ec8698dfed095e23f4fa822fe2198b3e5f242)
@@ -0,0 +1,190 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using Core.Common.Base;
+using Core.Common.Controls.TreeView;
+using Core.Common.TestUtil;
+using Core.Common.Utils.Reflection;
+using Core.Components.Charting.Data;
+using Core.Plugins.OxyPlot.Legend;
+using Core.Plugins.OxyPlot.Properties;
+using NUnit.Framework;
+using Rhino.Mocks;
+
+namespace Core.Plugins.OxyPlot.Test.Legend
+{
+    [TestFixture]
+    public class ChartPointDataTreeNodeInfoTest
+    {
+        private MockRepository mocks;
+        private ChartLegendView chartLegendView;
+        private TreeNodeInfo info;
+
+        [SetUp]
+        public void SetUp()
+        {
+            mocks = new MockRepository();
+            chartLegendView = new ChartLegendView();
+
+            var treeViewControl = TypeUtils.GetField<TreeViewControl>(chartLegendView, "treeViewControl");
+            var treeNodeInfoLookup = TypeUtils.GetField<Dictionary<Type, TreeNodeInfo>>(treeViewControl, "tagTypeTreeNodeInfoLookup");
+
+            info = treeNodeInfoLookup[typeof(ChartPointData)];
+        }
+
+        [TearDown]
+        public void TearDown()
+        {
+            chartLegendView.Dispose();
+        }
+
+        [Test]
+        public void Initialized_Always_ExpectedPropertiesSet()
+        {
+            // Assert
+            Assert.AreEqual(typeof(ChartPointData), info.TagType);
+            Assert.IsNull(info.ForeColor);
+            Assert.IsNull(info.ContextMenuStrip);
+            Assert.IsNull(info.EnsureVisibleOnCreate);
+            Assert.IsNull(info.ChildNodeObjects);
+            Assert.IsNull(info.CanRename);
+            Assert.IsNull(info.OnNodeRenamed);
+            Assert.IsNull(info.CanRemove);
+            Assert.IsNull(info.OnNodeRemoved);
+            Assert.IsNull(info.CanDrop);
+            Assert.IsNull(info.CanInsert);
+            Assert.IsNull(info.OnDrop);
+        }
+
+        [Test]
+        public void Text_Always_ReturnsNameFromChartData()
+        {
+            // Setup
+            var pointData = mocks.StrictMock<ChartPointData>(Enumerable.Empty<Tuple<double, double>>(), "test data");
+
+            mocks.ReplayAll();
+
+            // Call
+            var text = info.Text(pointData);
+
+            // Assert
+            Assert.AreEqual(pointData.Name, text);
+
+            mocks.VerifyAll();
+        }
+
+        [Test]
+        public void Image_Always_ReturnsSetImage()
+        {
+            // Setup
+            var pointData = mocks.StrictMock<ChartPointData>(Enumerable.Empty<Tuple<double, double>>(), "test data");
+
+            mocks.ReplayAll();
+
+            // Call
+            var image = info.Image(pointData);
+
+            // Assert
+            TestHelper.AssertImagesAreEqual(Resources.PointsIcon, image);
+
+            mocks.VerifyAll();
+        }
+
+        [Test]
+        public void CanDrag_Always_ReturnsTrue()
+        {
+            // Setup
+            var pointData = mocks.StrictMock<ChartPointData>(Enumerable.Empty<Tuple<double, double>>(), "test data");
+
+            mocks.ReplayAll();
+
+            // Call
+            var canDrag = info.CanDrag(pointData, null);
+
+            // Assert
+            Assert.IsTrue(canDrag);
+
+            mocks.VerifyAll();
+        }
+
+        [Test]
+        public void CanCheck_Always_ReturnsTrue()
+        {
+            // Setup
+            var pointData = mocks.StrictMock<ChartPointData>(Enumerable.Empty<Tuple<double, double>>(), "test data");
+
+            mocks.ReplayAll();
+
+            // Call
+            var canCheck = info.CanCheck(pointData);
+
+            // Assert
+            Assert.IsTrue(canCheck);
+
+            mocks.VerifyAll();
+        }
+
+        [TestCase(true)]
+        [TestCase(false)]
+        public void IsChecked_Always_ReturnsAccordingToVisibleStateOfPointsData(bool isVisible)
+        {
+            // Setup
+            var pointData = mocks.StrictMock<ChartPointData>(Enumerable.Empty<Tuple<double, double>>(), "test data");
+
+            pointData.IsVisible = isVisible;
+
+            mocks.ReplayAll();
+
+            // Call
+            var canCheck = info.IsChecked(pointData);
+
+            // Assert
+            Assert.AreEqual(isVisible, canCheck);
+
+            mocks.VerifyAll();
+        }
+
+        [TestCase(true)]
+        [TestCase(false)]
+        public void PointDataNodeWithoutParent_SetsPointDataVisibility(bool initialVisibleState)
+        {
+            // Setup
+            var pointData = mocks.StrictMock<ChartPointData>(Enumerable.Empty<Tuple<double, double>>(), "test data");
+
+            mocks.ReplayAll();
+
+            pointData.IsVisible = initialVisibleState;
+
+            // Call
+            info.OnNodeChecked(pointData, null);
+
+            // Assert
+            Assert.AreEqual(!initialVisibleState, pointData.IsVisible);
+
+            mocks.VerifyAll();
+        }
+
+        [TestCase(true)]
+        [TestCase(false)]
+        public void OnNodeChecked_PointDataNodeWithObservableParent_SetsPointDataVisibilityAndNotifiesParentObservers(bool initialVisibleState)
+        {
+            // Setup
+            var observable = mocks.StrictMock<IObservable>();
+            var pointData = mocks.StrictMock<ChartPointData>(Enumerable.Empty<Tuple<double, double>>(), "test data");
+
+            observable.Expect(o => o.NotifyObservers());
+
+            mocks.ReplayAll();
+
+            pointData.IsVisible = initialVisibleState;
+
+            // Call
+            info.OnNodeChecked(pointData, observable);
+
+            // Assert
+            Assert.AreEqual(!initialVisibleState, pointData.IsVisible);
+
+            mocks.VerifyAll();
+        }
+    }
+}
\ No newline at end of file
Fisheye: Tag 170ec8698dfed095e23f4fa822fe2198b3e5f242 refers to a dead (removed) revision in file `Core/Plugins/test/Core.Plugins.OxyPlot.Test/Legend/LegendControllerTest.cs'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 170ec8698dfed095e23f4fa822fe2198b3e5f242 refers to a dead (removed) revision in file `Core/Plugins/test/Core.Plugins.OxyPlot.Test/Legend/LegendViewTest.cs'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 170ec8698dfed095e23f4fa822fe2198b3e5f242 refers to a dead (removed) revision in file `Core/Plugins/test/Core.Plugins.OxyPlot.Test/Legend/LineDataTreeNodeInfoTest.cs'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 170ec8698dfed095e23f4fa822fe2198b3e5f242 refers to a dead (removed) revision in file `Core/Plugins/test/Core.Plugins.OxyPlot.Test/Legend/PointDataTreeNodeInfoTest.cs'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: Core/Plugins/test/Core.Plugins.OxyPlot.Test/OxyPlotGuiPluginTest.cs
===================================================================
diff -u -r8aa11a9aa48733a5b5b72c58c71674472825b26c -r170ec8698dfed095e23f4fa822fe2198b3e5f242
--- Core/Plugins/test/Core.Plugins.OxyPlot.Test/OxyPlotGuiPluginTest.cs	(.../OxyPlotGuiPluginTest.cs)	(revision 8aa11a9aa48733a5b5b72c58c71674472825b26c)
+++ Core/Plugins/test/Core.Plugins.OxyPlot.Test/OxyPlotGuiPluginTest.cs	(.../OxyPlotGuiPluginTest.cs)	(revision 170ec8698dfed095e23f4fa822fe2198b3e5f242)
@@ -77,9 +77,9 @@
             {
                 var gui = mocks.StrictMock<IGui>();
 
-                gui.Stub(g => g.IsToolWindowOpen<LegendView>()).Return(false);
+                gui.Stub(g => g.IsToolWindowOpen<ChartLegendView>()).Return(false);
 
-                gui.Expect(g => g.OpenToolView(Arg<LegendView>.Matches(c => true)));
+                gui.Expect(g => g.OpenToolView(Arg<ChartLegendView>.Matches(c => true)));
                 gui.Expect(g => g.ActiveViewChanged += null).IgnoreArguments();
                 gui.Expect(g => g.ActiveViewChanged -= null).IgnoreArguments();
                 gui.Expect(g => g.ActiveView).Return(view);