merge rockers handling

1 files changed, 9 insertions, 9 deletions

diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.MachineDesigner/ViewModels/MainViewVM.cs b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.MachineDesigner/ViewModels/MainViewVM.cs
index 3a0191be4..0bd8f8133 100644
--- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.MachineDesigner/ViewModels/MainViewVM.cs
+++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.MachineDesigner/ViewModels/MainViewVM.cs
@@ -176,8 +176,8 @@ namespace Tango.MachineStudio.MachineDesigner.ViewModels
         {
             if (SelectedMachine != null)
             {
-                Machine = SelectedMachine.CloneEntity();
-                Configuration = Machine.Configuration.CloneConfiguration();
+                Machine = SelectedMachine.Clone();
+                Configuration = Machine.Configuration.Clone();
                 History = SelectedMachine.MachinesConfigurations.Select(x => x.Configuration).ToObservableCollection();
             }
             else
@@ -193,7 +193,7 @@ namespace Tango.MachineStudio.MachineDesigner.ViewModels
         {
             if (SelectedHistoryConfiguration != null)
             {
-                Configuration = SelectedHistoryConfiguration.CloneConfiguration();
+                Configuration = SelectedHistoryConfiguration.Clone();
             }
         }
 
@@ -552,7 +552,7 @@ namespace Tango.MachineStudio.MachineDesigner.ViewModels
                             await Machine.SaveAsync(Adapter.Context);
 
                             Machine = Adapter.Machines.SingleOrDefault(x => x.Guid == Machine.Guid);
-                            Configuration = Machine.Configuration.CloneConfiguration();
+                            Configuration = Machine.Configuration.Clone();
                         }
                     }
                     else
@@ -586,11 +586,11 @@ namespace Tango.MachineStudio.MachineDesigner.ViewModels
                         await machine.SaveAsync(Adapter.Context);
 
                         Machine = Adapter.Machines.SingleOrDefault(x => x.Guid == machine.Guid);
-                        Configuration = Machine.Configuration.CloneConfiguration();
+                        Configuration = Machine.Configuration.Clone();
                     }
 
                     SetHistory(Machine);
-                    Machine = Machine.CloneEntity();
+                    Machine = Machine.Clone();
                 }
             }
             catch (Exception ex)
@@ -621,7 +621,7 @@ namespace Tango.MachineStudio.MachineDesigner.ViewModels
         {
             if (Machine.MachineVersion != null)
             {
-                Configuration = Machine.MachineVersion.DefaultConfiguration.CloneConfiguration();
+                Configuration = Machine.MachineVersion.DefaultConfiguration.Clone();
             }
             else
             {
@@ -642,7 +642,7 @@ namespace Tango.MachineStudio.MachineDesigner.ViewModels
                     {
                         if (vm.SelectedVersion != null)
                         {
-                            vm.SelectedVersion.DefaultConfiguration = Configuration.CloneConfiguration();
+                            vm.SelectedVersion.DefaultConfiguration = Configuration.Clone();
                             vm.SelectedVersion.DefaultConfigurationGuid = vm.SelectedVersion.DefaultConfiguration.Guid;
                             await vm.SelectedVersion.SaveAsync(Adapter.Context);
                         }
@@ -652,7 +652,7 @@ namespace Tango.MachineStudio.MachineDesigner.ViewModels
                             newVersion.Version = vm.Version;
                             newVersion.Name = vm.VersionName;
 
-                            newVersion.DefaultConfiguration = Configuration.CloneConfiguration();
+                            newVersion.DefaultConfiguration = Configuration.Clone();
                             newVersion.DefaultConfigurationGuid = newVersion.DefaultConfiguration.Guid;
                             await newVersion.SaveAsync(Adapter.Context);
                         }