Some small corrections in new constraints functionality

Author: yurii-litvinov

src/EditorPluginInterfaces/PluginConfig.cs

@@ -56,12 +56,12 @@ public class PluginConfig
         /// <summary>
         /// Allows plugin to subscribe to the model change.
         /// </summary>
-        public Action<String> OnMainModelChanged;
+        public Action<string> OnMainModelChanged;
 
         /// <summary>
         /// Allows plugin to remove model selector from the editor.
         /// </summary>
-        public Action<bool> ChangeSelectorVisibility;
+        public Action<bool> ChangeModelSelectorVisibility;
 
         /// <summary>
         /// Allows plugin to change model in the editor.
@@ -77,6 +77,8 @@ public class PluginConfig
         /// <param name="toolbar">Toolbar</param>
         /// <param name="console">Console</param>
         /// <param name="palette">Palette</param>
+        /// <param name="leftPanelGrid">Grid where left panel elements are located. Empty by default, but plugins can 
+        ///     use it to add some new tools.</param>
         public PluginConfig(IModel model, IScene scene, IToolbar toolbar, IConsole console, IPalette palette, Grid leftPanelGrid)
         {
             this.Model = model;

src/Repo/Repo.fsproj

@@ -102,13 +102,9 @@
     <Compile Include="FacadeLayer\Repo.fs" />
     <Compile Include="RepoFactory.fs" />
     <Content Include="app.config" />
-    <Content Include="packages.config" />
   </ItemGroup>
   <ItemGroup>
     <Reference Include="mscorlib" />
-    <Reference Include="Newtonsoft.Json">
-      <HintPath>..\..\packages\Newtonsoft.Json.12.0.1\lib\net45\Newtonsoft.Json.dll</HintPath>
-    </Reference>
     <Reference Include="System" />
     <Reference Include="System.Core" />
     <Reference Include="System.IO.Compression" />
@@ -126,6 +122,14 @@
     </When>
   </Choose>
   <Choose>
-    <When Condition="$(TargetFrameworkIdentifier) == '.NETFramework' And $(TargetFrameworkVersion) == 'v4.6.1'" />
+    <When Condition="$(TargetFrameworkIdentifier) == '.NETFramework' And $(TargetFrameworkVersion) == 'v4.6.1'">
+      <ItemGroup>
+        <Reference Include="Newtonsoft.Json">
+          <HintPath>..\..\packages\Newtonsoft.Json\lib\net45\Newtonsoft.Json.dll</HintPath>
+          <Private>True</Private>
+          <Paket>True</Paket>
+        </Reference>
+      </ItemGroup>
+    </When>
   </Choose>
 </Project>

src/WpfControlsLib/Model/Model.cs

@@ -169,9 +169,7 @@ public void RemoveElement(Repo.IElement element)
         }
 
         public void SetElementAllowed(Repo.IElement element, bool isAllowed)
-        {
-            this.RaiseElementCheck(element, isAllowed);
-        }
+            => this.RaiseElementCheck(element, isAllowed);
 
         private void RaiseNewVertex(Repo.INode node)
         {

src/WpfControlsLib/ViewModel/EdgeViewModel.cs

@@ -12,9 +12,12 @@ public class EdgeViewModel : EdgeBase<NodeViewModel>, INotifyPropertyChanged, IG
     {
         private EdgeTypeEnum edgeType = EdgeTypeEnum.Association;
         private IList<AttributeViewModel> attributes = new List<AttributeViewModel>();
-        private SolidColorBrush brush = new SolidColorBrush(Colors.Blue);
+        private SolidColorBrush brush = Brushes.Blue;
         private bool isAllowed = true;
 
+        private static readonly SolidColorBrush invalidEdgeBrush = Brushes.Red;
+        private static readonly SolidColorBrush defaultEdgeBrush = Brushes.Blue;
+
         private string text;
 
         public EdgeViewModel(NodeViewModel source, NodeViewModel target, double weight = 1)
@@ -57,7 +60,8 @@ public bool IsAllowed
             set
             {
                 this.isAllowed = value;
-                this.Color = value ? new SolidColorBrush(Colors.Blue) : new SolidColorBrush(Colors.Red);
+                // TODO: Color property can be set by an user, and user color will be forgotten after IsAllowed change.
+                this.Color = value ? defaultEdgeBrush : invalidEdgeBrush;
             }
         }
 

src/WpfEditor/View/MainWindow.xaml.cs

@@ -133,14 +133,17 @@ private void InitAndLaunchPlugins()
             {
                 var dirs = new List<string>(System.IO.Directory.GetDirectories(plugindir + "/bin"));
                 var config = new PluginConfig(this.model, null, null, this.Console, null, this.leftPanelGrid);
-                config.ChangeSelectorVisibility = (x) => { this.modelSelector.SelectorVisibility = x; };
+                config.ChangeModelSelectorVisibility = (x) => { this.modelSelector.SelectorVisibility = x; };
                 config.ChangeModel = this.SelectModel;
                 foreach (var dir in dirs)
                 {
                     libs.LaunchPlugins(dir, config);
                 }
+
                 if (config.OnMainModelChanged != null)
+                {
                     this.OnModelChanged += new Action<string>(config.OnMainModelChanged);
+                }
             }
         }
 

src/WpfEditor/WpfEditor.csproj

@@ -49,9 +49,6 @@
     <Prefer32Bit>true</Prefer32Bit>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="FSharp.Core, Version=4.6.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\FSharp.Core.4.6.2\lib\net45\FSharp.Core.dll</HintPath>
-    </Reference>
     <Reference Include="System" />
     <Reference Include="System.Data" />
     <Reference Include="System.Xml" />
@@ -116,7 +113,6 @@
       <Generator>ResXFileCodeGenerator</Generator>
       <LastGenOutput>Resources.Designer.cs</LastGenOutput>
     </EmbeddedResource>
-    <None Include="packages.config" />
     <None Include="paket.references" />
     <None Include="Properties\Settings.settings">
       <Generator>SettingsSingleFileGenerator</Generator>
@@ -177,7 +173,15 @@
     <Resource Include="View\Pictures\Toolbar\undo.png" />
   </ItemGroup>
   <Choose>
-    <When Condition="$(TargetFrameworkIdentifier) == '.NETFramework' And $(TargetFrameworkVersion) == 'v4.6.1'" />
+    <When Condition="$(TargetFrameworkIdentifier) == '.NETFramework' And $(TargetFrameworkVersion) == 'v4.6.1'">
+      <ItemGroup>
+        <Reference Include="FSharp.Core">
+          <HintPath>..\..\packages\FSharp.Core\lib\net45\FSharp.Core.dll</HintPath>
+          <Private>True</Private>
+          <Paket>True</Paket>
+        </Reference>
+      </ItemGroup>
+    </When>
   </Choose>
   <Choose>
     <When Condition="$(TargetFrameworkIdentifier) == '.NETFramework' And $(TargetFrameworkVersion) == 'v4.6.1'">