• R/O
  • HTTP
  • SSH
  • HTTPS

Commit

Tags
Aucun tag

Frequently used words (click to add to your profile)

javac++androidlinuxc#windowsobjective-ccocoa誰得qtpythonphprubygameguibathyscaphec計画中(planning stage)翻訳omegatframeworktwitterdomtestvb.netdirectxゲームエンジンbtronarduinopreviewer

なろうブックマーク分析用ツールのPrism+WPFサンプル実装


Commit MetaInfo

Révision040eddae1b19e492bca69693afdd45fa30759400 (tree)
l'heure2023-09-30 20:32:35
Auteuryoshy <yoshy.org.bitbucket@gz.j...>
Commiteryoshy

Message de Log

[MOD] 外部パッケージへの依存関係の修正
[UPG] ClearAuLaitのCaptionFormatterの変更に伴う修正

Change Summary

Modification

--- a/30Adaptor/Boundary/Gateway/ViewModel/IBookmarkCategoryViewModel.cs
+++ b/30Adaptor/Boundary/Gateway/ViewModel/IBookmarkCategoryViewModel.cs
@@ -1,4 +1,5 @@
1-using ObservableCollections;
1+using CleanAuLait.ObservableCollectionsMod;
2+using ObservableCollections;
23 using TestNarou.Adaptor.Boundary.Controller;
34 using TestNarou.Adaptor.Boundary.Gateway.ViewModel.Child;
45 using TestNarou.Domain.Model.Entity;
@@ -10,7 +11,7 @@ namespace TestNarou.Adaptor.Boundary.Gateway.ViewModel
1011 {
1112 IAppWindowController WindowController { get; }
1213
13- ISynchronizedListView<BookmarkCategoryRow, IBookmarkCategoryRowViewModel> Rows { get; }
14+ INotifyCollectionChangedListSynchronizedSingleView<BookmarkCategoryRow, IBookmarkCategoryRowViewModel> Rows { get; }
1415
1516 void SynchronizeWith(BookmarkCategory list);
1617 }
--- a/30Adaptor/Gateway/ViewModel/BookmarkCategoryViewModel.cs
+++ b/30Adaptor/Gateway/ViewModel/BookmarkCategoryViewModel.cs
@@ -1,4 +1,5 @@
1-using NLog;
1+using CleanAuLait.ObservableCollectionsMod;
2+using NLog;
23 using ObservableCollections;
34 using Prism.Navigation;
45 using Reactive.Bindings.Extensions;
@@ -22,7 +23,7 @@ namespace TestNarou.Adaptor.Gateway.ViewModel
2223 public event PropertyChangedEventHandler PropertyChanged;
2324 #pragma warning restore CS0067
2425
25- public ISynchronizedListView<BookmarkCategoryRow, IBookmarkCategoryRowViewModel> Rows { get; private set; } = null;
26+ public INotifyCollectionChangedListSynchronizedSingleView<BookmarkCategoryRow, IBookmarkCategoryRowViewModel> Rows { get; private set; } = null;
2627
2728 public BookmarkCategory Source { get; private set; }
2829
@@ -50,7 +51,7 @@ namespace TestNarou.Adaptor.Gateway.ViewModel
5051 this.Rows = source.Rows
5152 .ToSynchronizedCoupleView(r => this.vmTranslator.Translate(r, this))
5253 .ToSynchronizedSingleView()
53- .WithIListINotifyCollectionChanged()
54+ .WithINotifyCollectionChangedList()
5455 .AddTo(disposables);
5556
5657 logger.Trace("BookmarkCategoryViewModel.SynchronizeWith: collection view [{0}]", this.Rows.GetType().FullName);
--- a/30Adaptor/Gateway/ViewModel/BookmarkDetailListViewModel.cs
+++ b/30Adaptor/Gateway/ViewModel/BookmarkDetailListViewModel.cs
@@ -1,4 +1,5 @@
1-using NLog;
1+using CleanAuLait.ObservableCollectionsMod;
2+using NLog;
23 using ObservableCollections;
34 using Prism.Navigation;
45 using Prism.Regions;
@@ -34,7 +35,7 @@ namespace TestNarou.Adaptor.Gateway.ViewModel
3435
3536 private int CategoryNo { get; set; } = -1;
3637
37- private ISynchronizedListView<BookmarkDetailListRow, IBookmarkDetailListRowViewModel> internalRows;
38+ private INotifyCollectionChangedListSynchronizedSingleView<BookmarkDetailListRow, IBookmarkDetailListRowViewModel> internalRows;
3839 private IBookmarkDetailListRowViewModel selectedRow;
3940
4041 private readonly IBookmarkDetailListRowViewModelTranslator vmTranslator;
@@ -83,7 +84,7 @@ namespace TestNarou.Adaptor.Gateway.ViewModel
8384 this.internalRows = source.Rows
8485 .ToSynchronizedCoupleView(r => this.vmTranslator.Translate(r, this))
8586 .ToSynchronizedSingleView()
86- .WithIListINotifyCollectionChanged()
87+ .WithINotifyCollectionChangedList()
8788 .AddTo(disposables);
8889
8990 this.Rows = CollectionViewSource.GetDefaultView(this.internalRows);
--- a/30Adaptor/Gateway/ViewModel/MainWindowViewModel.cs
+++ b/30Adaptor/Gateway/ViewModel/MainWindowViewModel.cs
@@ -25,7 +25,7 @@ namespace TestNarou.Adaptor.Gateway.ViewModel
2525 {
2626 this.wc = wc;
2727
28- this.Title = new ReactiveProperty<string>(caption.GetCaption()).AddTo(disposables);
28+ this.Title = new ReactiveProperty<string>(caption.GetDefaultCaption()).AddTo(disposables);
2929
3030 this.CommandClosed = new ReactiveCommand().WithSubscribe(OnClosed).AddTo(disposables);
3131 }
--- a/90Infra/Resources/message.properties
+++ b/90Infra/Resources/message.properties
@@ -1,5 +1,5 @@
11 Caption = テストなろう
2-Caption.Info = {0} - 通知
3-Caption.Warn = {0} - 警告
4-Caption.Error = {0} - エラー
5-Caption.Exception = {0} - {1}
2+Caption.Format.Info = {0} - 通知
3+Caption.Format.Warn = {0} - 警告
4+Caption.Format.Error = {0} - エラー
5+Caption.Format.Exception = {0} - {1}
--- a/TestNarou.sln
+++ b/TestNarou.sln
@@ -11,8 +11,6 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "CleanAuLait.WPF", "..\Clean
1111 EndProject
1212 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "CleanAuLait.Prism", "..\CleanAuLait.Prism\CleanAuLait.Prism.csproj", "{19FB56B4-A69D-4D7B-A78A-F2667A3C1355}"
1313 EndProject
14-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ObservableCollections", "D:\Repo\gitroot\ObservableCollectionsMod\src\ObservableCollections\ObservableCollections.csproj", "{0AA2B580-29AC-48CD-B838-2ABBE4341ADB}"
15-EndProject
1614 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "CleanAuLait.ObservableCollectionsMod", "..\CleanAuLait.ObservableCollectionsMod\CleanAuLait.ObservableCollectionsMod.csproj", "{9C249B13-843A-46A5-BCC7-27BAC103BD98}"
1715 EndProject
1816 Global
@@ -37,10 +35,6 @@ Global
3735 {19FB56B4-A69D-4D7B-A78A-F2667A3C1355}.Debug|Any CPU.Build.0 = Debug|Any CPU
3836 {19FB56B4-A69D-4D7B-A78A-F2667A3C1355}.Release|Any CPU.ActiveCfg = Release|Any CPU
3937 {19FB56B4-A69D-4D7B-A78A-F2667A3C1355}.Release|Any CPU.Build.0 = Release|Any CPU
40- {0AA2B580-29AC-48CD-B838-2ABBE4341ADB}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
41- {0AA2B580-29AC-48CD-B838-2ABBE4341ADB}.Debug|Any CPU.Build.0 = Debug|Any CPU
42- {0AA2B580-29AC-48CD-B838-2ABBE4341ADB}.Release|Any CPU.ActiveCfg = Release|Any CPU
43- {0AA2B580-29AC-48CD-B838-2ABBE4341ADB}.Release|Any CPU.Build.0 = Release|Any CPU
4438 {9C249B13-843A-46A5-BCC7-27BAC103BD98}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
4539 {9C249B13-843A-46A5-BCC7-27BAC103BD98}.Debug|Any CPU.Build.0 = Debug|Any CPU
4640 {9C249B13-843A-46A5-BCC7-27BAC103BD98}.Release|Any CPU.ActiveCfg = Release|Any CPU