From d11eefaeab94db806785a8c825f788855731c1b4 Mon Sep 17 00:00:00 2001
From: Ben <ben-wallis@users.noreply.github.com>
Date: Fri, 24 Jul 2015 18:41:13 +0100
Subject: [PATCH] Fixed crash when pasting blocks with block groups assigned

---
 Filtration/Filtration.csproj                       |  1 -
 Filtration/ViewModels/ItemFilterScriptViewModel.cs | 13 ++++++++++---
 Filtration/WindsorInstallers/ModelsInstaller.cs    | 14 --------------
 3 files changed, 10 insertions(+), 18 deletions(-)
 delete mode 100644 Filtration/WindsorInstallers/ModelsInstaller.cs

diff --git a/Filtration/Filtration.csproj b/Filtration/Filtration.csproj
index 27dc850..998baa6 100644
--- a/Filtration/Filtration.csproj
+++ b/Filtration/Filtration.csproj
@@ -244,7 +244,6 @@
     <Compile Include="Views\UpdateAvailableView.xaml.cs">
       <DependentUpon>UpdateAvailableView.xaml</DependentUpon>
     </Compile>
-    <Compile Include="WindsorInstallers\ModelsInstaller.cs" />
     <Compile Include="WindsorInstallers\RepositoriesInstaller.cs" />
     <Compile Include="WindsorInstallers\ServicesInstaller.cs" />
     <Compile Include="WindsorInstallers\TranslatorsInstaller.cs" />
diff --git a/Filtration/ViewModels/ItemFilterScriptViewModel.cs b/Filtration/ViewModels/ItemFilterScriptViewModel.cs
index 707b065..54c1711 100644
--- a/Filtration/ViewModels/ItemFilterScriptViewModel.cs
+++ b/Filtration/ViewModels/ItemFilterScriptViewModel.cs
@@ -75,6 +75,7 @@ namespace Filtration.ViewModels
         private readonly IItemFilterPersistenceService _persistenceService;
         private readonly IMessageBoxService _messageBoxService;
         private readonly IClipboardService _clipboardService;
+        private readonly IBlockGroupHierarchyBuilder _blockGroupHierarchyBuilder;
 
         private bool _isDirty;
         private IItemFilterBlockViewModel _selectedBlockViewModel;
@@ -88,7 +89,8 @@ namespace Filtration.ViewModels
                                          IAvalonDockWorkspaceViewModel avalonDockWorkspaceViewModel,
                                          IItemFilterPersistenceService persistenceService,
                                          IMessageBoxService messageBoxService,
-                                         IClipboardService clipboardService)
+                                         IClipboardService clipboardService,
+                                         IBlockGroupHierarchyBuilder blockGroupHierarchyBuilder)
         {
             _itemFilterBlockViewModelFactory = itemFilterBlockViewModelFactory;
             _blockTranslator = blockTranslator;
@@ -97,6 +99,7 @@ namespace Filtration.ViewModels
             _persistenceService = persistenceService;
             _messageBoxService = messageBoxService;
             _clipboardService = clipboardService;
+            _blockGroupHierarchyBuilder = blockGroupHierarchyBuilder;
             _itemFilterBlockViewModels = new ObservableCollection<IItemFilterBlockViewModel>();
             
             ToggleShowAdvancedCommand = new RelayCommand<bool>(OnToggleShowAdvancedCommand);
@@ -613,6 +616,7 @@ namespace Filtration.ViewModels
             {
                 var clipboardText = _clipboardService.GetClipboardText();
                 if (string.IsNullOrEmpty(clipboardText)) return;
+                _blockGroupHierarchyBuilder.Initialise(Script.ItemFilterBlockGroups.First());
 
                 var translatedBlock = _blockTranslator.TranslateStringToItemFilterBlock(clipboardText, Script.ThemeComponents);
                 if (translatedBlock == null) return;
@@ -638,9 +642,12 @@ namespace Filtration.ViewModels
             catch (Exception e)
             {
                 _logger.Error(e);
+                var innerException = e.InnerException != null
+                    ? e.InnerException.Message
+                    : string.Empty;
+
                 _messageBoxService.Show("Paste Error",
-                    e.Message + Environment.NewLine + e.StackTrace + Environment.NewLine +
-                    e.InnerException.Message + Environment.NewLine + e.InnerException.StackTrace, MessageBoxButton.OK,
+                    e.Message + Environment.NewLine + innerException, MessageBoxButton.OK,
                     MessageBoxImage.Error);
             }
         }
diff --git a/Filtration/WindsorInstallers/ModelsInstaller.cs b/Filtration/WindsorInstallers/ModelsInstaller.cs
deleted file mode 100644
index 768d433..0000000
--- a/Filtration/WindsorInstallers/ModelsInstaller.cs
+++ /dev/null
@@ -1,14 +0,0 @@
-using Castle.MicroKernel.Registration;
-using Castle.MicroKernel.SubSystems.Configuration;
-using Castle.Windsor;
-
-namespace Filtration.WindsorInstallers
-{
-    public class ModelsInstaller : IWindsorInstaller
-    {
-        public void Install(IWindsorContainer container, IConfigurationStore store)
-        {
-
-        }
-    }
-}