Performance fixes

chandramouleswaran · Sep 8, 2013 · 7356beb · 7356beb
1 parent 84234a7
commit 7356beb
Show file tree

Hide file tree

Showing 4 changed files with 32 additions and 27 deletions.
diff --git a/Src/Test/Wide-MD/MDWorkspace.cs b/Src/Test/Wide-MD/MDWorkspace.cs
@@ -25,10 +25,11 @@ namespace WideMD
     internal class MDWorkspace : AbstractWorkspace
     {
         private string _document;
+        private ILoggerService _logger;
         private const string _title = "Wide MD";
 
-        public MDWorkspace(IUnityContainer container, IEventAggregator eventAggregator, ILoggerService logger)
-            : base(container, eventAggregator, logger)
+        public MDWorkspace(IUnityContainer container, IEventAggregator eventAggregator)
+            : base(container, eventAggregator)
         {
             IEventAggregator aggregator = container.Resolve<IEventAggregator>();
             aggregator.GetEvent<ActiveContentChangedEvent>().Subscribe(ContentChanged);
@@ -57,16 +58,35 @@ public override string Title
             }
         }
 
+        private ILoggerService Logger
+        {
+            get
+            {
+                if (_logger == null)
+                    _logger = _container.Resolve<ILoggerService>();
+                return _logger;
+            }
+        }
+
         private void ContentChanged(ContentViewModel model)
         {
             _document = model == null ? "" : model.Title;
             RaisePropertyChanged("Title");
+            if(model != null)
+            {
+                Logger.Log("Active document changed to " + model.Title, LogCategory.Info, LogPriority.None);
+            }
         }
 
         protected override void ModelChangedEventHandler(object sender, PropertyChangedEventArgs e)
         {
-            ContentChanged(this.ActiveDocument);
-            base.ModelChangedEventHandler(sender, e);
+            string newValue = ActiveDocument == null ? "" : ActiveDocument.Title;
+            if (_document != newValue)
+            {
+                _document = newValue;
+                RaisePropertyChanged("Title");
+                base.ModelChangedEventHandler(sender, e);
+            }
         }
     }
 }
diff --git a/Src/Wide/Core/TextDocument/TextModel.cs b/Src/Wide/Core/TextDocument/TextModel.cs
@@ -66,11 +66,6 @@ protected internal set
                 {
                     OldText = Document.Text;
                 }
-                else
-                {
-                    _commandManager.Refresh();
-                    _menuService.Refresh();
-                }
             }
         }
 

diff --git a/Src/Wide/Core/Workspace.cs b/Src/Wide/Core/Workspace.cs
@@ -27,9 +27,8 @@ internal class Workspace : AbstractWorkspace
         /// </summary>
         /// <param name="container">The injected container - can be used by custom flavors of workspace</param>
         /// <param name="eventAggregator">The event aggregator.</param>
-        /// <param name="logger">The logger.</param>
-        public Workspace(IUnityContainer container, IEventAggregator eventAggregator, ILoggerService logger)
-            : base(container, eventAggregator, logger)
+        public Workspace(IUnityContainer container, IEventAggregator eventAggregator)
+            : base(container, eventAggregator)
         {
         }
     }

diff --git a/Src/Wide/Interfaces/AbstractWorkspace.cs b/Src/Wide/Interfaces/AbstractWorkspace.cs
@@ -33,17 +33,12 @@ public abstract class AbstractWorkspace : ViewModelBase, IWorkspace
         /// <summary>
         /// The injected container
         /// </summary>
-        private readonly IUnityContainer _container;
+        protected readonly IUnityContainer _container;
 
         /// <summary>
         /// The injected event aggregator
         /// </summary>
-        private readonly IEventAggregator _eventAggregator;
-
-        /// <summary>
-        /// The injected container
-        /// </summary>
-        private readonly ILoggerService _logger;
+        protected readonly IEventAggregator _eventAggregator;
 
         /// <summary>
         /// The active document
@@ -89,12 +84,10 @@ public abstract class AbstractWorkspace : ViewModelBase, IWorkspace
         /// </summary>
         /// <param name="container">The injected container.</param>
         /// <param name="eventAggregator">The event aggregator.</param>
-        /// <param name="logger">The logger.</param>
-        protected AbstractWorkspace(IUnityContainer container, IEventAggregator eventAggregator, ILoggerService logger)
+        protected AbstractWorkspace(IUnityContainer container, IEventAggregator eventAggregator)
         {
             _container = container;
             _eventAggregator = eventAggregator;
-            _logger = logger;
             _docs = new ObservableCollection<ContentViewModel>();
             _docs.CollectionChanged += Docs_CollectionChanged;
             _tools = new ObservableCollection<ToolViewModel>();
@@ -140,7 +133,7 @@ public IStatusbarService StatusBar
         /// The list of documents which are open in the workspace
         /// </summary>
         /// <value>The documents.</value>
-        public ObservableCollection<ContentViewModel> Documents
+        public virtual ObservableCollection<ContentViewModel> Documents
         {
             get { return _docs; }
             set { _docs = value; }
@@ -150,7 +143,7 @@ public ObservableCollection<ContentViewModel> Documents
         /// The list of tools that are available in the workspace
         /// </summary>
         /// <value>The tools.</value>
-        public ObservableCollection<ToolViewModel> Tools
+        public virtual ObservableCollection<ToolViewModel> Tools
         {
             get { return _tools; }
             set { _tools = value; }
@@ -160,7 +153,7 @@ public ObservableCollection<ToolViewModel> Tools
         /// The current document which is active in the workspace
         /// </summary>
         /// <value>The active document.</value>
-        public ContentViewModel ActiveDocument
+        public virtual ContentViewModel ActiveDocument
         {
             get { return _activeDocument; }
             set
@@ -172,8 +165,6 @@ public ContentViewModel ActiveDocument
                     _commandManager.Refresh();
                     _menus.Refresh();
                     _eventAggregator.GetEvent<ActiveContentChangedEvent>().Publish(_activeDocument);
-                    _logger.Log("Active document changed to " + _activeDocument.Title, LogCategory.Info,
-                                LogPriority.None);
                 }
             }
         }