Corretti alcuni Warnings
This commit is contained in:
@@ -100,7 +100,11 @@ namespace WebWindowComplex.Json
|
||||
sGlass = m_sGlass
|
||||
};
|
||||
foreach (var Area in AreaList)
|
||||
Window.AreaList.Add((Frame)Area.Deserialize(null, Window));
|
||||
{
|
||||
JsonFrame jf = (JsonFrame)Area;
|
||||
Frame frame = (Frame)jf.Deserialize(null, Window);
|
||||
Window.AreaList.Add(frame ?? new(null, Window));
|
||||
}
|
||||
return Window;
|
||||
}
|
||||
}
|
||||
@@ -155,7 +159,7 @@ namespace WebWindowComplex.Json
|
||||
m_AreaType = AreaType;
|
||||
}
|
||||
|
||||
internal virtual Area? Deserialize(Area ParentArea, Window ParentWindow)
|
||||
internal virtual Area? Deserialize(Area? ParentArea, Window ParentWindow)
|
||||
{
|
||||
return null;
|
||||
}
|
||||
@@ -281,7 +285,7 @@ namespace WebWindowComplex.Json
|
||||
base.GroupId = GroupId;
|
||||
}
|
||||
|
||||
internal override Area Deserialize(Area ParentArea, Window ParentWindow)
|
||||
internal override Area Deserialize(Area? ParentArea, Window ParentWindow)
|
||||
{
|
||||
Frame newFrame = new Frame(null, ParentWindow);
|
||||
newFrame.SetGroupId(GroupId);
|
||||
@@ -1109,7 +1113,7 @@ namespace WebWindowComplex.Json
|
||||
var RawType = (string?)item["AreaType"];
|
||||
AreaTypes Type = AreaTypes.NULL;
|
||||
Enum.TryParse<AreaTypes>(RawType, out Type);
|
||||
JsonArea JsonArea = null;
|
||||
JsonArea JsonArea = new JsonArea(AreaTypes.NULL);
|
||||
switch (Type)
|
||||
{
|
||||
case AreaTypes.FRAME:
|
||||
@@ -1143,12 +1147,8 @@ namespace WebWindowComplex.Json
|
||||
}
|
||||
}
|
||||
if (!Information.IsNothing(JsonArea))
|
||||
{
|
||||
serializer.Populate(item.CreateReader(), JsonArea);
|
||||
return JsonArea;
|
||||
}
|
||||
else
|
||||
return null;
|
||||
serializer.Populate(item.CreateReader(), JsonArea!);
|
||||
return JsonArea!;
|
||||
}
|
||||
|
||||
public override void WriteJson(JsonWriter writer, object value, JsonSerializer serializer)
|
||||
|
||||
Reference in New Issue
Block a user