Fixes after merge

210342 · Jan 20, 2019 · 39fb21d · 39fb21d
1 parent 18c352d
commit 39fb21d
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 28 deletions.
diff --git a/Library/Logic/ViewModel/ViewModel.cs b/Library/Logic/ViewModel/ViewModel.cs
@@ -146,7 +146,7 @@ private async Task Save(ISourceProvider targetPathProvider)
                 try
                 {
                     string target = targetPathProvider.GetPath();
-                    await Task.Run(() =>
+                    await Task.Run(async () =>
                     {
                         if (IsTracingEnabled)
                         {
@@ -155,10 +155,8 @@ await Task.Run(() =>
                         }
 
                         Persister.Access(target);
-                        IAssemblyMetadata graph = ObjectsList.First().ModelObject as IAssemblyMetadata;
-                        Persister.Save(graph);
+                        await (ObjectsList?.FirstOrDefault().ModelObject as AssemblyMetadata)?.Save(Persister, target);
                         Persister.Dispose();
-                        (ObjectsList.First().ModelObject as AssemblyMetadata)?.Save(Persister, target);
                         InformationMessageTarget.SendMessage("Saving completed", "Model was successfully saved.");
 
                         if (IsTracingEnabled)
@@ -209,7 +207,7 @@ private async Task Load(ISourceProvider targetPathProvider)
                     else
                     {
                         ObjectsList.Clear();
-                        ObjectsList.Add(new AssemblyItem(new AssemblyMetadata(result)));
+                        ObjectsList.Add(new AssemblyItem(result as AssemblyMetadata));
                         LoadedAssembly = "Model deserialized";
                         SaveModel.RaiseCanExecuteChanged();
                         InformationMessageTarget?.SendMessage("Loading completed", "Model was successfully loaded.");
@@ -249,7 +247,7 @@ private async Task<IAssemblyMetadata> LoadRootAssembly(string target)
             AssemblyMetadata graph = null;
             try
             {
-                graph = AssemblyMetadata.Load(Persister, target);
+                graph = await AssemblyMetadata.Load(Persister, target);
             }
             catch (Exception e)
             {
@@ -260,15 +258,14 @@ private async Task<IAssemblyMetadata> LoadRootAssembly(string target)
                     Tracer.LogFailure($"{target}; {errorMessage}");
                     Tracer.Flush();
                 }
-
                 return null;
             }
             finally
             {
                 Persister.Dispose();
             }
 
-            return result;
+            return graph;
         }
 
         private void OpenFile(ISourceProvider sourceProvider)

diff --git a/Library/Model/AssemblyMetadata.cs b/Library/Model/AssemblyMetadata.cs
@@ -2,9 +2,9 @@
 using System.Collections.Generic;
 using System.Linq;
 using System.Reflection;
-using Library.Data;
+using System.Threading.Tasks;
 using ModelContract;
-using Persistance;
+using Persistence;
 
 namespace Library.Model
 {
@@ -60,20 +60,18 @@ public AssemblyMetadata(IAssemblyMetadata assemblyMetadata)
 
         public IEnumerable<IMetadata> Children => Namespaces;
 
-        internal void Save(IPersister persister, string target)
+        internal async Task Save(IPersister persister, string target)
         {
             persister.Access(target);
-            IAssemblyMetadata graph = new ModelMapper().Map(this, persister.GetType().Assembly);
-            persister.Save(graph);
+            await persister.Save(this);
             persister.Dispose();
         }
 
-        internal static AssemblyMetadata Load(IPersister persister, string target)
+        internal static async Task<AssemblyMetadata> Load(IPersister persister, string target)
         {
             persister.Access(target);
-            IAssemblyMetadata result = persister.Load();
-            IAssemblyMetadata graph = new ModelMapper().Map(result, typeof(AssemblyMetadata).Assembly);
-            return graph as AssemblyMetadata;
+            IAssemblyMetadata result = await persister.Load();
+            return new AssemblyMetadata(result);
         }
 
         public override int GetHashCode()

diff --git a/Library/Model/TypeMetadata.cs b/Library/Model/TypeMetadata.cs
@@ -83,15 +83,6 @@ internal TypeMetadata(Type type)
             SavedHash = type.GetHashCode();
         }
 
-        private IEnumerable<IPropertyMetadata> EmitPropertiesAndFields(Type type)
-        {
-            IEnumerable<IPropertyMetadata> fields = from FieldInfo field
-                                            in type.GetFields(
-                                                BindingFlags.NonPublic | BindingFlags.Public | BindingFlags.Instance)
-                                            select new PropertyMetadata(field.Name, EmitReference(field.FieldType));
-            return fields.Concat(PropertyMetadata.EmitProperties(type.GetProperties()));
-        }
-
         internal TypeMetadata() { }
 
         public TypeMetadata(ITypeMetadata typeMetadata)

diff --git a/Persistance/Persistence.csproj b/Persistance/Persistence.csproj
@@ -7,8 +7,8 @@
     <ProjectGuid>{82468F99-B386-4419-8DB0-FCA10B12699E}</ProjectGuid>
     <OutputType>Library</OutputType>
     <AppDesignerFolder>Properties</AppDesignerFolder>
-    <RootNamespace>Persistance</RootNamespace>
-    <AssemblyName>Persistance</AssemblyName>
+    <RootNamespace>Persistence</RootNamespace>
+    <AssemblyName>Persistence</AssemblyName>
     <TargetFrameworkVersion>v4.7.2</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
     <Deterministic>true</Deterministic>