Disabled sharing of DataTemplates

VECTO3GUI2020/Resources/ViewModelBindings.xaml

@@ -12,28 +12,28 @@
                     xmlns:componentimpl="clr-namespace:VECTO3GUI2020.ViewModel.Implementation.JobEdit.Vehicle.Components"
                     xmlns:componentviews="clr-namespace:VECTO3GUI2020.Views.JobEditViews.Vehicle.Components"
                     xmlns:multistageimpl="clr-namespace:VECTO3GUI2020.ViewModel.MultiStage.Implementation">
-    <DataTemplate DataType="{x:Type impl:JobListViewModel}">
+    <DataTemplate x:Shared="False" DataType="{x:Type impl:JobListViewModel}">
         <views:JobListView />
     </DataTemplate>
-    <DataTemplate DataType="{x:Type impl:MessageViewModel}">
+    <DataTemplate x:Shared="False" DataType="{x:Type impl:MessageViewModel}">
         <views:MessageView />
     </DataTemplate>
 
-    <DataTemplate DataType="{x:Type impl:MainWindowViewModel}">
+    <DataTemplate x:Shared="False" DataType="{x:Type impl:MainWindowViewModel}">
         <local:MainWindow />
     </DataTemplate>
 
-    <DataTemplate DataType="{x:Type impl:SettingsViewModel}">
+    <DataTemplate x:Shared="False" DataType="{x:Type impl:SettingsViewModel}">
         <views:SettingsView/>
     </DataTemplate>
 
 
 
 
-    <DataTemplate DataType="{x:Type jobeditimpl:DeclarationJobEditViewModel_v1_0}">
+    <DataTemplate x:Shared="False" DataType="{x:Type jobeditimpl:DeclarationJobEditViewModel_v1_0}">
         <jobeditviews:DeclarationJobEditView/>
     </DataTemplate>
-    <DataTemplate DataType="{x:Type jobeditimpl:DeclarationJobEditViewModel_v2_0}">
+    <DataTemplate x:Shared="False" DataType="{x:Type jobeditimpl:DeclarationJobEditViewModel_v2_0}">
         <jobeditviews:DeclarationJobEditView/>
     </DataTemplate>
 
@@ -199,27 +199,27 @@
     </DataTemplate>
 
     <!--#region Multistage -->
-    <DataTemplate DataType="{x:Type multistageimpl:NewMultiStageJobViewModel}">
+    <DataTemplate x:Shared="False" DataType="{x:Type multistageimpl:NewMultiStageJobViewModel}">
         <multistageviews:NewMultistageFileView/>
     </DataTemplate>
 
-    <DataTemplate DataType="{x:Type multistageimpl:ManufacturingStageViewModel_v0_1}">
+    <DataTemplate x:Shared="False" DataType="{x:Type multistageimpl:ManufacturingStageViewModel_v0_1}">
         <multistageviews:ManufacturingStageView></multistageviews:ManufacturingStageView>
     </DataTemplate>
 
-    <DataTemplate DataType="{x:Type multistageimpl:DeclarationInterimStageBusVehicleViewModel_v2_8}">
+    <DataTemplate x:Shared="False" DataType="{x:Type multistageimpl:DeclarationInterimStageBusVehicleViewModel_v2_8}">
         <multistageviews:VehicleView_v2_8/>
     </DataTemplate>
 
-    <DataTemplate DataType="{x:Type multistageimpl:MultiStageJobViewModel_v0_1}">
+    <DataTemplate x:Shared="False" DataType="{x:Type multistageimpl:MultiStageJobViewModel_v0_1}">
         <multistageviews:MultiStageView/>
     </DataTemplate>
 
-    <DataTemplate DataType="{x:Type multistageimpl:MultistageAirdragViewModel}">
+    <DataTemplate x:Shared="False" DataType="{x:Type multistageimpl:MultistageAirdragViewModel}">
         <multistageviews:MultistageAirDragView/>
     </DataTemplate>
 
-    <DataTemplate DataType="{x:Type multistageimpl:MultistageAuxiliariesViewModel}">
+    <DataTemplate x:Shared="False" DataType="{x:Type multistageimpl:MultistageAuxiliariesViewModel}">
         <multistageviews:ManufacturingStageAuxiliariesView/>
     </DataTemplate>
     <!--#endregion-->

VECTO3GUI2020/ViewModel/MultiStage/Implementation/InterimStageBusVehicleViewModel_v2_8.cs

@@ -451,10 +451,7 @@ namespace VECTO3GUI2020.ViewModel.MultiStage.Implementation
 				}
 				return _airdragModifiedEditingEnabled;
 			}
-			set{
-				SetProperty(ref _airdragModifiedEditingEnabled, value);
-			}
-				
+			set => SetProperty(ref _airdragModifiedEditingEnabled, value);
 		}
 		#endregion;
 

VECTO3GUI2020/ViewModel/MultiStage/Implementation/NewMultiStageJobViewModel.cs

@@ -3,6 +3,7 @@ using System.CodeDom;
 using System.Diagnostics;
 using System.Linq;
 using System.Linq.Expressions;
+using System.Threading;
 using System.Windows;
 using System.Windows.Input;
 using TUGraz.VectoCommon.InputData;
@@ -34,7 +35,11 @@ namespace VECTO3GUI2020.ViewModel.MultiStage.Implementation
 		public IMultiStageJobViewModel MultiStageJobViewModel
 		{
 			get { return _multistageJobViewModel; }
-			set { SetProperty(ref _multistageJobViewModel, value); }
+			set
+			{
+				OnPropertyChanged(nameof(MultiStageJobViewModel));
+				SetProperty(ref _multistageJobViewModel, value);
+			}
 		}
 
 

VECTO3GUI2020/Views/Multistage/NewMultistageFileView.xaml

@@ -21,7 +21,15 @@
                         CommandParameter="{Binding RelativeSource={RelativeSource Mode=FindAncestor, AncestorType={x:Type Window}}}">
                     Cancel
                 </Button>
-                <ContentControl Grid.Row="2" Content="{Binding MultiStageJobViewModel}"/>
+                <ContentControl Grid.Row="2">
+                    <Binding Path="MultiStageJobViewModel" Mode="TwoWay" >
+                        <Binding.TargetNullValue>
+                            <Grid HorizontalAlignment="Center" VerticalAlignment="Stretch">
+                                <TextBlock>Load VIF File to add new manufacturing Stage</TextBlock>
+                            </Grid>
+                        </Binding.TargetNullValue>
+                    </Binding>
+                </ContentControl>
 
             </DockPanel>
         </Grid>

Vecto3GUI2020Test/ViewModelTests/LoadAndSaveVehicleData.cs

@@ -91,7 +91,7 @@ namespace Vecto3GUI2020Test
 
 			Assert.True(vehicle.AirdragModifiedMultistageEditingEnabled);
 
-			var mockDialog = getMockDialogHelper(consolidated_multiple_stages);
+			var mockDialog = getMockDialogHelper(consolidated_multiple_stages_hev);
 			newMultistageJobViewModel.AddVifFile.Execute(null);
 			Assert.AreEqual(mockDialog.Object.OpenXMLFileDialog(null), newMultistageJobViewModel.VifPath);
 			vehicle = newMultistageJobViewModel.MultiStageJobViewModel.VehicleInputData as DeclarationInterimStageBusVehicleViewModel_v2_8;

Vecto3GUI2020Test/ViewModelTests/ViewModelTestBase.cs

@@ -22,6 +22,9 @@ namespace Vecto3GUI2020Test
 		protected const string consolidated_multiple_stages_airdrag =
 			"vecto_multistage_consolidated_multiple_stages_airdrag.xml";
 
+		protected const string consolidated_multiple_stages_hev =
+			"vecto_multistage_consolidated_multiple_stages_hev.xml";
+
 		protected const string consolidated_one_stage = "vecto_multistage_consolidated_one_stage.xml";
 		protected const string primary_vehicle_only = "vecto_multistage_primary_vehicle_only.xml";