esiur/esiur-dotnet
2
0
Fork 0
mirror of https://github.com/esiur/esiur-dotnet.git synced 2025-06-27 05:23:13 +00:00
Code Issues Projects Releases Wiki Activity

fix

Browse Source
This commit is contained in:
Ahmed Zamil
2022-09-19 00:00:32 +03:00
parent c1b9af9e9e
commit 8e17a5b677
5 changed files with 29 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
Esiur/Resource/Template/TypeTemplate.cs
View File

@ -354,7 +354,7 @@ public class TypeTemplate
}
public static string GetTypeClassName(Type type, string separator = ".")
public static string GetTypeClassName(Type type, char separator = '.')
{
if (type.IsGenericType)
@ -362,12 +362,12 @@ public class TypeTemplate
var index = type.Name.IndexOf("`");
var name = $"{type.Namespace}{separator}{((index > -1) ? type.Name.Substring(0, index) : type.Name)}Of";
foreach (var t in type.GenericTypeArguments)
name += GetTypeClassName(t, "_");
name += GetTypeClassName(t, '_');
return name;
}
else
return $"{type.Namespace}{separator}{type.Name}";
return $"{type.Namespace.Replace('.', separator)}{separator}{type.Name}";
}

27
Esiur/Resource/Warehouse.cs
View File

@ -767,11 +767,11 @@ public static class Warehouse
/// <returns>Resource template.</returns>
public static TypeTemplate GetTemplateByType(Type type)
{
var baseType = ResourceProxy.GetBaseType(type);
//TemplateType templateType = TemplateType.Unspecified;
//if (Codec.InheritsClass(type, typeof(DistributedResource)))
// templateType = TemplateType.Wrapper;
if (baseType == typeof(IResource)
|| baseType == typeof(IRecord))
return null;
TemplateType templateType;
if (Codec.ImplementsInterface(type, typeof(IResource)))
@ -783,20 +783,13 @@ public static class Warehouse
else
return null;
var baseType = ResourceProxy.GetBaseType(type);
var template = templates[templateType].Values.FirstOrDefault(x => x.DefinedType == baseType);
if (template != null)
return template;
if (baseType == typeof(IResource)
|| baseType == typeof(IRecord))
return null;
var template = templates[templateType].Values.FirstOrDefault(x => x.DefinedType == type);
// loaded ?
if (template == null)
{
template = new TypeTemplate(baseType, true);
TypeTemplate.GetDependencies(template);
}
// create new template for type
template = new TypeTemplate(baseType, true);
TypeTemplate.GetDependencies(template);
return template;
}