From 0dee3a19691e07b781e3fa188e35328ddadf09cc Mon Sep 17 00:00:00 2001
From: leo <longshuang@msn.cn>
Date: Wed, 24 Jul 2024 11:16:28 +0800
Subject: [PATCH] refactor: use `Binding.TargetNullValue` instead of empty
 class `Models.CompareTargetWorktree`

---
 src/Models/CompareTargetWorktree.cs |  6 ----
 src/ViewModels/RevisionCompare.cs   |  4 +--
 src/Views/RevisionCompare.axaml     | 44 +++++++++++++++--------------
 3 files changed, 25 insertions(+), 29 deletions(-)
 delete mode 100644 src/Models/CompareTargetWorktree.cs

diff --git a/src/Models/CompareTargetWorktree.cs b/src/Models/CompareTargetWorktree.cs
deleted file mode 100644
index 6505f408..00000000
--- a/src/Models/CompareTargetWorktree.cs
+++ /dev/null
@@ -1,6 +0,0 @@
-namespace SourceGit.Models
-{
-    public class CompareTargetWorktree
-    {
-    }
-}
diff --git a/src/ViewModels/RevisionCompare.cs b/src/ViewModels/RevisionCompare.cs
index 6bfcf566..8ac6f823 100644
--- a/src/ViewModels/RevisionCompare.cs
+++ b/src/ViewModels/RevisionCompare.cs
@@ -71,8 +71,8 @@ namespace SourceGit.ViewModels
         public RevisionCompare(string repo, Models.Commit startPoint, Models.Commit endPoint)
         {
             _repo = repo;
-            _startPoint = (object)startPoint ?? new Models.CompareTargetWorktree();
-            _endPoint = (object)endPoint ?? new Models.CompareTargetWorktree();
+            _startPoint = startPoint;
+            _endPoint = endPoint;
 
             Task.Run(Refresh);
         }
diff --git a/src/Views/RevisionCompare.axaml b/src/Views/RevisionCompare.axaml
index bb101ae3..41439b6b 100644
--- a/src/Views/RevisionCompare.axaml
+++ b/src/Views/RevisionCompare.axaml
@@ -10,9 +10,8 @@
              x:Class="SourceGit.Views.RevisionCompare"
              x:DataType="vm:RevisionCompare"
              Background="{DynamicResource Brush.Window}">
-  <UserControl.Resources>
-    <!-- Template for Models.Commit -->
-    <DataTemplate DataType="m:Commit" x:Key="CommitInfoTemplate">
+  <UserControl.DataTemplates>
+    <DataTemplate DataType="m:Commit">
       <Grid RowDefinitions="Auto,*">
         <Grid Grid.Row="0" ColumnDefinitions="Auto,*,Auto,Auto,Auto">
           <v:Avatar Width="16" Height="16" VerticalAlignment="Center" IsHitTestVisible="False" User="{Binding Author}"/>
@@ -27,25 +26,23 @@
         <TextBlock Grid.Row="1" Classes="monospace" Text="{Binding Subject}" VerticalAlignment="Bottom"/>
       </Grid>
     </DataTemplate>
-
-    <!-- Template for Models.CompareTargetWorktree -->
-    <DataTemplate DataType="m:CompareTargetWorktree" x:Key="WorktreeTemplate">
-      <Border HorizontalAlignment="Center" VerticalAlignment="Center" Background="{DynamicResource Brush.Accent}" CornerRadius="4">
-        <TextBlock Text="{DynamicResource Text.Worktree}" Classes="monospace" Margin="4,2" Foreground="#FFDDDDDD"/>
-      </Border>
-    </DataTemplate>
-  </UserControl.Resources>
+  </UserControl.DataTemplates>
   
   <Grid RowDefinitions="50,*" Margin="4">
     <!-- Compare Revision Info -->
     <Grid Grid.Row="0" Margin="48,0,48,4" ColumnDefinitions="*,48,*">
       <!-- Base Revision -->
       <Border Grid.Column="0" BorderBrush="{DynamicResource Brush.Border2}" BorderThickness="1" Background="{DynamicResource Brush.Contents}" CornerRadius="4" Padding="4">
-        <ContentControl Content="{Binding StartPoint}">
-          <ContentControl.DataTemplates>
-            <StaticResource ResourceKey="CommitInfoTemplate"/>
-            <StaticResource ResourceKey="WorktreeTemplate"/>
-          </ContentControl.DataTemplates>
+        <ContentControl>
+          <ContentControl.Content>
+            <Binding Path="StartPoint">
+              <Binding.TargetNullValue>
+                <Border HorizontalAlignment="Center" VerticalAlignment="Center" Background="{DynamicResource Brush.Accent}" CornerRadius="4">
+                  <TextBlock Text="{DynamicResource Text.Worktree}" Classes="monospace" Margin="4,2" Foreground="#FFDDDDDD"/>
+                </Border>
+              </Binding.TargetNullValue>
+            </Binding>
+          </ContentControl.Content>
         </ContentControl>
       </Border>
 
@@ -56,11 +53,16 @@
 
       <!-- Right Revision -->
       <Border Grid.Column="2" BorderBrush="{DynamicResource Brush.Border2}" BorderThickness="1" Background="{DynamicResource Brush.Contents}" CornerRadius="4" Padding="4">
-        <ContentControl Content="{Binding EndPoint}">
-          <ContentControl.DataTemplates>
-            <StaticResource ResourceKey="CommitInfoTemplate"/>
-            <StaticResource ResourceKey="WorktreeTemplate"/>
-          </ContentControl.DataTemplates>
+        <ContentControl>
+          <ContentControl.Content>
+            <Binding Path="EndPoint">
+              <Binding.TargetNullValue>
+                <Border HorizontalAlignment="Center" VerticalAlignment="Center" Background="{DynamicResource Brush.Accent}" CornerRadius="4">
+                  <TextBlock Text="{DynamicResource Text.Worktree}" Classes="monospace" Margin="4,2" Foreground="#FFDDDDDD"/>
+                </Border>
+              </Binding.TargetNullValue>
+            </Binding>
+          </ContentControl.Content>
         </ContentControl>
       </Border>
     </Grid>