Simplify FileController by using the new CollectionItemChanged event

jbe2277 · Nov 19, 2023 · 16dbcf7 · 16dbcf7
1 parent ca78071
commit 16dbcf7
Show file tree

Hide file tree

Showing 5 changed files with 7 additions and 39 deletions.
diff --git a/src/DotNetPad/DotNetPad.Applications/Controllers/FileController.cs b/src/DotNetPad/DotNetPad.Applications/Controllers/FileController.cs
@@ -32,7 +32,6 @@ internal sealed class FileController
     private readonly DelegateCommand closeAllCommand;
     private readonly DelegateCommand saveCommand;
     private readonly DelegateCommand saveAsCommand;
-    private readonly List<DocumentFile> observedDocumentFiles;
     private DocumentFile? lastActiveDocumentFile;
     private IWeakEventProxy? activeDocumentPropertyChangedProxy;
     private int documentCounter;
@@ -63,7 +62,6 @@ public FileController(IMessageService messageService, IFileDialogService fileDia
         this.fileService.SaveCommand = saveCommand;
         this.fileService.SaveAsCommand = saveAsCommand;
 
-        observedDocumentFiles = [];
         WeakEvent.PropertyChanged.Add(fileService, FileServicePropertyChanged);
         shellService.Closing += ShellServiceClosing;
     }
@@ -76,7 +74,7 @@ private DocumentFile? ActiveDocumentFile
 
     private DocumentFile? LockedDocumentFile => fileService.LockedDocumentFile;
 
-    public void Initialize() => fileService.DocumentFiles.CollectionChanged += FileServiceDocumentsCollectionChanged;
+    public void Initialize() => fileService.DocumentFiles.CollectionItemChanged += DocumentFilePropertyChanged;
 
     public async void Run()
     {
@@ -252,35 +250,6 @@ private void SaveCore(DocumentFile document, string fileName)
         }
     }
 
-    private void FileServiceDocumentsCollectionChanged(object? sender, NotifyCollectionChangedEventArgs e)
-    {
-        if (e.Action == NotifyCollectionChangedAction.Add)
-        {
-            foreach (DocumentFile documentFile in e.NewItems!)
-            {
-                documentFile.PropertyChanged += DocumentFilePropertyChanged;
-                observedDocumentFiles.Add(documentFile);
-            }
-        }
-        else if (e.Action == NotifyCollectionChangedAction.Remove)
-        {
-            foreach (DocumentFile documentFile in e.OldItems!)
-            {
-                documentFile.PropertyChanged -= DocumentFilePropertyChanged;
-                observedDocumentFiles.Remove(documentFile);
-            }
-        }
-        else if (e.Action == NotifyCollectionChangedAction.Reset && !fileService.DocumentFiles.Any())
-        {
-            foreach (DocumentFile documentFile in observedDocumentFiles)
-            {
-                documentFile.PropertyChanged -= DocumentFilePropertyChanged;
-            }
-            observedDocumentFiles.Clear();
-        }
-        else throw new NotSupportedException("The CollectionChangedAction '" + e.Action + "' is not supported.");
-    }
-
     private async void DocumentFilePropertyChanged(object? sender, PropertyChangedEventArgs e)
     {
         if (e.PropertyName == nameof(DocumentFile.LoadError))

diff --git a/src/DotNetPad/DotNetPad.Applications/Services/FileService.cs b/src/DotNetPad/DotNetPad.Applications/Services/FileService.cs
@@ -8,8 +8,7 @@ namespace Waf.DotNetPad.Applications.Services;
 [Export(typeof(IDocumentService)), Export(typeof(IFileService)), Export]
 internal sealed class FileService : Model, IFileService
 {
-    private readonly ObservableCollection<DocumentFile> documentFiles;
-    private readonly ReadOnlyObservableList<DocumentFile> readOnlyDocumentFiles;
+    private readonly ObservableList<DocumentFile> documentFiles;
     private DocumentFile? activeDocumentFile;
     private DocumentFile? lockedDocumentFile;
     private ICommand newCSharpCommand = null!;
@@ -26,10 +25,10 @@ internal sealed class FileService : Model, IFileService
     public FileService()
     {
         documentFiles = [];
-        readOnlyDocumentFiles = new(documentFiles);
+        DocumentFiles = new(documentFiles);
     }
 
-    public IReadOnlyObservableList<DocumentFile> DocumentFiles => readOnlyDocumentFiles;
+    public ReadOnlyObservableList<DocumentFile> DocumentFiles { get; }
 
     public DocumentFile? ActiveDocumentFile
     {

diff --git a/src/DotNetPad/DotNetPad.Applications/Services/IDocumentService.cs b/src/DotNetPad/DotNetPad.Applications/Services/IDocumentService.cs
@@ -4,7 +4,7 @@ namespace Waf.DotNetPad.Applications.Services;
 
 public interface IDocumentService : INotifyPropertyChanged
 {
-    IReadOnlyObservableList<DocumentFile> DocumentFiles { get; }
+    ReadOnlyObservableList<DocumentFile> DocumentFiles { get; }
 
     DocumentFile? ActiveDocumentFile { get; set; }
 

diff --git a/src/DotNetPad/DotNetPad.Presentation/DesignData/MockDocumentService.cs b/src/DotNetPad/DotNetPad.Presentation/DesignData/MockDocumentService.cs
@@ -5,7 +5,7 @@ namespace Waf.DotNetPad.Presentation.DesignData;
 
 internal sealed class MockDocumentService : Model, IDocumentService
 {
-    public IReadOnlyObservableList<DocumentFile> DocumentFiles { get; set; } = null!;
+    public ReadOnlyObservableList<DocumentFile> DocumentFiles { get; set; } = null!;
 
     public DocumentFile? ActiveDocumentFile { get; set; }
 

diff --git a/src/DotNetPad/DotNetPad.Presentation/DesignData/MockFileService.cs b/src/DotNetPad/DotNetPad.Presentation/DesignData/MockFileService.cs
@@ -25,7 +25,7 @@ public class MockFileService : Model, IFileService
 
     public ICommand SaveAsCommand { get; set; } = null!;
 
-    public IReadOnlyObservableList<DocumentFile> DocumentFiles { get; set; } = null!;
+    public ReadOnlyObservableList<DocumentFile> DocumentFiles { get; set; } = null!;
 
     public DocumentFile? ActiveDocumentFile { get; set; }